ufs-community · jkbk2004 · Jan 4, 2023 · Dec 6, 2022 · Dec 7, 2022 · Dec 7, 2022
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/WW3 b/WW3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
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_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/parm/fd_nems.yaml b/tests/parm/fd_nems.yaml
@@ -896,75 +896,60 @@
      # WW3 export
      #-----------------------------------
      #
-     - standard_name: Sw_ch
-       alias: wave_induced_charnock_parameter
-       canonical_units: 1
-       description: ww3 export
-     - standard_name: Sw_ch
-       alias: charno
-     #
      - standard_name: Sw_z0
        alias: wave_z0_roughness_length
        canonical_units: 1
        description: ww3 export
      - standard_name: Sw_z0
        alias: z0rlen
      #
-     - standard_name: Sw_ustokes
-       alias: eastward_stokes_drift_current
+     - standard_name: Sw_pstokes_x
+       alias: eastward_partitioned_stokes_drift_current
        canonical_units: m s-1
-       description: ww3 export using ungridded dimension for drift components
-     - standard_name: Sw_ustokes
-       alias: uscurr
+       description: ww3 export partitioned drift components using ungridded dimension
      #
-     - standard_name: Sw_vstokes
-       alias: northward_stokes_drift_current
+     - standard_name: Sw_pstokes_y
+       alias: northward_partitioned_stokes_drift_current
        canonical_units: m s-1
-       description: ww3 export using ungridded dimension for drift components
-     - standard_name: Sw_vstokes
-       alias: vscurr
+       description: ww3 export partitioned drift components using ungridded dimension
      #
-     - 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: Sw_elevation_spectrum
+       alias: wave_elevation_spectrum
+       canonical_units: m2/s
+       description: wave elevation spectrum
      #
-     - standard_name: Sw_ustokes2
-       alias: eastward_partitioned_stokes_drift_2
-       canonical_units: m s-1
+     # remaining fields are unused but required to be present
+     #
+     - standard_name: Sw_ch
+       alias: wave_induced_charnock_parameter
+       canonical_units: 1
        description: ww3 export
-     - standard_name: Sw_ustokes2
-       alias: x2pstk
+     - standard_name: Sw_ch
+       alias: charno
      #
-     - standard_name: Sw_ustokes3
-       alias: eastward_partitioned_stokes_drift_3
+     - standard_name: eastward_stokes_drift_current
+       alias: uscurr
        canonical_units: m s-1
-       description: ww3 export
-     - standard_name: Sw_ustokes3
-       alias: x3pstk
+       description: ww3 export spectrum of drift components
      #
-     - standard_name: Sw_vstokes1
-       alias: northward_partitioned_stokes_drift_1
+     - standard_name: northward_stokes_drift_current
+       alias: vscurr
        canonical_units: m s-1
-       description: ww3 export
-     - standard_name: Sw_vstokes1
-       alias: y1pstk
+       description: ww3 export spectrum of drift components
      #
-     - standard_name: Sw_vstokes2
-       alias: northward_partitioned_stokes_drift_2
+     - standard_name: Sw_ustokes
+       alias: eastward_surface_stokes_drift_current
        canonical_units: m s-1
-       description: ww3 export
-     - standard_name: Sw_vstokes2
-       alias: y2pstk
+       description: ww3 export surface drift components
+     - standard_name: Sw_ustokes
+       alias: ussx
      #
-     - standard_name: Sw_vstokes3
-       alias: northward_partitioned_stokes_drift_3
+     - standard_name: Sw_vstokes
+       alias: northward_surface_stokes_drift_current
        canonical_units: m s-1
-       description: ww3 export
-     - standard_name: Sw_vstokes3
-       alias: y3pstk
+       description: ww3 export using surface drift components
+     - standard_name: Sw_vstokes
+       alias: ussy
      #
      - standard_name: Sw_wbcuru
        alias: eastward_wave_bottom_current
@@ -1008,10 +993,47 @@
      - standard_name: Sw_wavsvv
        alias: wavsvv
      #
-     - standard_name: Sw_elevation_spectrum
-       alias: wave_elevation_spectrum
-       canonical_units: m2/s
-       description: wave elevation spectrum
+     - 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: Sw_ustokes2
+       alias: eastward_partitioned_stokes_drift_2
+       canonical_units: m s-1
+       description: ww3 export
+     - standard_name: Sw_ustokes2
+       alias: x2pstk
+     #
+     - 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: Sw_vstokes1
+       alias: northward_partitioned_stokes_drift_1
+       canonical_units: m s-1
+       description: ww3 export
+     - standard_name: Sw_vstokes1
+       alias: y1pstk
+     #
+     - 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: Sw_vstokes3
+       alias: northward_partitioned_stokes_drift_3
+       canonical_units: m s-1
+       description: ww3 export
+     - standard_name: Sw_vstokes3
+       alias: y3pstk
      #
      #-----------------------------------
      # section: FV3 atm export/import to/from JEDI

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20221220
+BL_DATE=20230103
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -134,3 +134,7 @@ export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c192}
 
 export FV3_RUN=cpld_control_run.IN
+
+if [[ $MACHINE_ID = cheyenne.* ]]; then
+  TPN=18
+fi
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -159,3 +159,7 @@ export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 
 export FV3_RUN=cpld_control_run.IN
+
+if [[ $MACHINE_ID = cheyenne.* ]]; then
+  TPN=18
+fi
diff --git a/tests/tests/hafs_global_multiple_4nests_atm b/tests/tests/hafs_global_multiple_4nests_atm
@@ -179,3 +179,6 @@ export MODEL_CONFIGURE="model_configure_hafs.IN"
 export NEMS_CONFIGURE="nems.configure.hafs_atm.IN"
 export FV3_RUN="hafs_fv3_run.IN"
 
+if [[ $MACHINE_ID = cheyenne.* ]]; then
+  TPN=18
+fi
+3 −2		cesm/driver/util.F90
+69 −66		cesm/nuopc_cap_share/driver_pio_mod.F90
+2 −3		cesm/nuopc_cap_share/nuopc_shr_methods.F90
+2 −0		cime_config/buildexe
+443 −273		mediator/esmFlds.F90
+973 −968		mediator/esmFldsExchange_cesm_mod.F90
+28 −30		mediator/esmFldsExchange_hafs_mod.F90
+139 −137		mediator/esmFldsExchange_nems_mod.F90
+40 −32		mediator/med.F90
+34 −16		mediator/med_map_mod.F90
+111 −133		mediator/med_merge_mod.F90
+11 −7		mediator/med_phases_aofluxes_mod.F90
+2 −0		mediator/med_phases_ocnalb_mod.F90
+1 −1		mediator/med_phases_post_atm_mod.F90
+0 −1		mediator/med_phases_post_glc_mod.F90
+6 −3		mediator/med_phases_prep_atm_mod.F90
+3 −2		mediator/med_phases_prep_ice_mod.F90
+5 −2		mediator/med_phases_prep_lnd_mod.F90
+6 −4		mediator/med_phases_prep_ocn_mod.F90
+27 −18		mediator/med_phases_prep_rof_mod.F90
+2 −2		mediator/med_phases_prep_wav_mod.F90
+4 −17		config_src/drivers/nuopc_cap/mom_cap.F90
+0 −50		config_src/drivers/nuopc_cap/mom_cap_methods.F90