change default resolution (#204)

* Cleans up default_vars to reflect new default test resolution of c96-1deg ocean and ice. * Reproduces existing tests by adding non-default configurations (eg c96-1/4deg ocean and ice) explicitly * Removes many old settings in existing tests which are now defaults (eg. setting input_nml to the ccpp version). * Adds s2s tests to replicate existing c384-1/4 deg tests for the control, benchmark, benchmark+waves and c384mx025 frac grid configurations. These tests are b4b with existing baselines. * Replicates c96mx025 restart test using temporary settings to replicate the 2d/3d and restart from 2d test. These tests are b4b with existing baselines. * Changes three MOM6 default settings to match MOM6 defaults for the 1deg model: MOM6_RIVER_RUNOFF is now set False MOM6_REPRO_LA and MOM6_THERMO_SPAN are now set False * Adds new MOM6_USE_WAVES setting (default False) to combine the wave and non-wave MOM input templates
ufs-community · Oct 21, 2020 · 953ef14 · 953ef14
1 parent 559d9dd
commit 953ef14
Show file tree

Hide file tree

Showing 50 changed files with 15,001 additions and 14,092 deletions.
diff --git a/parm/MOM_input_template_025 b/parm/MOM_input_template_025
@@ -783,6 +783,29 @@ LT_ENHANCE = 3                  !   [nondim] default = 0
                                 !          1 - Van Roekel et al. 2014/Li et al., 2016
                                 !          2 - Multiplied w/ adjusted La.
                                 !          3 - Added w/ adjusted La.
+USE_WAVES = MOM6_USE_WAVES      !   [Boolean] default = False
+                                ! If true, enables surface wave modules.
+WAVE_METHOD = "SURFACE_BANDS"   ! default = "EMPTY"
+                                ! Choice of wave method, valid options include:
+                                !  TEST_PROFILE  - Prescribed from surface Stokes drift
+                                !                  and a decay wavelength.
+                                !  SURFACE_BANDS - Computed from multiple surface values
+                                !                  and decay wavelengths.
+                                !  DHH85         - Uses Donelan et al. 1985 empirical
+                                !                  wave spectrum with prescribed values.
+                                !  LF17          - Infers Stokes drift profile from wind
+                                !                  speed following Li and Fox-Kemper 2017.
+SURFBAND_SOURCE = "COUPLER"     ! default = "EMPTY"
+                                ! Choice of SURFACE_BANDS data mode, valid options include:
+                                !  DATAOVERRIDE  - Read from NetCDF using FMS DataOverride.
+                                !  COUPLER       - Look for variables from coupler pass
+                                !  INPUT         - Testing with fixed values.
+STK_BAND_COUPLER = 3            ! default = 1
+                                ! STK_BAND_COUPLER is the number of Stokes drift bands in the coupler. This has
+                                ! to be consistent with the number of Stokes drift bands in WW3, or the model
+                                ! will fail.
+SURFBAND_WAVENUMBERS = 0.04, 0.11, 0.3305 !   [rad/m] default = 0.12566
+                                ! Central wavenumbers for surface Stokes drift bands.
 LT_ENHANCE_COEF = 0.044         !   [nondim] default = 0.447
                                 ! Coefficient for Langmuir enhancement if LT_ENHANCE > 1
 LT_ENHANCE_EXP = -1.5           !   [nondim] default = -1.33

diff --git a/parm/MOM_input_wave_template_025 b/parm/MOM_input_wave_template_025
diff --git a/parm/model_configure.IN b/parm/model_configure.IN
@@ -18,7 +18,7 @@ memuse_verbose:          .false.
 atmos_nthreads:          @[THRD]
 use_hyper_thread:        .false.
 ncores_per_node:         24
-restart_interval:        @[FV3_RESTART_INTERVAL]
+restart_interval:        @[FV3_RESTART_H]
 fhrot:                   @[FHROT]
 output_1st_tstep_rst:    .false.
 atm_coupling_interval_sec:      @[coupling_interval_fast_sec]

diff --git a/parm/nems.configure.medcmeps_atm_ocn_ice.IN b/parm/nems.configure.medcmeps_atm_ocn_ice.IN
@@ -42,7 +42,7 @@ ICE_attributes::
   ProfileMemory = false
   OverwriteSlice = true
   mesh_ice = @[MESHICE]
-  stop_n = @[FHMAX]
+  stop_n = @[FV3_RESTART_H]
   stop_option = nhours
   stop_ymd = -999
 ::
@@ -94,7 +94,7 @@ ALLCOMP_attributes::
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
       case_name = ufs.s2s
-      restart_n = @[FV3_RESTART_INTERVAL]
+      restart_n = @[FV3_RESTART_H]
       restart_option = nhours
       restart_ymd = -999
       dbug_flag = @[cap_dbug_flag]

diff --git a/parm/nems.configure.medcmeps_atm_ocn_ice_wav.IN b/parm/nems.configure.medcmeps_atm_ocn_ice_wav.IN
@@ -42,7 +42,7 @@ ICE_attributes::
   ProfileMemory = false
   OverwriteSlice = true
   mesh_ice = @[MESHICE]
-  stop_n = @[FHMAX]
+  stop_n = @[FV3_RESTART_H]
   stop_option = nhours
   stop_ymd = -999  
 ::
@@ -108,7 +108,7 @@ ALLCOMP_attributes::
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
       case_name = ufs.s2s
-      restart_n = @[FV3_RESTART_INTERVAL]
+      restart_n = @[FV3_RESTART_H]
       restart_option = nhours
       restart_ymd = -999
       dbug_flag = @[cap_dbug_flag]

diff --git a/parm/nems.configure.medcoldcmeps_atm_ocn_ice.IN b/parm/nems.configure.medcoldcmeps_atm_ocn_ice.IN
diff --git a/parm/nems.configure.medcoldcmeps_atm_ocn_ice_wav.IN b/parm/nems.configure.medcoldcmeps_atm_ocn_ice_wav.IN