Parent Directory | Revision Log | Revision Graph
Deleted code/CPP_OPTIONS.h everywhere where a default in model/inc will suffice. Only the following experiments still require CPP_OPTIONS.h: aim.5l_Equatorial_Channel/code/CPP_OPTIONS.h aim.5l_LatLon/code/CPP_OPTIONS.h aim.5l_cs/code/CPP_OPTIONS.h global_with_exf/code/CPP_OPTIONS.h which are for reasons we'll sort out later. We had to change the default behaviour in initialize_varia calling convection. Note that the following experiments appear to have different: ideal_2D_oce - due to sensitivity to solver tolerance and optimization !!! global_ocean_pressure - not sure why but probably related to solver tolerance Output generated on faulks: Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 16 16 16 22 0 0 pass adjustment.128x64x1 Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 0 0 16 16 0 0 pass adjustment.cs-32x32x1 Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 22 0 16 16 22 0 pass adjust_nlfs.cs-32x32x1 Y Y Y Y -- 16 16 16 13 16 16 16 16 16 16 16 16 16 16 16 16 N/O advect_cs Y Y Y Y -- 22 16 16 16 16 16 16 13 16 16 16 16 16 16 16 16 N/O advect_xy Y Y Y Y -- 5 6 7 6 16 16 16 16 7 7 0 7 16 16 16 16 N/O advect_xz Y Y Y Y 14 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass aim.5l_cs Y Y Y Y 14 16 16 16 16 16 16 16 16 16 16 16 16 16 16 13 16 pass aim.5l_Equatorial_Channel Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 13 16 pass aim.5l_LatLon Y Y Y Y 13 16 16 16 16 16 16 16 16 16 13 12 13 13 16 13 16 pass exp0 Y Y Y Y 14 16 16 16 16 16 16 16 22 16 16 16 16 16 16 22 16 pass exp1 Y Y Y Y 13 13 16 16 16 16 13 16 16 13 13 16 16 13 13 13 13 pass exp2 Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass exp4 Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 22 16 16 16 22 16 pass exp5 Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass front_relax Y Y Y Y 14 16 16 16 13 16 16 16 13 13 13 13 13 13 13 13 16 pass global_ocean.90x40x15 Y Y Y Y 6 11 12 13 13 12 13 16 13 9 9 9 9 10 9 9 11 FAIL global_ocean_pressure Y Y Y Y 14 16 16 13 16 16 16 13 13 13 13 13 16 12 16 13 16 pass global_with_exfY Y Y Y 14 16 16 16 16 16 16 16 16 11 13 22 13 16 16 9 16 pass hs94.128x64x5 Y Y Y Y 13 16 16 16 16 16 16 16 16 11 16 16 16 16 16 22 13 pass hs94.1x64x5 Y Y Y Y 14 16 16 16 16 16 16 16 16 16 16 13 16 16 16 22 13 pass hs94.cs-32x32x5Y Y Y Y 10 10 16 13 13 16 16 16 22 16 13 13 13 13 13 22 13 FAIL ideal_2D_oce Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass internal_wave Y Y Y Y 14 16 16 16 16 16 16 16 16 13 13 22 13 13 13 22 16 pass inverted_barometer Y Y Y Y 12 16 16 13 16 16 16 13 16 13 13 12 13 13 13 13 13 FAIL lab_sea Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass natl_box Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass plume_on_slope Y Y Y Y 13 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass solid-body.cs-32x32x1
1 | C $Header: /u/gcmpack/MITgcm/verification/aim.5l_cs/code/CPP_OPTIONS.h,v 1.2 2003/06/12 21:07:56 jmc Exp $ |
2 | C $Name: $ |
3 | C |
4 | |
5 | C |
6 | C CPP flags controlling which code in included in the files that |
7 | C will be compiled. |
8 | C |
9 | |
10 | C o Include/exclude temperature forcing code |
11 | #define INCLUDE_T_FORCING_CODE |
12 | |
13 | C o Include/exclude momentum advection code |
14 | #define INCLUDE_MOMENTUM_ADVECTION_CODE |
15 | #ifdef INCLUDE_MOMENTUM_ADVECTION_CODE |
16 | #define _ADM(a)a |
17 | #endif |
18 | #ifndef INCLUDE_MOMENTUM_ADVECTION_CODE |
19 | #define _ADM(a) |
20 | #endif |
21 | |
22 | C o Include/exclude laplacian viscosity code |
23 | #define INCLUDE_LP_MOMENTUM_DIFFUSION_CODE |
24 | #ifdef INCLUDE_LP_MOMENTUM_DIFFUSION_CODE |
25 | #define _LPM(a)a |
26 | #endif |
27 | #ifndef INCLUDE_LP_MOMENTUM_DIFFUSION_CODE |
28 | #define _LPM(a) |
29 | #endif |
30 | |
31 | C o Include/exclude biharmonic viscosity code |
32 | #define INCLUDE_BH_MOMENTUM_DIFFUSION_CODE |
33 | #ifdef INCLUDE_BH_MOMENTUM_DIFFUSION_CODE |
34 | #define _BHM(a)a |
35 | #endif |
36 | #ifndef INCLUDE_BH_MOMENTUM_DIFFUSION_CODE |
37 | #define _BHM(a) |
38 | #endif |
39 | |
40 | C o Include/exclude gradient of phy_hyd code |
41 | #define INCLUDE_GRADPH_CODE |
42 | #ifdef INCLUDE_GRADPH_CODE |
43 | #define _PHM(a)a |
44 | #endif |
45 | #ifndef INCLUDE_GRADPH_CODE |
46 | #define _PHM(a) |
47 | #endif |
48 | |
49 | C o Include/exclude momentum forcing code |
50 | #define INCLUDE_MOMENTUM_FORCING_CODE |
51 | |
52 | C o Include/exclude momentum eqn metric terms code |
53 | #define INCLUDE_MOMENTUM_METRIC_TERM_CODE |
54 | |
55 | C o Include/exclude phi_hyd calculation code |
56 | #define INCLUDE_PHIHYD_CALCULATION_CODE |
57 | |
58 | C o Include/exclude call to S/R CONVECT |
59 | #define INCLUDE_CONVECT_CALL |
60 | |
61 | C o Include/exclude call to S/R CALC_DIFFUSIVITY |
62 | #define INCLUDE_CALC_DIFFUSIVITY_CALL |
63 | |
64 | C o Allow nonHydrostatic code |
65 | #undef ALLOW_NONHYDROSTATIC |
66 | |
67 | C o Use "natural" boundary conditions for salinity |
68 | C instead of the "virtual salt flux" |
69 | #undef USE_NATURAL_BCS |
70 | |
71 | C o Use "Exact Convervation" of fluid in Free-Surface formulation |
72 | C so that d/dt(eta) is exactly equal to - Div.Transport |
73 | #define EXACT_CONSERV |
74 | |
75 | C o Allow the use of Non-Linear Free-Surface formulation |
76 | C this implies that surface thickness (hFactors) vary with time |
77 | #undef NONLIN_FRSURF |
78 | |
79 | C o Use "OLD" UV discretisation near boundaries (*not* recommended) |
80 | C Note - only works with #undef NO_SLIP_LATERAL in calc_mom_rhs.F |
81 | C because the old code did not have no-slip BCs |
82 | #undef OLD_ADV_BCS |
83 | |
84 | C o Use "OLD" UV geometry on sphere (definately *NOT* recommended) |
85 | C Note - only works with #undef NO_SLIP_LATERAL in calc_mom_rhs.F |
86 | C because the old code did not have no-slip BCs |
87 | #undef OLD_UV_GEOMETRY |
88 | |
89 | C o Execution environment support options |
90 | #include "CPP_EEOPTIONS.h" |
91 | |
92 | C o Include/exclude code specific to the ECCO/SEALION version. |
93 | #undef INCLUDE_ECCO_PACKAGE |
94 | #ifdef INCLUDE_ECCO_PACKAGE |
95 | #include "ECCO_CPPOPTIONS.h" |
96 | #endif |
97 |
ViewVC Help | |
Powered by ViewVC 1.1.22 |