Skip to content

Commit

Permalink
Make signs of fields exported by ATM consistent with positive-down fo…
Browse files Browse the repository at this point in the history 
…r CMEPS (#1807)

* commit changes for sensible heat flux

* add sensible heat changes

* update submodules and fd for evap fields

* backup to pre-evap changes to test
  • Loading branch information
@DeniseWorthen
DeniseWorthen authored Aug 14, 2023
1 parent 5aeeffd commit cd8535b
Show file tree
Hide file tree
Showing 16 changed files with 7,765 additions and 7,764 deletions.
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 4 files
+11 −3 mediator/esmFldsExchange_nems_mod.F90
+3 −3 mediator/med.F90
+2 −3 mediator/med_phases_prep_atm_mod.F90
+2 −26 mediator/med_phases_prep_ocn_mod.F90
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 1 files
+10 −10 atmos_model.F90
2 changes: 1 addition & 1 deletion HYCOM-interface/HYCOM
Submodule HYCOM updated 1 files
+4 −11 NUOPC/hycom_couple.F90
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export BL_DATE=20230804
export BL_DATE=20230809

2 changes: 1 addition & 1 deletion tests/ci/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From noaaepic/ubuntu20.04-gnu9.3-hpc-stack:v1.2
From noaaepic/ubuntu20.04-gnu9.3-hpc-stack:v2.0

CMD ["/bin/bash"]

Expand Down
25 changes: 0 additions & 25 deletions tests/compare_ncfile.py
View file

This file was deleted.

2,860 changes: 1,463 additions & 1,397 deletions tests/logs/RegressionTests_acorn.log
View file

Large diffs are not rendered by default.

2,823 changes: 1,451 additions & 1,372 deletions tests/logs/RegressionTests_cheyenne.log
View file

Large diffs are not rendered by default.

1,655 changes: 786 additions & 869 deletions tests/logs/RegressionTests_gaea.log
View file

Large diffs are not rendered by default.

2,118 changes: 1,059 additions & 1,059 deletions tests/logs/RegressionTests_hera.log
View file

Large diffs are not rendered by default.

1,318 changes: 659 additions & 659 deletions tests/logs/RegressionTests_jet.log
View file

Large diffs are not rendered by default.

1,556 changes: 778 additions & 778 deletions tests/logs/RegressionTests_orion.log
View file

Large diffs are not rendered by default.

3,113 changes: 1,544 additions & 1,569 deletions tests/logs/RegressionTests_wcoss2.log
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ COMPILE | s2s_aoflux | intel | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_sf
RUN | cpld_control_noaero_p8_agrid | | baseline |

COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
RUN | cpld_control_c48 | | baseline |
RUN | cpld_control_c48 | | baseline |
#RUN | cpld_warmstart_c48 | | baseline |
#RUN | cpld_restart_c48 | | | cpld_warmstart_c48

Expand Down Expand Up @@ -132,7 +132,7 @@ RUN | rrfs_v1beta |
RUN | rrfs_v1nssl | | baseline |
RUN | rrfs_v1nssl_nohailnoccn | | baseline |
RUN | rrfs_smoke_conus13km_hrrr_warm | | baseline |
RUN | rrfs_smoke_conus13km_hrrr_warm_qr | | |
RUN | rrfs_smoke_conus13km_hrrr_warm_qr | - cheyenne | |
RUN | rrfs_smoke_conus13km_hrrr_warm_2threads | | |
RUN | rrfs_conus13km_hrrr_warm | | baseline |
RUN | rrfs_smoke_conus13km_radar_tten_warm | | baseline |
Expand All @@ -141,7 +141,7 @@ RUN | rrfs_smoke_conus13km_radar_tten_warm |
#RUN | rrfs_smoke_conus13km_hrrr_warm_restart | | | rrfs_smoke_conus13km_hrrr_warm
# Just to make sure restart doesn't crash again:
RUN | rrfs_smoke_conus13km_hrrr_warm_restart_mismatch | | baseline | rrfs_smoke_conus13km_hrrr_warm
RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | | | rrfs_smoke_conus13km_hrrr_warm_qr
RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | - cheyenne | | rrfs_smoke_conus13km_hrrr_warm_qr

COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | | fv3 |
RUN | control_csawmg | - gaea.intel | baseline |
Expand Down Expand Up @@ -206,9 +206,9 @@ RUN | hrrr_control_restart_qr_dyn32_phy32 |

COMPILE | rrfs_dyn32_phy32_faster | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DFASTER=ON | | fv3 |
RUN | rrfs_smoke_conus13km_fast_phy32 | | baseline |
RUN | rrfs_smoke_conus13km_fast_phy32_qr | | baseline |
RUN | rrfs_smoke_conus13km_fast_phy32_qr | - cheyenne | baseline |
RUN | rrfs_smoke_conus13km_fast_phy32_restart_mismatch | | baseline | rrfs_smoke_conus13km_fast_phy32
RUN | rrfs_smoke_conus13km_fast_phy32_restart_qr_mismatch | | | rrfs_smoke_conus13km_fast_phy32_qr
RUN | rrfs_smoke_conus13km_fast_phy32_restart_qr_mismatch | - cheyenne | | rrfs_smoke_conus13km_fast_phy32_qr

COMPILE | rrfs_dyn64_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON | | fv3 |
RUN | rap_control_dyn64_phy32 | | baseline |
Expand Down Expand Up @@ -334,7 +334,7 @@ RUN | hrrr_control_restart | + hera cheyenne
RUN | hrrr_control_restart_qr | + hera cheyenne | | hrrr_control_qr
RUN | rrfs_v1beta | + hera cheyenne | baseline |
RUN | rrfs_smoke_conus13km_hrrr_warm | + hera cheyenne | baseline |
RUN | rrfs_smoke_conus13km_hrrr_warm_qr | + hera cheyenne | |
RUN | rrfs_smoke_conus13km_hrrr_warm_qr | + hera | |
RUN | rrfs_smoke_conus13km_hrrr_warm_2threads | + hera cheyenne | |
RUN | rrfs_smoke_conus13km_radar_tten_warm | + hera cheyenne | baseline |
RUN | rrfs_conus13km_hrrr_warm | + hera cheyenne | baseline |
Expand All @@ -343,7 +343,7 @@ RUN | rrfs_conus13km_hrrr_warm | + hera cheyenne
#RUN | rrfs_smoke_conus13km_hrrr_warm_restart | + hera cheyenne | | rrfs_smoke_conus13km_hrrr_warm
# Just to make sure restart doesn't crash again:
RUN | rrfs_smoke_conus13km_hrrr_warm_restart_mismatch | + hera cheyenne | baseline | rrfs_smoke_conus13km_hrrr_warm
RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | + hera cheyenne | | rrfs_smoke_conus13km_hrrr_warm_qr
RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | + hera | | rrfs_smoke_conus13km_hrrr_warm_qr

### CCPP DEBUG tests ###
# Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
Expand Down Expand Up @@ -383,9 +383,9 @@ RUN | rap_restart_dyn32_phy32 | + hera cheyenne
RUN | hrrr_control_restart_dyn32_phy32 | + hera cheyenne | | hrrr_control_dyn32_phy32
RUN | hrrr_control_restart_qr_dyn32_phy32 | + hera cheyenne | | hrrr_control_qr_dyn32_phy32
RUN | rrfs_smoke_conus13km_phy32 | + hera cheyenne | baseline |
RUN | rrfs_smoke_conus13km_phy32_qr | + hera cheyenne | baseline |
RUN | rrfs_smoke_conus13km_phy32_qr | + hera | baseline |
RUN | rrfs_smoke_conus13km_phy32_restart_mismatch | + hera cheyenne | baseline | rrfs_smoke_conus13km_phy32
RUN | rrfs_smoke_conus13km_phy32_restart_qr_mismatch | + hera cheyenne | | rrfs_smoke_conus13km_phy32_qr
RUN | rrfs_smoke_conus13km_phy32_restart_qr_mismatch | + hera | | rrfs_smoke_conus13km_phy32_qr

COMPILE | atm_dyn64_phy32 | gnu | -DAPP=ATM -DCCPP_32BIT=ON | + hera cheyenne | fv3 |
RUN | rap_control_dyn64_phy32 | + hera cheyenne | baseline |
Expand Down
23 changes: 7 additions & 16 deletions tests/rt_utils.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,28 +347,19 @@ check_results() {
fi

if [[ $d -eq 1 && ${i##*.} == 'nc' ]] ; then
if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ wcoss2 || ${MACHINE_ID} =~ acorn || ${MACHINE_ID} =~ cheyenne || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ s4 || ${MACHINE_ID} =~ noaacloud ]] ; then
if [[ " orion hera wcoss2 acorn cheyenne gaea jet s4 noaacloud " =~ " ${MACHINE_ID} " ]]; then
printf ".......ALT CHECK.." >> ${RT_LOG}
printf ".......ALT CHECK.."
if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ cheyenne ]] ; then
if [[ $CMP_DATAONLY == false ]]; then
nccmp -d -S -q -f -g -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
else
nccmp -d -S -q -f -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
fi
if [[ $d -ne 0 && $d -ne 1 ]]; then
echo "....ERROR" >> ${RT_LOG}
echo "....ERROR"
exit 1
echo "....ERROR" >> ${RT_LOG}
echo "....ERROR"
exit 1
fi
else
${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/$i ${RUNDIR}/$i > compare_ncfile.log 2>&1 && d=$? || d=$?
if [[ $d -eq 1 ]]; then
echo "....ERROR" >> ${RT_LOG}
echo "....ERROR"
exit 1
fi
fi
fi
fi

Expand Down Expand Up @@ -635,11 +626,11 @@ ecflow_run() {
echo "ecflow_server is NOT running on ${ECF_HOST}:${ECF_PORT}"
if [[ ${MACHINE_ID} == wcoss2 || ${MACHINE_ID} == acorn ]]; then
if [[ "${HOST::1}" == "a" ]]; then
export ECF_HOST=aecflow01
export ECF_HOST=aecflow01
elif [[ "${HOST::1}" == "c" ]]; then
export ECF_HOST=cdecflow01
export ECF_HOST=cdecflow01
elif [[ "${HOST::1}" == "d" ]]; then
export ECF_HOST=ddecflow01
export ECF_HOST=ddecflow01
fi
MYCOMM="bash -l -c \"module load ecflow && ecflow_start.sh -p ${ECF_PORT} \""
ssh $ECF_HOST "${MYCOMM}"
Expand Down
10 changes: 4 additions & 6 deletions tests/run_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,11 @@ cp ${PATHTR}/modulefiles/ufs_common* ./modulefiles/.
# Get the shell file that loads the "module" command and purges modules:
cp ${PATHRT}/module-setup.sh module-setup.sh

if [[ $MACHINE_ID == wcoss2 ]] || [[ $MACHINE_ID == acorn ]] ; then
# for compare_ncfile.py
module load gcc/10.3.0 python/3.8.6
fi

# load nccmp module
if [[ $MACHINE_ID == hera ]] || [[ $MACHINE_ID == orion ]] || [[ $MACHINE_ID == gaea ]] || [[ $MACHINE_ID == jet ]] || [[ $MACHINE_ID == cheyenne ]]; then
if [[ " hera orion gaea jet cheyenne acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
if [[ " wcoss2 acorn " =~ " ${MACHINE_ID} " ]] ; then
module load intel/19.1.3.304 netcdf/4.7.4
fi
module load nccmp
fi

Expand Down

0 comments on commit cd8535b

Please sign in to comment.