Fix SW net to ocean (ufs-community#1773)

* update CMEPS w/ fix for error condition update cmeps build to implement check4nans feature using module stored in cdeps repo * make pio rearranger=box the default for all tests * update configurations for ocnalb changes * set the ocean albedo limit in config and use it to set logical flag * albdir and albdif can be set as non-std values in nems.configure will default to 0.07 and 0.06 if not set * ocean albedo changes were merged at ESCOMP * fix variable name in 2 nems.configure files * update CMEPs with fioi_swpen fix * remove albedo limiter for DATM cases
Qingfu-Liu · Aug 25, 2023 · f590ec8 · f590ec8
1 parent 7e9063d
commit f590ec8
Show file tree

Hide file tree

Showing 17 changed files with 5,667 additions and 5,934 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -31,6 +31,8 @@ list(APPEND _nems_util_files
   CMEPS/ufs/ufs_kind_mod.F90
   CMEPS/ufs/perf_mod.F90
   CMEPS/ufs/ufs_const_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_orb_mod.F90
+  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_const_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_abort_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_strconvert_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_log_mod.F90

diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20230822
+export BL_DATE=20230824
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -700,6 +700,8 @@ export ocn_model=mom6
 export ice_model=cice6
 export wav_model=ww3
 export pio_rearranger=box
+export ocean_albedo_limit=0.06
+export use_mean_albedos=.false.
 
 export coupling_interval_slow_sec=${DT_THERM_MOM6}
 export coupling_interval_fast_sec=${DT_ATMOS}
@@ -955,6 +957,8 @@ export atm_model=datm
 export ocn_model=mom6
 export ice_model=cice6
 export pio_rearranger=box
+export ocean_albedo_limit=0.06
+export use_mean_albedos=.false.
 
 export ATM_compute_tasks=$ATM_compute_tasks_cdeps_100
 export OCN_tasks=$OCN_tasks_cdeps_100

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_cheyenne.log b/tests/logs/RegressionTests_cheyenne.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
@@ -104,6 +104,7 @@ runSeq::
      MED med_phases_post_ice
      WAV -> MED :remapMethod=redist
      MED med_phases_post_wav
+     MED med_phases_ocnalb_run
      MED med_phases_prep_ocn_accum
    @
    OCN -> MED :remapMethod=redist
@@ -125,7 +126,9 @@ MED_attributes::
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]
+      ocean_albedo_limit = @[ocean_albedo_limit]
 ::
+
 ALLCOMP_attributes::
       ScalarFieldCount = 2
       ScalarFieldIdxGridNX = 1
@@ -144,4 +147,10 @@ ALLCOMP_attributes::
       stop_n = @[FHMAX]
       stop_option = nhours
       stop_ymd = -999
+      orb_eccen = 1.e36
+      orb_iyear = 2000
+      orb_iyear_align = 2000
+      orb_mode = fixed_year
+      orb_mvelp = 1.e36
+      orb_obliq = 1.e36
 ::
diff --git a/tests/parm/nems.configure.cpld_agrid.IN b/tests/parm/nems.configure.cpld_agrid.IN
@@ -74,6 +74,7 @@ runSeq::
      MED med_phases_post_atm
      ICE -> MED :remapMethod=redist
      MED med_phases_post_ice
+     MED med_phases_ocnalb_run
      MED med_phases_prep_ocn_accum
    @
    OCN -> MED :remapMethod=redist
@@ -104,7 +105,9 @@ MED_attributes::
       ccpp_ini_layout = @[INPES],@[JNPES]
       ccpp_ini_read = false
       pio_rearranger = @[pio_rearranger]
+      ocean_albedo_limit = @[ocean_albedo_limit]
 ::
+
 ALLCOMP_attributes::
       ScalarFieldCount = 2
       ScalarFieldIdxGridNX = 1
@@ -123,4 +126,10 @@ ALLCOMP_attributes::
       stop_n = @[FHMAX]
       stop_option = nhours
       stop_ymd = -999
+      orb_eccen = 1.e36
+      orb_iyear = 2000
+      orb_iyear_align = 2000
+      orb_mode = fixed_year
+      orb_mvelp = 1.e36
+      orb_obliq = 1.e36
 ::
diff --git a/tests/parm/nems.configure.cpld_noaero.IN b/tests/parm/nems.configure.cpld_noaero.IN
@@ -93,6 +93,7 @@ runSeq::
      MED med_phases_post_ice
      WAV -> MED :remapMethod=redist
      MED med_phases_post_wav
+     MED med_phases_ocnalb_run
      MED med_phases_prep_ocn_accum
    @
    OCN -> MED :remapMethod=redist
@@ -114,7 +115,9 @@ MED_attributes::
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]
+      ocean_albedo_limit = @[ocean_albedo_limit]
 ::
