ufs-community · DeniseWorthen · Feb 3, 2022 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/fd_nems.yaml b/tests/parm/fd_nems.yaml
@@ -380,8 +380,7 @@
      - standard_name: Si_vice
        alias: mean_ice_volume
        canonical_units: m
-       description: sea-ice export
-         volume of ice per unit area
+       description: sea-ice export - volume of ice per unit are
      #
      - standard_name: Si_snowh
        canonical_units: m
@@ -406,6 +405,13 @@
        canonical_units: m
        description: ocean export
      #
+     - standard_name: So_h
+       alias: sea_surface_height_above_sea_level
+       canonical_units: m
+       description: ocean export
+     - standard_name: So_h
+       alias: seahgt
+     #
      - standard_name: So_dhdx
        alias: sea_surface_slope_zonal
        canonical_units: m m-1
@@ -760,85 +766,121 @@
        canonical_units: 1
        description: ww3 import
      #
-     #
+     #-----------------------------------
      # WW3 export
+     #-----------------------------------
      #
-     - standard_name: wave_induced_charnock_parameter
+     - standard_name: Sw_ch
+       alias: wave_induced_charnock_parameter
        canonical_units: 1
        description: ww3 export
+     - standard_name: Sw_ch
+       alias: charno
      #
-     - standard_name: Sw_zo
+     - standard_name: Sw_z0
        alias: wave_z0_roughness_length
        canonical_units: 1
        description: ww3 export
+     - standard_name: Sw_z0
+       alias: z0rlen
      #
-     - standard_name: northward_stokes_drift_current
+     - standard_name: Sw_ustokes
+       alias: eastward_stokes_drift_current
        canonical_units: m s-1
-       description: ww3 export
+       description: ww3 export using ungridded dimension for drift components
+     - standard_name: Sw_ustokes
+       alias: uscurr
      #
-     - standard_name: eastward_stokes_drift_current
+     - standard_name: Sw_vstokes
+       alias: northward_stokes_drift_current
        canonical_units: m s-1
-       description: ww3 export
+       description: ww3 export using ungridded dimension for drift components
+     - standard_name: Sw_vstokes
+       alias: vscurr
      #
-     - standard_name: eastward_partitioned_stokes_drift_1
+     - standard_name: Sw_ustokes1
+       alias: eastward_partitioned_stokes_drift_1
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_ustokes1
+       alias: x1pstk
      #
-     - standard_name: eastward_partitioned_stokes_drift_2
+     - standard_name: Sw_ustokes2
+       alias: eastward_partitioned_stokes_drift_2
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_ustokes2
+       alias: x2pstk
      #
-     - standard_name: eastward_partitioned_stokes_drift_3
+     - standard_name: Sw_ustokes3
+       alias: eastward_partitioned_stokes_drift_3
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_ustokes3
+       alias: x3pstk
      #
-     - standard_name: northward_partitioned_stokes_drift_1
+     - standard_name: Sw_vstokes1
+       alias: northward_partitioned_stokes_drift_1
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_vstokes1
+       alias: y1pstk
      #
-     - standard_name: northward_partitioned_stokes_drift_2
+     - standard_name: Sw_vstokes2
+       alias: northward_partitioned_stokes_drift_2
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_vstokes2
+       alias: y2pstk
      #
-     - standard_name: northward_partitioned_stokes_drift_3
+     - standard_name: Sw_vstokes3
+       alias: northward_partitioned_stokes_drift_3
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_vstokes3
+       alias: y3pstk
      #
-     - standard_name: eastward_wave_bottom_current
+     - standard_name: Sw_wbcuru
+       alias: eastward_wave_bottom_current
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_wbcuru
+       alias: wbcuru
      #
-     - standard_name: northward_wave_bottom_current
+     - standard_name: Sw_wbcurv
+       alias: northward_wave_bottom_current
        canonical_units: m s-1
        description: ww3 export
+     - standard_name: Sw_wbcurv
+       alias: wbcurv
      #
-     - standard_name: wave_bottom_current_radian_frequency
-       canonical_units: rad s-1
-       description: ww3 export
-     #
-     - standard_name: eastward_wave_radiation_stress_gradient
-       canonical_units: Pa
-       description: ww3 export
-     #
-     - standard_name: northward_wave_radiation_stress_gradient
-       canonical_units: Pa
+     - standard_name: Sw_wbcurp
+       alias: wave_bottom_current_period
+       canonical_units: s
        description: ww3 export
+     - standard_name: Sw_wbcurp
+       alias: wbcurp
      #
-     - standard_name: eastward_wave_radiation_stress
+     - standard_name: Sw_wavsuu
+       alias: eastward_wave_radiation_stress
        canonical_units: N m-1
        description: ww3 export
+     - standard_name: Sw_wavsuu
+       alias: wavsuu
      #
-     - standard_name: eastward_northward_wave_radiation_stress
+     - standard_name: Sw_wavsuv
+       alias: eastward_northward_wave_radiation_stress
        canonical_units: N m-1
        description: ww3 export
+     - standard_name: Sw_wavsuv
+       alias: wavsuv
      #
-     - standard_name: wave_bottom_current_period
-       canonical_units: s
-       description: ww3 export
-     #
-     - standard_name: northward_wave_radiation_stress
+     - standard_name: Sw_wavsvv
+       alias: northward_wave_radiation_stress
        canonical_units: Pa
        description: ww3 export
