Skip to content

Commit

Permalink
Merge branch 'develop' into cpld_s2sw_wavice
Browse files Browse the repository at this point in the history
  • Loading branch information
@NickSzapiro-NOAA
NickSzapiro-NOAA authored May 29, 2024
2 parents b2de7b3 + 317e530 commit 3e5f8d0
Show file tree
Hide file tree
Showing 17 changed files with 2,537 additions and 2,727 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 8 files
+60 −12 atmos_model.F90
+19 −4 ccpp/data/GFS_typedefs.F90
+17 −0 fv3_cap.F90
+3 −2 io/fv3atm_history_io.F90
+1 −1 io/module_write_internal_state.F90
+174 −164 io/module_wrt_grid_comp.F90
+4 −5 io/post_fv3.F90
+38 −0 module_fcst_grid_comp.F90
12 changes: 4 additions & 8 deletions doc/UsersGuide/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile requirements.in
Expand All @@ -12,6 +12,8 @@ certifi==2024.2.2
# via requests
charset-normalizer==3.3.2
# via requests
colorama==0.4.6
# via sphinx
docutils==0.20.1
# via
# pybtex-docutils
Expand All @@ -22,10 +24,6 @@ idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==7.0.1
# via
# sphinx
# sphinxcontrib-bibtex
jinja2==3.1.4
# via sphinx
latexcodec==2.0.1
Expand All @@ -44,7 +42,7 @@ pygments==2.17.2
# via sphinx
pyyaml==6.0.1
# via pybtex
requests==2.31.0
requests==2.32.0
# via sphinx
six==1.16.0
# via
Expand Down Expand Up @@ -78,5 +76,3 @@ sphinxcontrib-serializinghtml==1.1.10
# via sphinx
urllib3==2.2.1
# via requests
zipp==3.17.0
# via importlib-metadata
4 changes: 3 additions & 1 deletion doc/UsersGuide/source/BuildingAndRunning.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,9 @@ To run a single test, users can try the following command instead of creating a

.. code-block:: console
./rt.sh -r -k -n control_p8
./rt.sh -r -k -n "control_p8 <compiler>"
where ``<compiler>`` is ``gnu`` or ``intel``.

Troubleshooting
^^^^^^^^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion doc/UsersGuide/source/Glossary.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Glossary
Global atmospheric model based on fluid dynamics principles, including Euler's equations of motion.

EMC
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.
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.

ESMF
`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.
Expand Down
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=20240522
export BL_DATE=20240524
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 May 23 02:18:32 UTC 2024
Mon May 27 22:00:37 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/bit_base_bit_base
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 204.782273
0: The maximum resident set size (KB) = 1918420
0: The total amount of wall time = 205.513891
0: The maximum resident set size (KB) = 1943180

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/dbg_base_dbg_base
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 2007.430306
0: The maximum resident set size (KB) = 1871000
0: The total amount of wall time = 2010.182246
0: The maximum resident set size (KB) = 1915420

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/dcp_dcp
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 177.403984
0: The maximum resident set size (KB) = 1878948
0: The total amount of wall time = 180.505311
0: The maximum resident set size (KB) = 1880708

Test dcp PASS


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

Test mpi PASS


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

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/std_base_std_base
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 176.738736
0: The maximum resident set size (KB) = 1878320
0: The total amount of wall time = 175.552974
0: The maximum resident set size (KB) = 1897264

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1263645/thr_thr
baseline dir = /scratch1/NCEPDEV/stmp4/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_OPNREQ_TEST/opnReqTest_4107210/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 = 176.752293
0: The maximum resident set size (KB) = 1876656
0: The total amount of wall time = 175.416690
0: The maximum resident set size (KB) = 1900280

Test thr PASS

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

0 comments on commit 3e5f8d0

Please sign in to comment.