+
 ALLCOMP_attributes::
       ScalarFieldCount = 2
       ScalarFieldIdxGridNX = 1
@@ -133,4 +136,10 @@ ALLCOMP_attributes::
       stop_n = @[FHMAX]
       stop_option = nhours
       stop_ymd = -999
+      orb_eccen = 1.e36
+      orb_iyear = 2000
+      orb_iyear_align = 2000
+      orb_mode = fixed_year
+      orb_mvelp = 1.e36
+      orb_obliq = 1.e36
 ::
diff --git a/tests/parm/nems.configure.cpld_noaero_nowave.IN b/tests/parm/nems.configure.cpld_noaero_nowave.IN
@@ -73,6 +73,7 @@ runSeq::
      MED med_phases_post_atm
      ICE -> MED :remapMethod=redist
      MED med_phases_post_ice
+     MED med_phases_ocnalb_run
      MED med_phases_prep_ocn_accum
    @
    OCN -> MED :remapMethod=redist
@@ -93,7 +94,9 @@ MED_attributes::
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]
+      ocean_albedo_limit = @[ocean_albedo_limit]
 ::
+
 ALLCOMP_attributes::
       ScalarFieldCount = 2
       ScalarFieldIdxGridNX = 1
@@ -112,4 +115,10 @@ ALLCOMP_attributes::
       stop_n = @[FHMAX]
       stop_option = nhours
       stop_ymd = -999
+      orb_eccen = 1.e36
+      orb_iyear = 2000
+      orb_iyear_align = 2000
+      orb_mode = fixed_year
+      orb_mvelp = 1.e36
+      orb_obliq = 1.e36
 ::
diff --git a/tests/parm/nems.configure.cpld_noaero_outwav.IN b/tests/parm/nems.configure.cpld_noaero_outwav.IN
@@ -84,6 +84,7 @@ runSeq::
      MED med_phases_post_atm
      ICE -> MED :remapMethod=redist
      MED med_phases_post_ice
+     MED med_phases_ocnalb_run
      MED med_phases_prep_ocn_accum
      MED med_phases_prep_wav_accum
    @
@@ -108,7 +109,9 @@ MED_attributes::
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
       pio_rearranger = @[pio_rearranger]
+      ocean_albedo_limit = @[ocean_albedo_limit]
 ::
+
 ALLCOMP_attributes::
       ScalarFieldCount = 2
       ScalarFieldIdxGridNX = 1
@@ -127,4 +130,10 @@ ALLCOMP_attributes::
       stop_n = @[FHMAX]
       stop_option = nhours
       stop_ymd = -999
+      orb_eccen = 1.e36
+      orb_iyear = 2000
+      orb_iyear_align = 2000
+      orb_mode = fixed_year
+      orb_mvelp = 1.e36
+      orb_obliq = 1.e36
 ::
diff --git a/tests/parm/nems.configure.datm_cdeps.IN b/tests/parm/nems.configure.datm_cdeps.IN
@@ -76,6 +76,7 @@ runSeq::
      MED med_phases_post_atm
      ICE -> MED :remapMethod=redist
      MED med_phases_post_ice
+     MED med_phases_ocnalb_run
      MED med_phases_aofluxes_run
      MED med_phases_prep_ocn_accum
    @
@@ -102,6 +103,7 @@ MED_attributes::
       coupling_mode = nems_orig_data
       pio_rearranger = @[pio_rearranger]
 ::
+
 ALLCOMP_attributes::
       ScalarFieldCount = 3
       ScalarFieldIdxGridNX = 1
+6 −5		.github/workflows/srt.yml
+40 −2		cime_config/config_component.xml
+1 −1		cime_config/namelist_definition_drv.xml
+2 −2		mediator/esmFldsExchange_cesm_mod.F90
+18 −2		mediator/esmFldsExchange_nems_mod.F90
+6 −7		mediator/med.F90
+0 −1		mediator/med_internalstate_mod.F90
+3 −3		mediator/med_io_mod.F90
+12 −10		mediator/med_map_mod.F90
+5 −2		mediator/med_methods_mod.F90
+1 −1		mediator/med_phases_history_mod.F90
+119 −50		mediator/med_phases_ocnalb_mod.F90
+6 −86		mediator/med_phases_prep_ocn_mod.F90