Skip to content

Commit 61ff276

Browse files
SamuelTrahanNOAASamuelTrahanNOAA
committed
Merge remote-tracking branch 'origin/develop' into new-gnv1-regtest
2 parents d3ed306 + 317e530 commit 61ff276

17 files changed

+2537
-2727
lines changed

‎FV3

‎doc/UsersGuide/requirements.txt

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.9
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
55
# pip-compile requirements.in
@@ -12,6 +12,8 @@ certifi==2024.2.2
1212
# via requests
1313
charset-normalizer==3.3.2
1414
# via requests
15+
colorama==0.4.6
16+
# via sphinx
1517
docutils==0.20.1
1618
# via
1719
# pybtex-docutils
@@ -22,10 +24,6 @@ idna==3.7
2224
# via requests
2325
imagesize==1.4.1
2426
# via sphinx
25-
importlib-metadata==7.0.1
26-
# via
27-
# sphinx
28-
# sphinxcontrib-bibtex
2927
jinja2==3.1.4
3028
# via sphinx
3129
latexcodec==2.0.1
@@ -44,7 +42,7 @@ pygments==2.17.2
4442
# via sphinx
4543
pyyaml==6.0.1
4644
# via pybtex
47-
requests==2.31.0
45+
requests==2.32.0
4846
# via sphinx
4947
six==1.16.0
5048
# via
@@ -78,5 +76,3 @@ sphinxcontrib-serializinghtml==1.1.10
7876
# via sphinx
7977
urllib3==2.2.1
8078
# via requests
81-
zipp==3.17.0
82-
# via importlib-metadata

‎doc/UsersGuide/source/BuildingAndRunning.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,9 @@ To run a single test, users can try the following command instead of creating a
582582

583583
.. code-block:: console
584584
585-
./rt.sh -r -k -n control_p8
585+
./rt.sh -r -k -n "control_p8 <compiler>"
586+
587+
where ``<compiler>`` is ``gnu`` or ``intel``.
586588

587589
Troubleshooting
588590
^^^^^^^^^^^^^^^^^^

‎doc/UsersGuide/source/Glossary.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Glossary
6868
Global atmospheric model based on fluid dynamics principles, including Euler's equations of motion.
6969

7070
EMC
71-
The `Environmental Modeling Center <https://www.emc.ncep.noaa.gov/emc_new.php>`__ is one of :term:`NCEP`'s nine centers and leads the :term:`National Weather Service <NWS>`'s modeling efforts.
71+
The `Environmental Modeling Center <https://www.emc.ncep.noaa.gov/emc.php>`_ is one of :term:`NCEP`'s nine centers and leads the :term:`National Weather Service <NWS>`'s modeling efforts.
7272

7373
ESMF
7474
`Earth System Modeling Framework <https://earthsystemmodeling.org/docs/release/latest/ESMF_usrdoc/>`__. The ESMF defines itself as "a suite of software tools for developing high-performance, multi-component Earth science modeling applications." It is a community-developed software infrastructure for building and coupling models.

‎tests/bl_date.conf

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

‎tests/logs/OpnReqTests_control_p8_hera.log

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Thu May 23 02:18:32 UTC 2024
1+
Mon May 27 22:00:37 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_intel
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/bit_base_bit_base
5+
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
6+
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 204.782273
55-
0: The maximum resident set size (KB) = 1918420
54+
0: The total amount of wall time = 205.513891
55+
0: The maximum resident set size (KB) = 1943180
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_intel
61-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/dbg_base_dbg_base
60+
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
61+
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 2007.430306
110-
0: The maximum resident set size (KB) = 1871000
109+
0: The total amount of wall time = 2010.182246
110+
0: The maximum resident set size (KB) = 1915420
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_intel
116-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/dcp_dcp
115+
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
116+
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 177.403984
164-
0: The maximum resident set size (KB) = 1878948
163+
0: The total amount of wall time = 180.505311
164+
0: The maximum resident set size (KB) = 1880708
165165

166166
Test dcp PASS
167167

168168

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
169+
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
170+
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 174.810235
218-
0: The maximum resident set size (KB) = 1874436
217+
0: The total amount of wall time = 179.641615
218+
0: The maximum resident set size (KB) = 1872468
219219

220220
Test mpi PASS
221221

222222

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
223+
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
224+
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 177.301718
272-
0: The maximum resident set size (KB) = 1878152
271+
0: The total amount of wall time = 176.094119
272+
0: The maximum resident set size (KB) = 1904492
273273

274274
Test rst PASS
275275

276276

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
277+
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
278+
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 176.738736
327-
0: The maximum resident set size (KB) = 1878320
326+
0: The total amount of wall time = 175.552974
327+
0: The maximum resident set size (KB) = 1897264
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_intel
333-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/thr_thr
332+
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
333+
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 176.752293
381-
0: The maximum resident set size (KB) = 1876656
380+
0: The total amount of wall time = 175.416690
381+
0: The maximum resident set size (KB) = 1900280
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Thu May 23 04:05:32 UTC 2024
387-
Elapsed time: 01h:47m:00s. Have a nice day!
386+
Mon May 27 23:33:47 UTC 2024
387+
Elapsed time: 01h:33m:11s. Have a nice day!

0 commit comments

Comments
 (0)