/[MITgcm]/MITgcm/model/inc/CPP_OPTIONS.h
ViewVC logotype

Annotation of /MITgcm/model/inc/CPP_OPTIONS.h

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.22.2.1 - (hide annotations) (download)
Wed Oct 1 20:43:17 2003 UTC (21 years, 9 months ago) by adcroft
Branch: branch-genmake2
Changes since 1.22: +14 -125 lines
File MIME type: text/plain 
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 adcroft 1.22.2.1 C $Header: $
2     C $Name: $
3 adcroft 1.17
4 adcroft 1.22.2.1 C CPP flags controlling particular source code features
5 jmc 1.15
6 cnh 1.6 C o Include/exclude code for C-D grid method of integrating the
7     C coriolis terms
8 heimbach 1.13 #define INCLUDE_CD_CODE
9 adcroft 1.10
10 cnh 1.6 C o Include/exclude temperature forcing code
11 adcroft 1.22.2.1 C#define INCLUDE_T_FORCING_CODE
12 cnh 1.6
13 adcroft 1.22.2.1 C o Shortwave heating as extra term in external_forcing.F
14     C Note: this should be a run-time option and not necessarily dependent on KPP
15     #ifdef ALLOW_KPP
16     #define SHORTWAVE_HEATING
17 cnh 1.6 #endif
18    
19     C o Include/exclude momentum forcing code
20     #define INCLUDE_MOMENTUM_FORCING_CODE
21    
22     C o Include/exclude momentum eqn metric terms code
23     #define INCLUDE_MOMENTUM_METRIC_TERM_CODE
24    
25     C o Include/exclude phi_hyd calculation code
26     #define INCLUDE_PHIHYD_CALCULATION_CODE
27    
28     C o Include/exclude call to S/R CONVECT
29     #define INCLUDE_CONVECT_CALL
30    
31     C o Include/exclude call to S/R CALC_DIFFUSIVITY
32     #define INCLUDE_CALC_DIFFUSIVITY_CALL
33 adcroft 1.8
34 adcroft 1.11 C o Allow nonHydrostatic code
35 adcroft 1.22.2.1 #define ALLOW_NONHYDROSTATIC
36    
37     C o Include pressure loading code
38     #define ATMOSPHERIC_LOADING
39 adcroft 1.11
40 adcroft 1.8 C o Use "natural" boundary conditions for salinity
41     C instead of the "virtual salt flux"
42 adcroft 1.11 #undef USE_NATURAL_BCS
43 adcroft 1.18
44     C o Use "Exact Convervation" of fluid in Free-Surface formulation
45     C so that d/dt(eta) is exactly equal to - Div.Transport
46 adcroft 1.22.2.1 #define EXACT_CONSERV
47 adcroft 1.18
48     C o Allow the use of Non-Linear Free-Surface formulation
49     C this implies that surface thickness (hFactors) vary with time
50 adcroft 1.22.2.1 #define NONLIN_FRSURF
51 adcroft 1.7
52     C o Use "OLD" UV discretisation near boundaries (*not* recommended)
53     C Note - only works with #undef NO_SLIP_LATERAL in calc_mom_rhs.F
54     C because the old code did not have no-slip BCs
55     #undef OLD_ADV_BCS
56    
57     C o Use "OLD" UV geometry on sphere (definately *NOT* recommended)
58     C Note - only works with #undef NO_SLIP_LATERAL in calc_mom_rhs.F
59     C because the old code did not have no-slip BCs
60     #undef OLD_UV_GEOMETRY
61 dimitri 1.22
62 cnh 1.6 C o Execution environment support options
63 adcroft 1.3 #include "CPP_EEOPTIONS.h"
64 heimbach 1.13
65     C o Include/exclude code specific to the ECCO/SEALION version.
66     #undef INCLUDE_ECCO_PACKAGE
67     #ifdef INCLUDE_ECCO_PACKAGE
68     #include "ECCO_CPPOPTIONS.h"
69     #endif
  ViewVC Help
Powered by ViewVC 1.1.22