+     - standard_name: Sw_wavsvv
+       alias: wavsvv
      #
      #-----------------------------------
      # section: FV3 atm export/import to/from JEDI

diff --git a/tests/parm/nems.configure.hafs_atm_ocn_wav.IN b/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
@@ -79,27 +79,30 @@ WAV_attributes::
   Diagnostic = 0
   OverwriteSlice = false
   merge_import = .true.
+  mask_value_water = 1
+  mask_value_land = 0
 ::
 
 # Run Sequence #
 runSeq::
 @@[coupling_interval_sec]
-  ATM -> MED :remapMethod=redist
-  MED med_phases_post_atm
-  OCN -> MED :remapMethod=redist
-  MED med_phases_post_ocn
-  WAV -> MED :remapMethod=redist
-  MED med_phases_post_wav
   MED med_phases_prep_atm
-  MED -> ATM :remapMethod=redist
   MED med_phases_prep_ocn_accum
   MED med_phases_prep_ocn_avg
+  MED med_phases_prep_wav_accum
+  MED med_phases_prep_wav_avg
+  MED -> ATM :remapMethod=redist
   MED -> OCN :remapMethod=redist
-  MED med_phases_prep_wav
   MED -> WAV :remapMethod=redist
   ATM
   OCN
   WAV
+  ATM -> MED :remapMethod=redist
+  OCN -> MED :remapMethod=redist
+  WAV -> MED :remapMethod=redist
+  MED med_phases_post_atm
+  MED med_phases_post_ocn
+  MED med_phases_post_wav
 @
 ::
 
@@ -122,7 +125,7 @@ ALLCOMP_attributes::
   restart_n = 6
   restart_option = nhours
   restart_ymd = -999
-  dbug_flag = 20
+  dbug_flag = 0
   use_coldstart = true
   orb_eccen = 1.e36
   orb_iyear = 2000

diff --git a/tests/parm/nems.configure.hafs_atm_wav.IN b/tests/parm/nems.configure.hafs_atm_wav.IN
@@ -76,21 +76,24 @@ WAV_attributes::
   Diagnostic = 0
   OverwriteSlice = false
   merge_import = .true.
+  mask_value_water = 1
+  mask_value_land = 0
 ::
 
 # Run Sequence #
 runSeq::
 @@[coupling_interval_sec]
-  ATM -> MED :remapMethod=redist
-  MED med_phases_post_atm
-  WAV -> MED :remapMethod=redist
-  MED med_phases_post_wav
   MED med_phases_prep_atm
+  MED med_phases_prep_wav_accum
+  MED med_phases_prep_wav_avg
   MED -> ATM :remapMethod=redist
-  MED med_phases_prep_wav
   MED -> WAV :remapMethod=redist
   ATM
   WAV
+  ATM -> MED :remapMethod=redist
+  WAV -> MED :remapMethod=redist
+  MED med_phases_post_atm
+  MED med_phases_post_wav
 @
 ::
+9 −14		.github/pull_request_template.md
+10 −9		cesm/nuopc_cap_share/shr_fire_emis_mod.F90
+1 −2		cime_config/buildexe
+11 −15		cime_config/buildnml
+15 −1		cime_config/config_component.xml
+0 −567		cime_config/config_component_ufs.xml
+32 −18		cime_config/namelist_definition_drv.xml
+2 −1		cime_config/runseq/runseq_general.py
+54 −111		mediator/esmFlds.F90
+48 −51		mediator/esmFldsExchange_cesm_mod.F90
+20 −20		mediator/esmFldsExchange_hafs_mod.F90
+79 −6		mediator/esmFldsExchange_nems_mod.F90
+114 −396		mediator/med.F90
+8 −8		mediator/med_diag_mod.F90
+27 −24		mediator/med_fraction_mod.F90
+494 −47		mediator/med_internalstate_mod.F90
+62 −57		mediator/med_map_mod.F90
+1 −2		mediator/med_merge_mod.F90
+415 −201		mediator/med_phases_aofluxes_mod.F90
+18 −9		mediator/med_phases_history_mod.F90
+1 −1		mediator/med_phases_ocnalb_mod.F90
+16 −2		mediator/med_phases_post_atm_mod.F90
+18 −16		mediator/med_phases_post_glc_mod.F90
+1 −13		mediator/med_phases_post_ice_mod.F90
+3 −4		mediator/med_phases_post_lnd_mod.F90
+15 −15		mediator/med_phases_post_ocn_mod.F90
+1 −1		mediator/med_phases_post_rof_mod.F90
+1 −1		mediator/med_phases_post_wav_mod.F90
+9 −12		mediator/med_phases_prep_atm_mod.F90
+20 −21		mediator/med_phases_prep_glc_mod.F90
+2 −2		mediator/med_phases_prep_ice_mod.F90
+1 −1		mediator/med_phases_prep_lnd_mod.F90
+1 −3		mediator/med_phases_prep_ocn_mod.F90
+1 −1		mediator/med_phases_prep_rof_mod.F90
+133 −64		mediator/med_phases_prep_wav_mod.F90
+18 −1		mediator/med_phases_restart_mod.F90