Send Evap rate from ATM to OCN (ufs-community#1812)

* send evap from atm * instead of converting from lat->evap in prep_ocn, send evap from atm directly. Sign change still needed. * turn off c48-5deg warm start test * disable hrrr tests on wcoss2
HelinWei-NOAA · Jul 7, 2023 · 50db30e · 50db30e
1 parent 24c51d1
commit 50db30e
Show file tree

Hide file tree

Showing 14 changed files with 10,875 additions and 13,406 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230623
+export BL_DATE=20230705
 
diff --git a/tests/fv3_conf/compile_qsub.IN_acorn b/tests/fv3_conf/compile_qsub.IN_acorn
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+#PBS -o out
+#PBS -e err
+#PBS -N @[JBNME]
+#PBS -A @[ACCNR]
+#PBS -q @[QUEUE]
+#PBS -l select=1:ncpus=8:mpiprocs=1:mem=32G
+#PBS -l walltime=00:45:00
+
+set -eux
+
+cd $PBS_O_WORKDIR
+
+echo -n " $( date +%s )," >  job_timestamp.txt
+echo "Compile started:  " `date`
+
+@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
+
+echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> job_timestamp.txt
diff --git a/tests/fv3_conf/fv3_qsub.IN_acorn b/tests/fv3_conf/fv3_qsub.IN_acorn
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#PBS -o out
+#PBS -e err
+#PBS -N @[JBNME]
+#PBS -A @[ACCNR]
+#PBS -q @[QUEUE]
+#PBS -l place=vscatter,select=@[NODES]:ncpus=@[TPN]:mpiprocs=@[TPN]:mem=500G
+#PBS -l place=excl
+#PBS -l walltime=00:@[WLCLK]:00
+
+set -eux
+echo -n " $( date +%s )," >  job_timestamp.txt
+
+cd $PBS_O_WORKDIR
+
+set +x
+module use $PWD/modulefiles
+module load modules.fv3
+module load cray-pals
+module list
+set -x
+
+echo "Model started:  " `date`
+
+export OMP_STACKSIZE=512M
+export OMP_NUM_THREADS=@[THRD]
+export OMP_PLACES=cores
+export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
+export ESMF_RUNTIME_PROFILE=ON
+export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
+
+mpiexec -n @[TASKS] -ppn @[TPN] -depth @[THRD] ./fv3.exe
+
+echo "Model ended:    " `date`
+echo -n " $( date +%s )," >> job_timestamp.txt
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/fd_nems.yaml b/tests/parm/fd_nems.yaml
@@ -763,6 +763,8 @@
        canonical_units: N m-2
      - standard_name: inst_laten_heat_flx
        canonical_units: N m-2
+     - standard_name: inst_evap_rate
+       canonical_units: kg m-2 s-1
      - standard_name: inst_tracer_mass_frac
        canonical_units: 1
      - standard_name: inst_tracer_up_surface_flx

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -55,8 +55,8 @@ RUN | cpld_control_noaero_p8_agrid                      |
 
 COMPILE | 7 | intel | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
 RUN | cpld_control_c48                                  |                            | baseline |
-RUN | cpld_warmstart_c48                                |                            | baseline |
-RUN | cpld_restart_c48                                  |                            |          | cpld_warmstart_c48
+#RUN | cpld_warmstart_c48                                |                            | baseline |
+#RUN | cpld_restart_c48                                  |                            |          | cpld_warmstart_c48
 
 COMPILE | 8 | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DFASTER=ON | - cheyenne | fv3 |
 RUN | cpld_control_p8_faster                            | - cheyenne                 | baseline |
@@ -121,12 +121,12 @@ RUN | rap_restart                                       |
 RUN | rap_sfcdiff                                       |                            | baseline |
 RUN | rap_sfcdiff_decomp                                |                            |          |
 RUN | rap_sfcdiff_restart                               |                            |          | rap_sfcdiff
-RUN | hrrr_control                                      |                            | baseline |
-RUN | hrrr_control_qr                                   |                            | baseline |
-RUN | hrrr_control_decomp                               |                            |          |
-RUN | hrrr_control_2threads                             |                            |          |
-RUN | hrrr_control_restart                              |                            |          | hrrr_control
-RUN | hrrr_control_restart_qr                           |                            |          | hrrr_control_qr
+RUN | hrrr_control                                      | - wcoss2                   | baseline |
+RUN | hrrr_control_qr                                   | - wcoss2                   | baseline |
+RUN | hrrr_control_decomp                               | - wcoss2                   |          |
+RUN | hrrr_control_2threads                             | - wcoss2                   |          |
+RUN | hrrr_control_restart                              | - wcoss2                   |          | hrrr_control
+RUN | hrrr_control_restart_qr                           | - wcoss2                   |          | hrrr_control_qr
 RUN | rrfs_v1beta                                       |                            | baseline |
 RUN | rrfs_v1nssl                                       |                            | baseline |
 RUN | rrfs_v1nssl_nohailnoccn                           |                            | baseline |
+3 −3		mediator/esmFldsExchange_nems_mod.F90
+2 −3		mediator/med_phases_prep_ocn_mod.F90
+30 −22		atmos_model.F90
+177 −103		cpl/module_block_data.F90
+3 −1		cpl/module_cplfields.F90
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		export BL_DATE=20230623
		export BL_DATE=20230705