Skip to content

Commit

Permalink
Merge branch 'develop' into branch_CICE-Consortium
Browse files Browse the repository at this point in the history
  • Loading branch information
@NickSzapiro-NOAA
NickSzapiro-NOAA committed Sep 16, 2024
2 parents b7e06b6 + 7062191 commit 8426aaa
Show file tree
Hide file tree
Showing 62 changed files with 2,704 additions and 2,519 deletions.
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240904
export BL_DATE=20240909
156 changes: 139 additions & 17 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,14 @@ export IMO=384
export JMO=190
export WRITE_NSFLIP=.true.

# New damping coefficients made the following
# dynamic based on resolution
export N_SPLIT=5
export K_SPLIT=2
export TAU=0.0
export RF_CUTOFF=10.
export FV_SG_ADJ=450

export DZ_MIN=6
export MIN_SEAICE=0.15
export FRAC_GRID=.true.
Expand Down Expand Up @@ -639,6 +647,7 @@ export KNOB_UGWP_NDX4LH=1
export KNOB_UGWP_VERSION=0
export KNOB_UGWP_PALAUNCH=500.e2
export KNOB_UGWP_NSLOPE=1
export KNOB_UGWP_TAUAMP=3.0e-3
export DO_UGWP_V0_NST_ONLY=.false.

# resolution dependent settings
Expand Down Expand Up @@ -751,7 +760,6 @@ export FSICS=0

# Dynamical core
export FV_CORE_TAU=0.
export RF_CUTOFF=10.0
export FAST_TAU_W_SEC=0.2
export DRY_MASS=98320.0

Expand Down Expand Up @@ -891,23 +899,137 @@ export FNAISC="'IMS-NIC.blended.ice.monthly.clim.grb'"

# Add section for tiled grid namelist
export_tiled() {
export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
export FNALBC="'${ATMRES}.snowfree_albedo.tileX.nc'"
export FNALBC2="'${ATMRES}.facsf.tileX.nc'"
export FNTG3C="'${ATMRES}.substrate_temperature.tileX.nc'"
export FNVEGC="'${ATMRES}.vegetation_greenness.tileX.nc'"
export FNVETC="'${ATMRES}.vegetation_type.tileX.nc'"
export FNSOTC="'${ATMRES}.soil_type.tileX.nc'"
export FNSOCC="'${ATMRES}.soil_color.tileX.nc'"
export FNSMCC=${FNSMCC_control}
export FNMSKH=${FNMSKH_control}
export FNVMNC="'${ATMRES}.vegetation_greenness.tileX.nc'"
export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
export LANDICE=".false."
export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
export FNALBC="'${ATMRES}.snowfree_albedo.tileX.nc'"
export FNALBC2="'${ATMRES}.facsf.tileX.nc'"
export FNTG3C="'${ATMRES}.substrate_temperature.tileX.nc'"
export FNVEGC="'${ATMRES}.vegetation_greenness.tileX.nc'"
export FNVETC="'${ATMRES}.vegetation_type.tileX.nc'"
export FNSOTC="'${ATMRES}.soil_type.tileX.nc'"
export FNSOCC="'${ATMRES}.soil_color.tileX.nc'"
export FNSMCC=${FNSMCC_control}
export FNMSKH=${FNMSKH_control}
export FNVMNC="'${ATMRES}.vegetation_greenness.tileX.nc'"
export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
export LANDICE=".false."
}

