Skip to content

Commit 7a7919f

Browse files
Merge remote-tracking branch 'origin/develop' into new-gnv1-regtest
2 parents 806d9b2 + 3a48a64 commit 7a7919f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+3647
-3382
lines changed

CICE-interface/CICE

Submodule CICE updated 37 files

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ set(JEDI_DRIVER OFF CACHE BOOL "Enable JEDI as top level driver")
7373
set(CMEPS_AOFLUX OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
7474
set(PDLIB OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
7575
set(CDEPS_INLINE OFF CACHE BOOL "Enable CDEPS inline capability")
76+
set(HYDRO OFF CACHE BOOL "Enable hydrostatic set")
7677

7778
set(CMAKE_Platform $ENV{CMAKE_Platform})
7879
if(CMAKE_Platform)
@@ -122,6 +123,7 @@ message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
122123
message("JEDI_DRIVER ...... ${JEDI_DRIVER}")
123124
message("CMEPS_AOFLUX ..... ${CMEPS_AOFLUX}")
124125
message("CDEPS_INLINE ..... ${CDEPS_INLINE}")
126+
message("HYDRO ........... ${HYDRO}")
125127

126128
message("")
127129

NOAHMP-interface/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ endif()
5656

5757
#------------------------------------------------------------------------------
5858
# Add model-specific flags for C/C++/Fortran preprocessor
59-
add_definitions(-DMOIST_CAPPA -DUSE_COND -DNEMS_GSM)
60-
add_definitions(-DINTERNAL_FILE_NML)
59+
if (NOT HYDRO)
60+
add_definitions(-DMOIST_CAPPA -DUSE_COND)
61+
endif()
62+
add_definitions(-DINTERNAL_FILE_NML -DNEMS_GSM)
6163

6264
#------------------------------------------------------------------------------
6365
# NOAHMP

cmake/Intel.cmake

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 5462")
77
# remark #7712: This variable has not been used.
88
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 7712")
99

10+
# remark #8291: Recommended relationship between field width 'W' and the number of fractional digits 'D' in this edit descriptor is 'W>=D+7'.
11+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 8291")
12+
1013
if(CMAKE_Platform STREQUAL "derecho.intel")
1114
set(CMAKE_Fortran_LINK_FLAGS "-Wl,--copy-dt-needed-entries")
1215
endif()

doc/UsersGuide/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ importlib-metadata==7.0.1
2626
# via
2727
# sphinx
2828
# sphinxcontrib-bibtex
29-
jinja2==3.1.3
29+
jinja2==3.1.4
3030
# via sphinx
3131
latexcodec==2.0.1
3232
# via pybtex

tests/bl_date.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20240419
1+
export BL_DATE=20240522

tests/ci/Jenkinsfile.combined

+8
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ def generateStage(nodeLabel) {
6969
cd $WORKSPACE/tests/
7070
elif [[ $machine =~ "Orion" ]]
7171
then
72+
cd ..
73+
module load git/2.28.0
74+
git submodule update --init --recursive
75+
cd tests
7276
echo "Creating baselines on $machine"
7377
export dprefix=/work2/noaa/$ACCNR/$USER
7478
sed -i 's|/work/noaa/stmp/${USER}|/work/noaa/epic/stmp/role-epic/|g' rt.sh
@@ -214,6 +218,10 @@ def generateStage(nodeLabel) {
214218
elif [[ $machine =~ "Orion" ]]
215219
then
216220
echo "Running regression tests on $machine"
221+
cd ..
222+
module load git/2.28.0
223+
git submodule update --init --recursive
224+
cd tests
217225
export dprefix=/work2/noaa/$ACCNR/$USER
218226
sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
219227
./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log

tests/default_vars.sh

+8
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,14 @@ export EXTERNAL_IC=.true.
557557
export MAKE_NH=.true.
558558
export MOUNTAIN=.false.
559559
export NA_INIT=1
560+
export DO_VORT_DAMP=.true.
561+
export HYDROSTATIC=.false.
562+
export KORD_XX=9
563+
export KORD_TM=-9
564+
export D_CON=1.
565+
export HORD_XX=5
566+
export HORD_DP=-5
567+
export HORD_TR=8
560568

561569
# Radiation
562570
export DO_RRTMGP=.false.

tests/fv3_conf/control_run.IN

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ fi
136136
#merra2
137137
if [ $USE_MERRA2 = .true. ]; then
138138
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
139-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
139+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
140140
done
141141
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
142142
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat

tests/fv3_conf/cpld_control_run.IN

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ fi
173173
#merra2
174174
if [ $IAER = 1011 ]; then
175175
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
176-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
176+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
177177
done
178178
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
179179
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat

tests/fv3_conf/fv3_gocart.IN

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ else
77
cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
88
fi
99
cp @[INPUTDATA_ROOT]/FV3_input_data/*grb .
10-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
1110
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
12-
ln -sf merra2C.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
11+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
1312
done
1413
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
1514
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc

tests/fv3_conf/lake_control_run.IN

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fi
123123
#merra2
124124
if [ $USE_MERRA2 = .true. ]; then
125125
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
126-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
126+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
127127
done
128128
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
129129
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat

tests/fv3_conf/regional_rrfs_a_run.IN

+3-12
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,9 @@ mkdir INPUT RESTART
55

66
rsync -arv @[INPUTDATA_ROOT]/FV3_regional_rrfs_a/INPUT/. INPUT/.
77

8-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
9-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
10-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
11-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
12-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
13-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
14-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
15-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
16-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
17-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
18-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m11.nc aeroclim.m11.nc
19-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc
8+
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
9+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
10+
done
2011

2112
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
2213
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat

tests/fv3_conf/regional_run.IN

+4-12
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@ rsync -arv @[INPUTDATA_ROOT]/FV3_regional/INPUT/. INPUT/.
55

66
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
77

8-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
9-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
10-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
11-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
12-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
13-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
14-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
15-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
16-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
17-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
18-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m11.nc
19-
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc
8+
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
9+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
10+
done
11+
2012

2113
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
2214
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat

tests/logs/OpnReqTests_control_p8_hera.log

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Wed Apr 24 12:38:17 UTC 2024
1+
Thu May 23 02:18:32 UTC 2024
22
Start Operation Requirement Test
33

44

5-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/bit_base_bit_base
5+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
5151
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
5252
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
5353

54-
0: The total amount of wall time = 276.967845
55-
0: The maximum resident set size (KB) = 1253216
54+
0: The total amount of wall time = 204.782273
55+
0: The maximum resident set size (KB) = 1918420
5656

5757
Test bit_base PASS
5858

5959

60-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/dbg_base_dbg_base
60+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/dbg_base_dbg_base
6262
Checking test dbg_base results ....
6363
Moving baseline dbg_base files ....
6464
Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
106106
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
107107
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
108108

109-
0: The total amount of wall time = 960.176678
110-
0: The maximum resident set size (KB) = 1233464
109+
0: The total amount of wall time = 2007.430306
110+
0: The maximum resident set size (KB) = 1871000
111111

112112
Test dbg_base PASS
113113

114114

115-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/dcp_dcp
115+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/dcp_dcp
117117
Checking test dcp results ....
118118
Comparing sfcf000.nc .....USING NCCMP......OK
119119
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
160160
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
161161
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
162162

163-
0: The total amount of wall time = 238.109868
164-
0: The maximum resident set size (KB) = 1235600
163+
0: The total amount of wall time = 177.403984
164+
0: The maximum resident set size (KB) = 1878948
165165

166166
Test dcp PASS
167167

168168

169-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/mpi_mpi
169+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/mpi_mpi
171171
Checking test mpi results ....
172172
Comparing sfcf000.nc .....USING NCCMP......OK
173173
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
214214
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
215215
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
216216

217-
0: The total amount of wall time = 239.999110
218-
0: The maximum resident set size (KB) = 1231020
217+
0: The total amount of wall time = 174.810235
218+
0: The maximum resident set size (KB) = 1874436
219219

220220
Test mpi PASS
221221

222222

223-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/rst_rst
223+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/rst_rst
225225
Checking test rst results ....
226226
Comparing sfcf000.nc .....USING NCCMP......OK
227227
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
268268
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
269269
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
270270

271-
0: The total amount of wall time = 241.494846
272-
0: The maximum resident set size (KB) = 1230996
271+
0: The total amount of wall time = 177.301718
272+
0: The maximum resident set size (KB) = 1878152
273273

274274
Test rst PASS
275275

276276

277-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/std_base_std_base
277+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/std_base_std_base
279279
Checking test std_base results ....
280280
Moving baseline std_base files ....
281281
Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
323323
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
324324
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
325325

326-
0: The total amount of wall time = 240.187367
327-
0: The maximum resident set size (KB) = 1237016
326+
0: The total amount of wall time = 176.738736
327+
0: The maximum resident set size (KB) = 1878320
328328

329329
Test std_base PASS
330330

331331

332-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/thr_thr
332+
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333+
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/thr_thr
334334
Checking test thr results ....
335335
Comparing sfcf000.nc .....USING NCCMP......OK
336336
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
377377
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
378378
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
379379

380-
0: The total amount of wall time = 239.880609
381-
0: The maximum resident set size (KB) = 1228084
380+
0: The total amount of wall time = 176.752293
381+
0: The maximum resident set size (KB) = 1876656
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Wed Apr 24 13:54:57 UTC 2024
387-
Elapsed time: 01h:16m:40s. Have a nice day!
386+
Thu May 23 04:05:32 UTC 2024
387+
Elapsed time: 01h:47m:00s. Have a nice day!

0 commit comments

Comments
 (0)