Skip to content

Commit

Permalink
*Reconfigured CM2G63L to reflect actual ESM2G
Browse files Browse the repository at this point in the history 
- As raised in issue #42, the parameters recorded in examples/coupled_AM2_SIS/CM2G63L
  were not exactly those used in the production runs of ESM2G. They had meant to have
  been.
- Parameter changes can be seen in examples/coupled_AM2_SIS/CM2G63L/MOM_parameter_doc.all
  and were baed on the MOM_override being used for ESM2G:
     #override VELOCITY_TOLERANCE = 3.0e8
     #override CONTINUITY_CFL_LIMIT = 1.0
     #override CONT_PPM_BETTER_ITER = False
     #override CONT_PPM_USE_VISC_REM_MAX = False
     #override USE_BT_CONT_TYPE = False
     #override RESCALE_BT_FACE_AREAS = True
     #override BT_STRONG_DRAG = False
     #override NONLINEAR_BT_CONTINUITY = True
- We should no longer need any physical flags/parameters in MOM_override to run an ESM2G.
- This is an answer change for this experiment only.
- This closes issue #42.
  • Loading branch information
@adcroft
adcroft committed Aug 27, 2014
1 parent 100d4ec commit acf3628
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 40 deletions.
35 changes: 25 additions & 10 deletions examples/coupled_AM2_SIS/CM2G63L/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,15 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! tolerance for SSH is 4 times this value. The default
! is 0.5*NK*ANGSTROM, and this should not be set less x
! than about 10^-15*MAXIMUM_DEPTH.
VELOCITY_TOLERANCE = 1.0E-04 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies
! between the barotropic solution and the sum of the
! layer thicknesses.
CONTINUITY_CFL_LIMIT = 1.0 ! [nondim] default = 0.5
! The maximum CFL of the adjusted velocities.
CONT_PPM_BETTER_ITER = False ! [Boolean] default = True
! If true, stop corrective iterations using a velocity
! based criterion and only stop if the iteration is
! better than all predecessors.
CONT_PPM_USE_VISC_REM_MAX = False ! [Boolean] default = True
! If true, use more appropriate limiting bounds for
! corrections in strongly viscous columns.
CORIOLIS_EN_DIS = True ! [Boolean] default = False
! If true, two estimates of the thickness fluxes are used
! to estimate the Coriolis term, and the one that
Expand Down Expand Up @@ -383,12 +388,22 @@ BOUND_BT_CORRECTION = True ! [Boolean] default = False
! The barotropic x-halo size that is actually used.
!BT y-halo = 0 !
! The barotropic y-halo size that is actually used.
BT_STRONG_DRAG = True ! [Boolean] default = False
! If true, use a stronger estimate of the retarding
! effects of strong bottom drag, by making it implicit
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
USE_BT_CONT_TYPE = False ! [Boolean] default = True
! If true, use a structure with elements that describe
! effective face areas from the summed continuity solver
! as a function the barotropic flow in coupling between
! the barotropic and baroclinic flow. This is only used
! if SPLIT is true.
NONLINEAR_BT_CONTINUITY = True ! [Boolean] default = False
! If true, use nonlinear transports in the barotropic
! continuity equation. This does not apply if
! USE_BT_CONT_TYPE is true.
RESCALE_BT_FACE_AREAS = True ! [Boolean] default = False
! If true, the face areas used by the barotropic solver
! are rescaled to approximately reflect the open face
! areas of the interior layers. This probably requires
! FLUX_BT_COUPLING to work, and should not be used with
! USE_BT_CONT_TYPE.
DT_BT_FILTER = 0.0 ! [sec or nondim] default = -0.25
! A time-scale over which the barotropic mode solutions
! are filtered, in seconds if positive, or as a fraction
Expand Down
20 changes: 12 additions & 8 deletions examples/coupled_AM2_SIS/CM2G63L/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ ETA_TOLERANCE_AUX = 1.0E-06 ! [m] default = 1.0E-06
! layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as
! ETA_TOLERANCE, but can be made larger for efficiency.
VELOCITY_TOLERANCE = 1.0E-04 ! [m s-1] default = 3.0E+08
VELOCITY_TOLERANCE = 3.0E+08 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies
! between the barotropic solution and the sum of the
! layer thicknesses.
Expand All @@ -699,13 +699,13 @@ CONT_PPM_VOLUME_BASED_CFL = False ! [Boolean] default = False
! If true, use the ratio of the open face lengths to the
! tracer cell areas when estimating CFL numbers. The
! default is set by CONT_PPM_AGGRESS_ADJUST.
CONTINUITY_CFL_LIMIT = 0.5 ! [nondim] default = 0.5
CONTINUITY_CFL_LIMIT = 1.0 ! [nondim] default = 0.5
! The maximum CFL of the adjusted velocities.
CONT_PPM_BETTER_ITER = True ! [Boolean] default = True
CONT_PPM_BETTER_ITER = False ! [Boolean] default = True
! If true, stop corrective iterations using a velocity
! based criterion and only stop if the iteration is
! better than all predecessors.
CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True
CONT_PPM_USE_VISC_REM_MAX = False ! [Boolean] default = True
! If true, use more appropriate limiting bounds for
! corrections in strongly viscous columns.
NOSLIP = False ! [Boolean] default = False
Expand Down Expand Up @@ -953,17 +953,21 @@ BTHALO = 0 ! default = 0
! The barotropic x-halo size that is actually used.
!BT y-halo = 0 !
! The barotropic y-halo size that is actually used.
USE_BT_CONT_TYPE = True ! [Boolean] default = True
USE_BT_CONT_TYPE = False ! [Boolean] default = True
! If true, use a structure with elements that describe
! effective face areas from the summed continuity solver
! as a function the barotropic flow in coupling between
! the barotropic and baroclinic flow. This is only used
! if SPLIT is true.
NONLINEAR_BT_CONTINUITY = False ! [Boolean] default = False
NONLINEAR_BT_CONTINUITY = True ! [Boolean] default = False
! If true, use nonlinear transports in the barotropic
! continuity equation. This does not apply if
! USE_BT_CONT_TYPE is true.
RESCALE_BT_FACE_AREAS = False ! [Boolean] default = False
NONLIN_BT_CONT_UPDATE_PERIOD = 1 ! [nondim] default = 1
! If NONLINEAR_BT_CONTINUITY is true, this is the number
! of barotropic time steps between updates to the face
! areas, or 0 to update only before the barotropic stepping.
RESCALE_BT_FACE_AREAS = True ! [Boolean] default = False
! If true, the face areas used by the barotropic solver
! are rescaled to approximately reflect the open face
! areas of the interior layers. This probably requires
Expand Down Expand Up @@ -1006,7 +1010,7 @@ BT_THICK_SCHEME = "HYBRID" ! default = "HYBRID"
APPLY_BT_DRAG = True ! [Boolean] default = True
! If defined, bottom drag is applied within the
! barotropic solver.
BT_STRONG_DRAG = True ! [Boolean] default = False
BT_STRONG_DRAG = False ! [Boolean] default = False
! If true, use a stronger estimate of the retarding
! effects of strong bottom drag, by making it implicit
! with the barotropic time-step instead of implicit with
Expand Down
35 changes: 25 additions & 10 deletions examples/coupled_AM2_SIS/CM2G63L/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,15 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! tolerance for SSH is 4 times this value. The default
! is 0.5*NK*ANGSTROM, and this should not be set less x
! than about 10^-15*MAXIMUM_DEPTH.
VELOCITY_TOLERANCE = 1.0E-04 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies
! between the barotropic solution and the sum of the
! layer thicknesses.
CONTINUITY_CFL_LIMIT = 1.0 ! [nondim] default = 0.5
! The maximum CFL of the adjusted velocities.
CONT_PPM_BETTER_ITER = False ! [Boolean] default = True
! If true, stop corrective iterations using a velocity
! based criterion and only stop if the iteration is
! better than all predecessors.
CONT_PPM_USE_VISC_REM_MAX = False ! [Boolean] default = True
! If true, use more appropriate limiting bounds for
! corrections in strongly viscous columns.
CORIOLIS_EN_DIS = True ! [Boolean] default = False
! If true, two estimates of the thickness fluxes are used
! to estimate the Coriolis term, and the one that
Expand Down Expand Up @@ -372,12 +377,22 @@ BOUND_BT_CORRECTION = True ! [Boolean] default = False
! The barotropic x-halo size that is actually used.
!BT y-halo = 0 !
! The barotropic y-halo size that is actually used.
BT_STRONG_DRAG = True ! [Boolean] default = False
! If true, use a stronger estimate of the retarding
! effects of strong bottom drag, by making it implicit
! with the barotropic time-step instead of implicit with
! the baroclinic time-step and dividing by the number of
! barotropic steps.
USE_BT_CONT_TYPE = False ! [Boolean] default = True
! If true, use a structure with elements that describe
! effective face areas from the summed continuity solver
! as a function the barotropic flow in coupling between
! the barotropic and baroclinic flow. This is only used
! if SPLIT is true.
NONLINEAR_BT_CONTINUITY = True ! [Boolean] default = False
! If true, use nonlinear transports in the barotropic
! continuity equation. This does not apply if
! USE_BT_CONT_TYPE is true.
RESCALE_BT_FACE_AREAS = True ! [Boolean] default = False
! If true, the face areas used by the barotropic solver
! are rescaled to approximately reflect the open face
! areas of the interior layers. This probably requires
! FLUX_BT_COUPLING to work, and should not be used with
! USE_BT_CONT_TYPE.
DT_BT_FILTER = 0.0 ! [sec or nondim] default = -0.25
! A time-scale over which the barotropic mode solutions
! are filtered, in seconds if positive, or as a fraction
Expand Down
8 changes: 4 additions & 4 deletions examples/coupled_AM2_SIS/CM2G63L/timestats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean Sea Level, Total Mass, Mean Salin, Mean Temp, Frac Mass Err, Salin Err, Temp Err
[days] [m2 s-2] [Nondim] [m] [kg] [PSU] [degC] [Nondim] [PSU] [degC]
0, 693135.000, 0, En 6.974470353868E-01, CFL 0.00000, SL 1.8221E-09, M 1.37957E+21, S 34.7200, T 3.6134, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
3, 693135.250, 0, En 7.014801579689E-01, CFL 0.16401, SL -9.8659E-04, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.72E-16, Se 9.33E-15, Te 3.56E-15
6, 693135.500, 0, En 7.065364139828E-01, CFL 0.17050, SL -8.9830E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 3.92E-16, Se 1.33E-14, Te 2.55E-15
9, 693135.750, 0, En 7.067069121138E-01, CFL 0.19713, SL -8.1738E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 5.40E-16, Se 1.82E-14, Te 3.36E-15
12, 693136.000, 0, En 7.071265502482E-01, CFL 0.29495, SL -7.5144E-04, M 1.37957E+21, S 34.7200, T 3.6136, Me 6.72E-16, Se 2.26E-14, Te 4.19E-15
3, 693135.250, 0, En 7.015325633513E-01, CFL 0.17269, SL -9.8670E-04, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.74E-16, Se 9.48E-15, Te 3.60E-15
6, 693135.500, 0, En 7.065546227713E-01, CFL 0.16473, SL -8.9849E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 3.92E-16, Se 1.33E-14, Te 2.52E-15
9, 693135.750, 0, En 7.067812583885E-01, CFL 0.20736, SL -8.1865E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 5.26E-16, Se 1.77E-14, Te 3.32E-15
12, 693136.000, 0, En 7.071853054844E-01, CFL 0.26071, SL -7.5342E-04, M 1.37957E+21, S 34.7200, T 3.6136, Me 6.60E-16, Se 2.21E-14, Te 4.15E-15
8 changes: 4 additions & 4 deletions examples/coupled_AM2_SIS/CM2G63L/timestats.intel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean Sea Level, Total Mass, Mean Salin, Mean Temp, Frac Mass Err, Salin Err, Temp Err
[days] [m2 s-2] [Nondim] [m] [kg] [PSU] [degC] [Nondim] [PSU] [degC]
0, 693135.000, 0, En 6.974470353868E-01, CFL 0.00000, SL 1.8221E-09, M 1.37957E+21, S 34.7200, T 3.6134, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
3, 693135.250, 0, En 7.014811517918E-01, CFL 0.16401, SL -9.8659E-04, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.72E-16, Se 9.37E-15, Te 3.57E-15
6, 693135.500, 0, En 7.065447341373E-01, CFL 0.16176, SL -8.9827E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 3.92E-16, Se 1.33E-14, Te 2.54E-15
9, 693135.750, 0, En 7.067728327329E-01, CFL 0.19171, SL -8.1726E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 5.39E-16, Se 1.81E-14, Te 3.35E-15
12, 693136.000, 0, En 7.071474207759E-01, CFL 0.26532, SL -7.5145E-04, M 1.37957E+21, S 34.7200, T 3.6136, Me 6.71E-16, Se 2.26E-14, Te 4.20E-15
3, 693135.250, 0, En 7.015347319897E-01, CFL 0.17269, SL -9.8670E-04, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.75E-16, Se 9.42E-15, Te 3.60E-15
6, 693135.500, 0, En 7.065696623159E-01, CFL 0.17057, SL -8.9854E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 3.91E-16, Se 1.34E-14, Te 2.52E-15
9, 693135.750, 0, En 7.066417318744E-01, CFL 0.19021, SL -8.1903E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 5.29E-16, Se 1.78E-14, Te 3.37E-15
12, 693136.000, 0, En 7.071521983276E-01, CFL 0.25976, SL -7.5372E-04, M 1.37957E+21, S 34.7200, T 3.6136, Me 6.60E-16, Se 2.22E-14, Te 4.14E-15
8 changes: 4 additions & 4 deletions examples/coupled_AM2_SIS/CM2G63L/timestats.pgi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean Sea Level, Total Mass, Mean Salin, Mean Temp, Frac Mass Err, Salin Err, Temp Err
[days] [m2 s-2] [Nondim] [m] [kg] [PSU] [degC] [Nondim] [PSU] [degC]
0, 693135.000, 0, En 6.974470353868E-01, CFL 0.00000, SL 1.8221E-09, M 1.37957E+21, S 34.7200, T 3.6134, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
3, 693135.250, 0, En 7.014786772596E-01, CFL 0.16402, SL -9.8659E-04, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.72E-16, Se 9.36E-15, Te 3.56E-15
6, 693135.500, 0, En 7.065307181632E-01, CFL 0.16404, SL -8.9840E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 3.92E-16, Se 1.33E-14, Te 2.54E-15
9, 693135.750, 0, En 7.066511166098E-01, CFL 0.17258, SL -8.1767E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 5.40E-16, Se 1.83E-14, Te 3.35E-15
12, 693136.000, 0, En 7.072296086135E-01, CFL 0.27844, SL -7.5172E-04, M 1.37957E+21, S 34.7200, T 3.6136, Me 6.68E-16, Se 2.24E-14, Te 4.16E-15
3, 693135.250, 0, En 7.015277981211E-01, CFL 0.17269, SL -9.8669E-04, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.74E-16, Se 9.47E-15, Te 3.59E-15
6, 693135.500, 0, En 7.065823559929E-01, CFL 0.16456, SL -8.9860E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 3.91E-16, Se 1.33E-14, Te 2.53E-15
9, 693135.750, 0, En 7.068585786500E-01, CFL 0.21563, SL -8.1916E-04, M 1.37957E+21, S 34.7200, T 3.6135, Me 5.25E-16, Se 1.77E-14, Te 3.32E-15
12, 693136.000, 0, En 7.073996398138E-01, CFL 0.28792, SL -7.5353E-04, M 1.37957E+21, S 34.7200, T 3.6136, Me 6.66E-16, Se 2.24E-14, Te 4.16E-15

1 comment on commit acf3628

@jkrasting
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for the sake of completenes, there are still a few overrides needed to a coupled CMIP5 ESM2G simulation with AM2/LM3:

override define USE_RIVER_HEAT_CONTENT

override define USE_CALVING_HEAT_CONTENT

override define ENERGYSAVEDAYS 73.0

override undef DO_IDEAL_VINTAGE

override undef DO_IDEAL_AGE_DATED

override define COORD_FILE "GOLD_IC_L63.11.15.2010.nc"

override define THICKNESS_FILE "GOLD_IC_L63.11.15.2010.nc"

override define TS_FILE "GOLD_IC_L63.11.15.2010.nc"

Please sign in to comment.