export_ugwpv1() {
export DO_UGWP_V1=.true.
export DO_UGWP_V0=.false.
export GWD_OPT=2
export KNOB_UGWP_VERSION=1
export KNOB_UGWP_NSLOPE=1
export DO_GSL_DRAG_LS_BL=.true.
export DO_GSL_DRAG_SS=.true.
export DO_GSL_DRAG_TOFD=.true.
export DO_UGWP_V1_OROG_ONLY=.false.
export DO_UGWP_V0_NST_ONLY=.false.
export LDIAG_UGWP=.false.
export KNOB_UGWP_DOKDIS=2
export KNOB_UGWP_NDX4LH=4

# Add updated damping and timestep variables
case "${ATMRES}" in
"C48")
export DT_ATMOS=720
export XR_CNVCLD=.false.
export CDMBGWD="0.071,2.1,1.0,1.0"
export CDMBGWD_GSL="40.0,1.77,1.0,1.0"
export KNOB_UGWP_TAUAMP=6.0e-3
export K_SPLIT=1
export N_SPLIT=4
export TAU=10.0
export RF_CUTOFF=100.0
export FV_SG_ADJ=3600
;;
"C96")
export DT_ATMOS=720
export XR_CNVCLD=.false.
export CDMBGWD="0.14,1.8,1.0,1.0"
export CDMBGWD_GSL="20.0,2.5,1.0,1.0"
export KNOB_UGWP_TAUAMP=3.0e-3
export K_SPLIT=1
export N_SPLIT=4
export TAU=8.0
export RF_CUTOFF=100.0
export FV_SG_ADJ=1800
;;
"C192")
export DT_ATMOS=600
export XR_CNVCLD=.true.
export CDMBGWD="0.23,1.5,1.0,1.0"
export CDMBGWD_GSL="5.0,5.0,1.0,1.0"
export KNOB_UGWP_TAUAMP=1.5e-3
export K_SPLIT=2
export N_SPLIT=5
export TAU=6.0
export RF_CUTOFF=100.0
export FV_SG_ADJ=1800
;;
"C384")
export DT_ATMOS=300
export XR_CNVCLD=.true.
export CDMBGWD="1.1,0.72,1.0,1.0"
export CDMBGWD_GSL="5.0,5.0,1.0,1.0"
export KNOB_UGWP_TAUAMP=0.8e-3
export K_SPLIT=2
export N_SPLIT=4
export TAU=4.0
export RF_CUTOFF=100.0
export FV_SG_ADJ=900
;;
"C768")
export DT_ATMOS=150
export XR_CNVCLD=.true.
export CDMBGWD="4.0,0.15,1.0,1.0"
export CDMBGWD_GSL="2.5,7.5,1.0,1.0"
export KNOB_UGWP_TAUAMP=0.5e-3
export K_SPLIT=2
export N_SPLIT=4
export TAU=3.0
export RF_CUTOFF=100.0
export FV_SG_ADJ=450
;;
"C1152")
export DT_ATMOS=150
export XR_CNVCLD=.true.
export CDMBGWD="4.0,0.10,1.0,1.0"
export CDMBGWD_GSL="1.67,8.8,1.0,1.0"
export KNOB_UGWP_TAUAMP=0.35e-3
export K_SPLIT=2
export N_SPLIT=6
export TAU=2.5
export RF_CUTOFF=100.0
export FV_SG_ADJ=450
;;
"C3072")
export DT_ATMOS=90
export XR_CNVCLD=.true.
export CDMBGWD="4.0,0.05,1.0,1.0"
export CDMBGWD_GSL="0.625,14.1,1.0,1.0"
export KNOB_UGWP_TAUAMP=0.13e-3
export K_SPLIT=4
export N_SPLIT=5
export TAU=0.5
export RF_CUTOFF=100.0
export FV_SG_ADJ=300
;;
*)
echo Invalid model resolution: "${ATMRES}". Please update specified variable ATMRES.
exit 1
;;
esac

if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
export DT_INNER=${DT_ATMOS}

}


# Defaults for the CICE6 model namelist, mx100
export_cice6() {
Expand Down
62 changes: 31 additions & 31 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Thu Sep 5 22:25:10 UTC 2024
Mon Sep 9 23:10:23 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_489716/bit_base_bit_base
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 288.390708
0: The maximum resident set size (KB) = 1444228
0: The total amount of wall time = 301.063864
0: The maximum resident set size (KB) = 1450936

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_489716/dbg_base_dbg_base
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 991.170195
0: The maximum resident set size (KB) = 1442092
0: The total amount of wall time = 1003.768135
0: The maximum resident set size (KB) = 1432920

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_489716/dcp_dcp
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 259.478625
0: The maximum resident set size (KB) = 1412816
0: The total amount of wall time = 272.986390
0: The maximum resident set size (KB) = 1418504

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_489716/mpi_mpi
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 269.710451
0: The maximum resident set size (KB) = 1422344
0: The total amount of wall time = 271.716758
0: The maximum resident set size (KB) = 1429720

Test mpi PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_489716/rst_rst
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 260.906817
0: The maximum resident set size (KB) = 1412512
0: The total amount of wall time = 271.525308
0: The maximum resident set size (KB) = 1430068

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_489716/std_base_std_base
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 259.986892
0: The maximum resident set size (KB) = 1423876
0: The total amount of wall time = 270.165754
0: The maximum resident set size (KB) = 1429764

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_489716/thr_thr
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_664740/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 263.854937
0: The maximum resident set size (KB) = 1422848
0: The total amount of wall time = 270.519887
0: The maximum resident set size (KB) = 1441764

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Thu Sep 5 23:39:10 UTC 2024
Elapsed time: 01h:14m:01s. Have a nice day!
Tue Sep 10 00:41:38 UTC 2024
Elapsed time: 01h:31m:15s. Have a nice day!
Loading

0 comments on commit 8426aaa

Please sign in to comment.