Skip to content

Commit

Permalink
Develop ugwp improvements (ufs-community#1488)
Browse files Browse the repository at this point in the history 
* Enhanced stability of drag_suite module and added diagnostics

* Added new UGWP diagnostic variables to parm/diag_table/diag_table_rap

* Bug fixes to rap, hrrr and rrfs test description files and tests/parm/rap.nml.IN

* Updated standard_names for do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd and ugwp_seq_update

* Incorporated dustinswales suggestions in ccpp-physics PR#22

* Assumed-shape in gwdps.f

* Added logical flag 'ugwp_seq_update' to gfs_physics_nml namelist

* Modified calculation of dtfac in drag_suite.F90 and revised various long_name's of diagnostic variables

* Removed passage of variables 'ak' and 'bk' to drag_suite -- these are no longer used

* Removed unused variables from GFS_typedefs.F90 and added clarifying comments in ccpp-physics

Co-authored-by: JONG KIM <[email protected]>
  • Loading branch information
@mdtoyNOAA @jkbk2004
mdtoyNOAA and jkbk2004 authored Dec 22, 2022
1 parent 3610672 commit edc063e
Show file tree
Hide file tree
Showing 55 changed files with 7,365 additions and 11,923 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 7 files
+4 −2 ccpp/data/CCPP_typedefs.F90
+4 −4 ccpp/data/CCPP_typedefs.meta
+77 −49 ccpp/data/GFS_typedefs.F90
+192 −34 ccpp/data/GFS_typedefs.meta
+414 −2 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/framework
+1 −1 ccpp/physics
70 changes: 35 additions & 35 deletions tests/OpnReqTests_control_p8_hera.intel.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Aug 1 14:59:30 UTC 2022
Mon Nov 28 18:46:50 UTC 2022
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_bit_base
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_bit_base
Checking test bit_base control_p8 results ....
Moving baseline bit_base control_p8 files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,27 +51,27 @@ Moving baseline bit_base control_p8 files ....
Moving RESTART/sfc_data.tile5.nc .........OK
Moving RESTART/sfc_data.tile6.nc .........OK

0: The total amount of wall time = 185.473674
0: The maximum resident set size (KB) = 1642128
0: The total amount of wall time = 198.045906
0: The maximum resident set size (KB) = 1638792

Test bit_base control_p8 PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_dbg_base
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_dbg_base
Checking test dbg_base control_p8 results ....
Moving baseline dbg_base control_p8 files ....
Moving sfcf001.nc .........OK
Moving sfcf001.nc .........OK

0: The total amount of wall time = 162.694921
0: The maximum resident set size (KB) = 1617576
0: The total amount of wall time = 167.095428
0: The maximum resident set size (KB) = 1626948

Test dbg_base control_p8 PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_dcp
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_dcp
Checking test dcp control_p8 results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -118,14 +118,14 @@ Checking test dcp control_p8 results ....
Comparing RESTART/sfc_data.tile5.nc .........OK
Comparing RESTART/sfc_data.tile6.nc .........OK

0: The total amount of wall time = 172.666113
0: The maximum resident set size (KB) = 1586680
0: The total amount of wall time = 182.350504
0: The maximum resident set size (KB) = 1596724

Test dcp control_p8 PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_fhz
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_fhz
Checking test fhz control_p8 results ....
Comparing sfcf000.nc ............ALT CHECK......OK
Comparing sfcf021.nc ............ALT CHECK......OK
Expand Down Expand Up @@ -168,14 +168,14 @@ Checking test fhz control_p8 results ....
Comparing RESTART/sfc_data.tile5.nc .........OK
Comparing RESTART/sfc_data.tile6.nc .........OK

0: The total amount of wall time = 154.241726
0: The maximum resident set size (KB) = 1598100
0: The total amount of wall time = 165.511111
0: The maximum resident set size (KB) = 1604020

Test fhz control_p8 PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_mpi
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_mpi
Checking test mpi control_p8 results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -222,14 +222,14 @@ Checking test mpi control_p8 results ....
Comparing RESTART/sfc_data.tile5.nc .........OK
Comparing RESTART/sfc_data.tile6.nc .........OK

0: The total amount of wall time = 253.556772
0: The maximum resident set size (KB) = 1662220
0: The total amount of wall time = 277.049093
0: The maximum resident set size (KB) = 1669136

Test mpi control_p8 PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_rst
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_rst
Checking test rst control_p8 results ....
Comparing atmf024.nc .........OK
Comparing GFSFLX.GrbF24 .........OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst control_p8 results ....
Comparing RESTART/sfc_data.tile6.nc .........OK
Comparing sfcf024.nc .........OK

0: The total amount of wall time = 80.362936
0: The maximum resident set size (KB) = 855252
0: The total amount of wall time = 86.326613
0: The maximum resident set size (KB) = 861168

Test rst control_p8 PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_std_base
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_std_base
Checking test std_base control_p8 results ....
Moving baseline std_base control_p8 files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base control_p8 files ....
Moving RESTART/sfc_data.tile5.nc .........OK
Moving RESTART/sfc_data.tile6.nc .........OK

0: The total amount of wall time = 153.809354
0: The maximum resident set size (KB) = 1591288
0: The total amount of wall time = 164.159141
0: The maximum resident set size (KB) = 1599776

Test std_base control_p8 PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Jessica.Meixner/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/NCEPDEV/stmp2/Jessica.Meixner/FV3_OPNREQ_TEST/opnReqTest_163907/control_p8_thr
baseline dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/stmp4/Michael.Toy/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base
working dir = /scratch1/BMC/wrfruc/mtoy/git_local/ufs-weather-model/FV3_OPNREQ_TEST/opnReqTest_152217/control_p8_thr
Checking test thr control_p8 results ....
Comparing sfcf000.nc .........OK
Comparing sfcf021.nc .........OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr control_p8 results ....
Comparing RESTART/sfc_data.tile5.nc .........OK
Comparing RESTART/sfc_data.tile6.nc .........OK

0: The total amount of wall time = 172.605638
0: The maximum resident set size (KB) = 1661984
0: The total amount of wall time = 185.282825
0: The maximum resident set size (KB) = 1651060

Test thr control_p8 PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Aug 1 16:18:40 UTC 2022
Elapsed time: 01h:19m:11s. Have a nice day!
Mon Nov 28 23:19:48 UTC 2022
Elapsed time: 04h:33m:00s. Have a nice day!
Loading

0 comments on commit edc063e

Please sign in to comment.