Send Evap rate from ATM to OCN

.gitmodules

@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/DeniseWorthen/fv3atm
+  branch = feature/evapfratm
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
@@ -16,8 +18,10 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS
+  branch = feature/evapfratm
 [submodule "HYCOM"]
   path = HYCOM-interface/HYCOM
   url = https://github.com/NOAA-EMC/HYCOM-src

tests/bl_date.conf

@@ -1,2 +1,2 @@
-export BL_DATE=20230623
+export BL_DATE=20230705
 

tests/opnReqTest

@@ -137,16 +137,13 @@ build_opnReqTests() {
 run_opnReqTests() {
   JOB_NR=0
   for rc in $run_case; do
-    # load default variables and override as necessary
-    source default_vars.sh
-    source ${PATHRT}/tests/$TEST_NAME
 
     # if TEST_NAME specifies WARM_START true, error and exit
+    source ${PATHRT}/tests/$TEST_NAME
     if [[ ${WARM_START} == .T. ]]; then
       error "test-name cannot be a restart run (i.e. WARM_START=.T.)"
     fi
 
-    application=''
     if [[ $TEST_NAME =~ regional ]]; then
       application=regional
     elif [[ $TEST_NAME =~ cpld ]]; then
@@ -251,6 +248,7 @@ run_opnReqTests() {
 			export skip_check_results=${skip_check_results}
 			export delete_rundir=${delete_rundir}
       export RT_COMPILER=${RT_COMPILER}
+      export WLCLK=${WLCLK}
 			EOF
 
     if [[ $ECFLOW == true ]]; then
@@ -345,8 +343,6 @@ if [[ $MACHINE_ID = hera ]]; then
   STMP=${dprefix}/stmp4
   PTMP=${dprefix}/stmp2
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_hera fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_hera fv3_conf/compile_slurm.IN
 
 elif [[ $MACHINE_ID = orion ]]; then
 
@@ -364,8 +360,6 @@ elif [[ $MACHINE_ID = orion ]]; then
   STMP=$dprefix/stmp
   PTMP=$dprefix/stmp
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_orion fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_orion fv3_conf/compile_slurm.IN
 
 elif [[ $MACHINE_ID = linux ]]; then
 
@@ -468,6 +462,9 @@ if [[ $dbg_compare == true && ! $test_case =~ dbg ]]; then
   error "$program: debug reproducibility test requires specifying dbg"
 fi
 
+# load default variables and override as necessary
+source default_vars.sh
+
 # enumerate which case to compile and run
 compile_case=
 run_case=
@@ -547,11 +544,6 @@ if [[ $ECFLOW == true ]]; then
     error "ecflow is not supported on this machine $MACHINE_ID"
   fi
 
-  if [[ $MACHINE_ID == hera ]] && [[ ! $HOSTNAME == hecflow* ]]; then
-    echo "ERROR: To use ECFlow on Hera please use the 'hecflow01' login node: ssh hecflow01."
-    exit 1
-  fi
-
 fi
 
 opnreqtest_log=${PATHRT}/logs/OpnReqTests_${TEST_NAME}_$MACHINE_ID.log

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

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 |

tests/rt.sh

@@ -158,8 +158,6 @@ if [[ $MACHINE_ID = wcoss2 ]]; then
   STMP=/lfs/h2/emc/ptmp
   PTMP=/lfs/h2/emc/ptmp
   SCHEDULER=pbs
-  cp fv3_conf/fv3_qsub.IN_wcoss2 fv3_conf/fv3_qsub.IN
-  cp fv3_conf/compile_qsub.IN_wcoss2 fv3_conf/compile_qsub.IN
 
 elif [[ $MACHINE_ID = acorn ]]; then
 
@@ -180,8 +178,6 @@ elif [[ $MACHINE_ID = acorn ]]; then
   STMP=/lfs/h2/emc/ptmp
   PTMP=/lfs/h2/emc/ptmp
   SCHEDULER=pbs
-  cp fv3_conf/fv3_qsub.IN_wcoss2 fv3_conf/fv3_qsub.IN
-  cp fv3_conf/compile_qsub.IN_wcoss2 fv3_conf/compile_qsub.IN
 
 elif [[ $MACHINE_ID = gaea ]]; then
 
@@ -198,8 +194,6 @@ elif [[ $MACHINE_ID = gaea ]]; then
   PTMP=/lustre/f2/scratch
 
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_gaea fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_gaea fv3_conf/compile_slurm.IN
 
 elif [[ $MACHINE_ID = hera ]]; then
 
@@ -226,8 +220,6 @@ elif [[ $MACHINE_ID = hera ]]; then
   PTMP=$dprefix/stmp2
 
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_hera fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_hera fv3_conf/compile_slurm.IN
 
 elif [[ $MACHINE_ID = orion ]]; then
 
@@ -253,8 +245,6 @@ elif [[ $MACHINE_ID = orion ]]; then
   PTMP=$dprefix/stmp
 
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_orion fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_orion fv3_conf/compile_slurm.IN
 
 elif [[ $MACHINE_ID = jet ]]; then
 
@@ -278,8 +268,6 @@ elif [[ $MACHINE_ID = jet ]]; then
   PTMP=${PTMP:-$dprefix/RT_RUNDIRS}
 
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_jet fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_jet fv3_conf/compile_slurm.IN
 
 elif [[ $MACHINE_ID = s4 ]]; then
 
@@ -304,8 +292,6 @@ elif [[ $MACHINE_ID = s4 ]]; then
   PTMP=/scratch/users
 
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_s4 fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_s4 fv3_conf/compile_slurm.IN
 
 elif [[ $MACHINE_ID = cheyenne ]]; then
 
@@ -322,8 +308,6 @@ elif [[ $MACHINE_ID = cheyenne ]]; then
   STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=pbs
-  cp fv3_conf/fv3_qsub.IN_cheyenne fv3_conf/fv3_qsub.IN
-  cp fv3_conf/compile_qsub.IN_cheyenne fv3_conf/compile_qsub.IN
 
 elif [[ $MACHINE_ID = stampede ]]; then
 
@@ -339,7 +323,6 @@ elif [[ $MACHINE_ID = stampede ]]; then
   SCHEDULER=slurm
   MPIEXEC=ibrun
   MPIEXECOPTS=
-  cp fv3_conf/fv3_slurm.IN_stampede fv3_conf/fv3_slurm.IN
 
 elif [[ $MACHINE_ID = expanse ]]; then
 
@@ -353,7 +336,6 @@ elif [[ $MACHINE_ID = expanse ]]; then
   STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_expanse fv3_conf/fv3_slurm.IN
 
  elif [[ $MACHINE_ID = noaacloud.* ]]; then
 
@@ -373,8 +355,6 @@ elif [[ $MACHINE_ID = expanse ]]; then
   STMP=$dprefix/stmp4
   PTMP=$dprefix/stmp2
   SCHEDULER=slurm
-  cp fv3_conf/fv3_slurm.IN_noaacloud fv3_conf/fv3_slurm.IN
-  cp fv3_conf/compile_slurm.IN_noaacloud fv3_conf/compile_slurm.IN
 
 
 else
@@ -805,6 +785,7 @@ EOF
       export DEP_RUN=${DEP_RUN}
       export skip_check_results=${skip_check_results}
       export delete_rundir=${delete_rundir}
+      export WLCLK=${WLCLK}
 EOF
       if [[ $MACHINE_ID = jet ]]; then
         cat << EOF >> ${RUNDIR_ROOT}/run_test_${TEST_NR}.env

tests/run_compile.sh

@@ -37,8 +37,10 @@ export COMPILE_NR=$4
 cd ${PATHRT}
 remove_fail_test
 
-[[ -e ${RUNDIR_ROOT}/compile_${COMPILE_NR}.env ]] && source ${RUNDIR_ROOT}/compile_${COMPILE_NR}.env
+source detect_machine.sh
 source default_vars.sh
+[[ -e ${RUNDIR_ROOT}/compile_${COMPILE_NR}.env ]] && source ${RUNDIR_ROOT}/compile_${COMPILE_NR}.env
+
 
 
 export TEST_NAME=compile
@@ -57,12 +59,27 @@ rm -rf ${RUNDIR}
 mkdir -p ${RUNDIR}
 cd $RUNDIR
 
-if [[ $SCHEDULER = 'slurm' ]]; then
-  atparse < $PATHRT/fv3_conf/compile_slurm.IN > job_card
+if [[ $SCHEDULER = 'pbs' ]]; then
+  if [[ -e $PATHRT/fv3_conf/compile_qsub.IN_${MACHINE_ID} ]]; then 
+    atparse < $PATHRT/fv3_conf/compile_qsub.IN_${MACHINE_ID} > job_card
+  else
+    echo "Looking for fv3_conf/compile_qsub.IN_${MACHINE_ID} but it is not found. Exiting"
+    exit 1
+  fi
+elif [[ $SCHEDULER = 'slurm' ]]; then
+  if [[ -e $PATHRT/fv3_conf/compile_slurm.IN_${MACHINE_ID} ]]; then
+    atparse < $PATHRT/fv3_conf/compile_slurm.IN_${MACHINE_ID} > job_card
+  else
+    echo "Looking for fv3_conf/compile_slurm.IN_${MACHINE_ID} but it is not found. Exiting"
+    exit 1
+  fi
 elif [[ $SCHEDULER = 'lsf' ]]; then
-  atparse < $PATHRT/fv3_conf/compile_bsub.IN > job_card
-elif [[ $SCHEDULER = 'pbs' ]]; then
-  atparse < $PATHRT/fv3_conf/compile_qsub.IN > job_card
+  if [[ -e $PATHRT/fv3_conf/compile_bsub.IN_${MACHINE_ID} ]]; then
+    atparse < $PATHRT/fv3_conf/compile_bsub.IN_${MACHINE_ID} > job_card
+  else
+    echo "Looking for fv3_conf/compile_bsub.IN_${MACHINE_ID} but it is not found. Exiting"
+    exit 1
+  fi
 fi
 
 ################################################################################

tests/run_test.sh

@@ -47,8 +47,9 @@ cd ${PATHRT}
 unset MODEL_CONFIGURE
 unset NEMS_CONFIGURE
 
-[[ -e ${RUNDIR_ROOT}/run_test_${TEST_NR}.env ]] && source ${RUNDIR_ROOT}/run_test_${TEST_NR}.env
+source detect_machine.sh
 source default_vars.sh
+[[ -e ${RUNDIR_ROOT}/run_test_${TEST_NR}.env ]] && source ${RUNDIR_ROOT}/run_test_${TEST_NR}.env
 source tests/$TEST_NAME
 
 remove_fail_test
@@ -282,11 +283,26 @@ TASKS=$(( NODES * TPN ))
 export TASKS
 
 if [[ $SCHEDULER = 'pbs' ]]; then
-  atparse < $PATHRT/fv3_conf/fv3_qsub.IN > job_card
+  if [[ -e $PATHRT/fv3_conf/fv3_qsub.IN_${MACHINE_ID} ]]; then 
+    atparse < $PATHRT/fv3_conf/fv3_qsub.IN_${MACHINE_ID} > job_card
+  else
+    echo "Looking for fv3_conf/fv3_qsub.IN_${MACHINE_ID} but it is not found. Exiting"
+    exit 1
+  fi
 elif [[ $SCHEDULER = 'slurm' ]]; then
-  atparse < $PATHRT/fv3_conf/fv3_slurm.IN > job_card
+  if [[ -e $PATHRT/fv3_conf/fv3_slurm.IN_${MACHINE_ID} ]]; then
+    atparse < $PATHRT/fv3_conf/fv3_slurm.IN_${MACHINE_ID} > job_card
+  else
+    echo "Looking for fv3_conf/fv3_slurm.IN_${MACHINE_ID} but it is not found. Exiting"
+    exit 1
+  fi
 elif [[ $SCHEDULER = 'lsf' ]]; then
-  atparse < $PATHRT/fv3_conf/fv3_bsub.IN > job_card
+  if [[ -e $PATHRT/fv3_conf/fv3_bsub.IN_${MACHINE_ID} ]]; then
+    atparse < $PATHRT/fv3_conf/fv3_bsub.IN_${MACHINE_ID} > job_card
+  else
+    echo "Looking for fv3_conf/fv3_bsub.IN_${MACHINE_ID} but it is not found. Exiting"
+    exit 1
+  fi
 fi
 
 ################################################################################