Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update develop from gsd/develop 2020/06/30 #156

Merged
merged 194 commits into from
Jul 2, 2020
+2,752 −2,055
Merged

Update develop from gsd/develop 2020/06/30 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
10838b7
Merge changes from NEMSfv3gfs/gmtb/develop into ufs-weather-model/dtc…
climbfuji Nov 5, 2019
d60fb52
Rename rt_ccpp_gmtb.conf to rt_ccpp_dtc.conf, clean up CAPS and DTC r…
climbfuji Nov 5, 2019
4555e20
Update of regression test setup scripts for CCPP dynamic build
climbfuji Nov 5, 2019
f7d4530
Bugfix for CAPS regression test: correct name of namelist template
climbfuji Nov 5, 2019
5edf0ef
merge configuration files for FA scheme
mzhangw Nov 8, 2019
c19f2ce
1. change nwat to 4 for qv,qc,qi,qr water loading for FA scheme
mzhangw Nov 14, 2019
2a46d10
parm/{ccpp_control.nml.IN,gfdlmp.nml.IN,input.nml.IN}: make imfdeepcn…
climbfuji Nov 18, 2019
2a39743
Add new regression tests for sas and satmedmfvdifq
climbfuji Nov 18, 2019
5d9b120
Update submodule pointer for FV3
climbfuji Nov 18, 2019
866a2c7
conf/configure.fv3.macosx.gnu: adjust REPRO flags for b4b identical r…
climbfuji Nov 19, 2019
46cf464
tests/compile.sh: workaround to avoid warnings about non-existent inc…
climbfuji Nov 19, 2019
466a73b
Update submodule pointer for FV3
climbfuji Nov 19, 2019
68f030a
Update submodule pointer for stochastic_physics
climbfuji Nov 19, 2019
64799c3
Bugfix for NEMSCompset tests: add new default variables to compsets/f…
climbfuji Nov 20, 2019
e00902d
Update submodule pointer for FV
climbfuji Nov 20, 2019
8d276ba
Update submodule pointers for FV3 and stochastic_physics
climbfuji Nov 20, 2019
bd76a74
Merge pull request #3 from climbfuji/add_sas_and_satmedmf_regression_…
climbfuji Nov 20, 2019
4a64395
minor fix
mzhangw Nov 22, 2019
94f0318
Merge branch 'dtc/develop' of https://github.com/NCAR/ufs-weather-mod…
mzhangw Nov 22, 2019
be2363f
delete rt_ccpp_HAFS.conf
mzhangw Nov 22, 2019
c37646e
Allow environment variable NEMS_MACHINE to overwrite (or set) MACHINE_ID
climbfuji Nov 22, 2019
15ed9ca
Merge pull request #1 from mzhangw/HAFS_fer_hires
climbfuji Nov 22, 2019
fa17957
Update submodule pointer for FV3
climbfuji Nov 22, 2019
17a3ea6
Merge pull request #6 from climbfuji/update_submodule_pointer_20191122
climbfuji Nov 22, 2019
361a497
Update submodule pointer for FV3
climbfuji Nov 25, 2019
2857a21
Merge pull request #7 from climbfuji/ufs_update_submodule_pointer_fv3atm
climbfuji Nov 25, 2019
26fcd57
Point submodule WW3 back to NOAA-EMC
climbfuji Nov 26, 2019
6fc17ca
Merge NEMSfv3gfs gsd/develop into ufs-weather-model dtc/develop, squa…
climbfuji Nov 26, 2019
d541054
Merge branch 'nems_machine_env_var' of https://github.com/climbfuji/u…
climbfuji Nov 26, 2019
5b903fb
Update submodule pointer for FV3
climbfuji Nov 26, 2019
77bdaa9
parm/ccpp_gsd_sar.nml.IN, tests/rt_ccpp_gsd.conf: bugfixes for SAR an…
climbfuji Nov 27, 2019
04ad3e6
Update submodule pointer for FV3
climbfuji Nov 27, 2019
0bf138f
Merge pull request #8 from climbfuji/merge-gsd_develop-and-nems_machi…
climbfuji Nov 27, 2019
4227033
Update submodule pointer for WW3 to match EMC
climbfuji Nov 27, 2019
49d5095
tests/fv3_conf/ccpp_gsd_sar_run.IN: bugfix, correct path to CCPP libr…
climbfuji Nov 27, 2019
defe5fa
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Nov 27, 2019
2deb2e1
Update of CCPP regression test configurations to reflect changes from…
climbfuji Nov 27, 2019
af5fce1
conf/configure.fv3.*.gnu: add '-Wall' to Fortran debug flags
climbfuji Nov 30, 2019
03e8e03
Follow-up bugfix for tests/fv3_conf/ccpp_gsd_sar_run.IN, insert missi…
climbfuji Nov 30, 2019
51d57f8
Update submodule pointer for FV3
climbfuji Dec 2, 2019
860f00e
Point to 2019.01 tag for FMS, update .gitmodules
climbfuji Dec 2, 2019
e26a614
tests/rt.conf: move cheyenne.intel tests to tests/rt_intel.conf
climbfuji Dec 2, 2019
bc29b37
tests/rt.sh: change default queue on cheyenne from premium to economy
climbfuji Dec 2, 2019
20d3b98
tests/fv3_conf/ccpp_control_run.IN, tests/rt_ccpp_dtc.conf: bugfixes …
climbfuji Dec 2, 2019
69ed25d
Update submodule pointer for FV3
climbfuji Dec 3, 2019
9ac4703
Merge pull request #9 from climbfuji/dtc_develop_udpate_from_emc_2019…
climbfuji Dec 3, 2019
cfab826
Update .gitmodules, CODEOWNERS and submodule pointers for gsd/develop
climbfuji Dec 3, 2019
a37da6a
Update .gitmodules to point to noaa-gsd instead of climbfuji, update …
climbfuji Dec 12, 2019
82fb677
Update CODEOWNERS for move to NOAA-GSD, update submodule pointers
climbfuji Dec 12, 2019
ff924b3
Update submodule pointer for FV3
climbfuji Dec 12, 2019
dfc2d66
Merge pull request #1 from climbfuji/first_n_radiation_calls_on_physi…
DomHeinzeller Dec 12, 2019
8ddbb9c
add qdiag3d support in FV3
SamuelTrahanNOAA Dec 27, 2019
3719ee3
Further bug fixes to tendency accumulation
SamuelTrahanNOAA Jan 3, 2020
7f5b264
Update submodule pointer for FV3 and .gitmodules for code review process
climbfuji Dec 31, 2019
71d03b7
Revert change to .gitmodules, update submodule pointer for fv3atm
climbfuji Jan 6, 2020
0d79a64
Merge pull request #3 from climbfuji/thompson_init_update
DomHeinzeller Jan 6, 2020
b55bdfb
Moved number concentration approximation from cu_gf_driver to interst…
hannahcbarnes Jan 6, 2020
36e4bb8
fix several bugs mentioned in code review
SamuelTrahanNOAA Jan 6, 2020
3cd8c98
Update submodule pointer for FV3
climbfuji Jan 10, 2020
a3197df
Update submodule pointer for FV3
climbfuji Jan 12, 2020
8fb100f
Merge pull request #6 from climbfuji/bugfix_b4b_identical_restarts
DomHeinzeller Jan 12, 2020
83c5a37
Move PBL tendencies into the PBL run subroutine.
SamuelTrahanNOAA Jan 14, 2020
7fa7a12
add ldiag3d and qdiag3d support to physics/module_MYNNPBL_wrapper.F90…
SamuelTrahanNOAA Jan 16, 2020
247e385
Point to sam's repo
SamuelTrahanNOAA Jan 16, 2020
9e7dd65
Merge branch 'NCmove' of https://github.com/hannahcbarnes/ufs-weather…
climbfuji Jan 22, 2020
e0ee84f
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jan 27, 2020
ecaca30
Update .gitmodules for code review and testing
climbfuji Jan 27, 2020
83f1e2b
Update tests/rt_ccpp_dtc.conf and tests/rt_gnu.conf; add temporary re…
climbfuji Jan 27, 2020
201fd68
3d diagnostic tendency changes
SamuelTrahanNOAA Jan 28, 2020
59e54d0
Revert baseline directory change in tests/rt.sh, use DTC baseline
climbfuji Jan 28, 2020
2afca70
Bugfix for tests/rt_ccpp_dtc.conf, need to specify machine names for …
climbfuji Jan 29, 2020
6b98cd4
Bugfix for tests/rt_ccpp_dtc.conf, need to specify dependencies for r…
climbfuji Jan 29, 2020
1e918c6
Revert change to .gitmodules, update submodule pointers
climbfuji Jan 30, 2020
354d43c
Merge pull request #7 from climbfuji/update_gsd_develop_from_develop
DomHeinzeller Jan 30, 2020
54cf175
Correct tendency flag names, implement some more diagnostic tendencie…
SamuelTrahanNOAA Feb 6, 2020
17a5829
rt.sh: allow caller to specify PTMP and STMP. Add an "ANNIHILATE_EVE…
SamuelTrahanNOAA Feb 6, 2020
a42a50e
merge from gsd develop
SamuelTrahanNOAA Feb 7, 2020
4dbf237
Update submodule pointer for fv3atm
climbfuji Feb 13, 2020
108db8c
Merge pull request #9 from climbfuji/update_submodule_pointer
DomHeinzeller Feb 13, 2020
cec4ff4
All gfs v15p2 and v16beta 3d diagnostic tendencies look reasonable; a…
SamuelTrahanNOAA Feb 13, 2020
a13ce4c
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/ufs-weather…
climbfuji Feb 13, 2020
4b8d4c1
Update .gitmodules and submodule pointer for FV3
climbfuji Feb 17, 2020
d40bb01
Revert change to .gitmodules, update submodule pointer for fv3atm
climbfuji Feb 18, 2020
2b5768b
Merge pull request #10 from climbfuji/move_number_concentration_bugfi…
DomHeinzeller Feb 18, 2020
9a95800
Add non-aerosol-aware Thompson MP regression tests in REPRO and DEBUG…
climbfuji Feb 21, 2020
57fdd85
Update .gitmodules and submodule pointer for FV3 for code review and …
climbfuji Feb 21, 2020
618dd3c
Add timestep_init and timestep_final actions to CCPP. Update code so …
SamuelTrahanNOAA Mar 4, 2020
cf431dd
Remove debug prints and commented-out code.
SamuelTrahanNOAA Mar 4, 2020
1789ba2
Add total tendency calculations for gfsv15p2 and gsdv0. Calculate pbl…
SamuelTrahanNOAA Mar 12, 2020
bde4d1e
Update submodule pointer for FV3
climbfuji Mar 12, 2020
eb5f341
Revert change to .gitmodules, update submodule pointer for fv3atm
climbfuji Mar 13, 2020
badba27
Merge pull request #11 from climbfuji/gsd-dev-clouds_thompson-no-aero…
DomHeinzeller Mar 13, 2020
5f86234
Add some #ifdef CCPP to avoid breaking non-CCPP runs. Add the regress…
SamuelTrahanNOAA Mar 17, 2020
8110128
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Mar 17, 2020
3be9c9e
Add regression tests for GSD suite with MYNN surface layer scheme
climbfuji Mar 20, 2020
b138db0
Correct name of suite in MYNN SFCLAY regression tests
climbfuji Mar 23, 2020
3bfe7c9
Temporary regression test config rt_ccpp_gsd_mynnsfclayonly.conf
climbfuji Mar 26, 2020
ec8a71c
Add regression tests for GSD + NOAH LSM + MYNN SFC, shorten debug reg…
climbfuji Apr 1, 2020
c60b1b7
Remove dynamic CCPP tests
climbfuji Apr 2, 2020
cedc34a
Revert increase of forecast hours from 1 to 3 for fv3_ccpp_gsd_sar_25…
climbfuji Apr 2, 2020
2a3996d
Add dependency of fv3_ccpp_gsd_warmstart test on fv3_ccpp_gsd_coldsta…
climbfuji Apr 3, 2020
c1ab433
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Apr 3, 2020
8b2cfd8
Merge pull request #13 from climbfuji/mynnsfclay_from_joe_in_latest_code
DomHeinzeller Apr 3, 2020
61e32d1
merge gsd/develop
SamuelTrahanNOAA Apr 3, 2020
b045cbc
Correction: Diag%hpbl => Tbd%hpbl
SamuelTrahanNOAA Apr 6, 2020
bc7d363
tbd => Tbd in gfsphysics/GFS_layer/GFS_physics_driver.F90
SamuelTrahanNOAA Apr 6, 2020
69a08ad
point to head of gsd/develop for FV3
SamuelTrahanNOAA Apr 6, 2020
fea9986
Merge pull request #15 from SamuelTrahanNOAA/bugfix/diaghpbl_to_tbdhpbl
DomHeinzeller Apr 6, 2020
b3d6e3c
point to head of gsd/develop for FV3 and update regression test logs …
SamuelTrahanNOAA Apr 8, 2020
0bde787
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Apr 16, 2020
8d70150
Revert unnecessary changes to tests.rt.sh made in original PR
climbfuji Apr 16, 2020
0152415
Revert the update of the regression test logs on hera
climbfuji Apr 17, 2020
787cf33
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/ufs-weather…
climbfuji Apr 18, 2020
bbfa184
Add new regression test fv3_ccpp_gsd_diag3d_debug
climbfuji Apr 20, 2020
96c9183
Increase maximum number of diagnostic output fields for diag3d test
climbfuji Apr 21, 2020
8c65dcf
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Apr 22, 2020
4bca724
Merge pull request #16 from climbfuji/tendencies_sam_with_dom_mods
DomHeinzeller Apr 22, 2020
0002c88
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Apr 24, 2020
d3bf557
Update submodule pointer for fv3atm
climbfuji Apr 24, 2020
a6cd5ad
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Apr 28, 2020
c3ce49a
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Apr 29, 2020
6d9899a
Merge pull request #18 from climbfuji/combine_joe_mynnpbl_update_and_…
DomHeinzeller Apr 29, 2020
f4ea09d
Updated GSL orographic drag suite to enable use of custom orographic …
mdtoyNOAA May 1, 2020
c13a0d1
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji May 12, 2020
af9309c
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji May 13, 2020
42c9587
Merge pull request #21 from climbfuji/hannah_nc_bugfix
DomHeinzeller May 13, 2020
b00cd33
fix bugs found in pbl and ozone 3d diagnostic tendencies (#20)
SamuelTrahanNOAA May 14, 2020
656c597
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji May 15, 2020
cad5238
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji May 15, 2020
935d124
Update submodule pointer for fv3atm
climbfuji May 15, 2020
bd1c7c9
Allow switch of effective radii calculation in parm/ccpp_gsd.nml.IN, …
climbfuji May 19, 2020
c388aa4
Merged with latest NOAA-GSD/ufs-weather-model gsd/develop branch.
mdtoyNOAA May 20, 2020
0db1840
Merging latest changes to GSL drag suite with current NOAA-GSD/ufs-we…
mdtoyNOAA May 20, 2020
0e5dc8b
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji May 20, 2020
6671b15
Merge pull request #22 from climbfuji/update_gsd_develop_from_develop
DomHeinzeller May 20, 2020
0aae4b6
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji May 27, 2020
059912c
tests/rt_ccpp_gsd.conf: remove STATIC=Y from compile options, no long…
climbfuji May 28, 2020
72cd56a
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 1, 2020
7aa630e
Merge pull request #23 from climbfuji/gsd_develop_blocked_data_struct…
DomHeinzeller Jun 1, 2020
1b0f9bb
Set namelist parameter effr_in to .true. in the namelist templates
climbfuji Jun 2, 2020
d89678f
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 2, 2020
dd6f150
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 3, 2020
efbcf42
Merge pull request #24 from climbfuji/thompson_mp_cloud_effective_rad…
DomHeinzeller Jun 3, 2020
e9a4822
Merge branch 'updated_GSL_drag_suite_apr2020' of https://github.com/m…
climbfuji Jun 3, 2020
28ebdf3
Use temporary location on hera to stage input data for drag suite in …
climbfuji Jun 3, 2020
ff5b43a
Change regression test name fv3_ccpp_raphrrr to fv3_ccpp_hrrr, update…
climbfuji Jun 3, 2020
78f4b3c
Update .gitmodules and submodule pointer for fv3atm
climbfuji Jun 4, 2020
1e0adcb
Fix wrong copy command in tests/fv3_conf/ccpp_gsd_run.IN
climbfuji Jun 4, 2020
3bb2cd1
Add regression test fv3_ccpp_rap
climbfuji Jun 4, 2020
86ede50
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 5, 2020
5c95cf9
Change name of regression test run/control directory for tests fv3_cc…
climbfuji Jun 5, 2020
4926839
Merge pull request #25 from climbfuji/add_drag_suite_and_other_updates
DomHeinzeller Jun 5, 2020
ab7bed6
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 5, 2020
13fb4ab
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 5, 2020
2b14e69
Merge pull request #26 from climbfuji/radcloud_cleanup
DomHeinzeller Jun 5, 2020
25d7c42
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 8, 2020
94fdcad
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 9, 2020
771e904
Merge pull request #27 from climbfuji/joe_mynn_changes_20200608
DomHeinzeller Jun 9, 2020
56d278f
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 9, 2020
21767c1
Change the way the sutils module is loaded on hera.{gnu,intel} and je…
climbfuji Jun 3, 2020
0e1a680
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 12, 2020
df183da
Merge pull request #28 from climbfuji/rollback_thompson
DomHeinzeller Jun 12, 2020
31c3546
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jun 17, 2020
ab2ebaf
Update .gitmodules and submodule pointer for fv3atm
climbfuji Jun 17, 2020
90a20f7
Reduce forecast length for GSD debug tests from 6h to 3h
climbfuji Jun 17, 2020
7ca95f8
Update submodule pointer for fv3atm
climbfuji Jun 17, 2020
3c5c6b0
Update submodule pointer for fv3atm
climbfuji Jun 18, 2020
105bd47
tests/tests/fv3_ccpp_mynn: use 600s time step
climbfuji Jun 18, 2020
b791694
tests/rt_ccpp_gsd.conf: temporarily turn off test fv3_ccpp_gsd_sar_25…
climbfuji Jun 18, 2020
663d513
Revert change to .gitmodules and update submodule pointers for fv3atm
climbfuji Jun 19, 2020
150fc3f
Merge pull request #29 from climbfuji/update_gsd_develop_from_develop…
DomHeinzeller Jun 19, 2020
b0d405b
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jun 25, 2020
cb53643
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 25, 2020
e6af704
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 25, 2020
ecb9bda
Merge pull request #30 from climbfuji/update_gsd_develop_from_dev_emc…
DomHeinzeller Jun 25, 2020
89c52cc
Update .gitmodules and submodule pointers for fv3aatm for code review…
climbfuji Jun 29, 2020
7a87fde
tests/rt_ccpp_gsd.conf: reactivate regression test fv3_ccpp_gsd_sar_2…
climbfuji Jun 29, 2020
61eef86
Update submodule pointer for fv3atm
climbfuji Jun 29, 2020
a9cd1d6
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jun 29, 2020
ce48278
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 29, 2020
27a8a07
Merge pull request #32 from climbfuji/dycore_bugfixes_and_sgscloud_up…
DomHeinzeller Jun 29, 2020
f67ad68
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 30, 2020
e284677
Merge branch 'gsd/develop' of https://github.com/noaa-gsd/ufs-weather…
climbfuji Jun 30, 2020
5d50f01
Cleanup after merge of gsd/develop
climbfuji Jun 30, 2020
647d423
Reduce runtime of regression tests fv3_ccpp_hrrr and fv3_ccpp_rap fro…
climbfuji Jun 30, 2020
39b5063
Turn on AVX2 flags on wcoss_dell_p3
climbfuji Jun 30, 2020
fe96ee9
Bugfix in tests/rt.conf, add missing suites FV3_RAP and FV3_HRRR to c…
climbfuji Jun 30, 2020
70bf187
Change path to new diag table for diag3d tests, update regression tes…
climbfuji Jul 1, 2020
9d52d91
Update submodule pointer for fv3atm
climbfuji Jul 1, 2020
8564cfe
Run RAP/HRRR tests only on hera, correct path to GSL drag suite input…
climbfuji Jul 1, 2020
0c591cf
Regression test logs for hera.intel, hera.gnu, orion.intel
climbfuji Jul 1, 2020
0414c19
Regression test logs for wcoss_cray
climbfuji Jul 1, 2020
4204b73
Regression test logs for wcoss_dell_p3
climbfuji Jul 2, 2020
483a2fa
Revert change to .gitmodules and update submodule pointers for fv3atm
climbfuji Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 59 files
+1 −1 atmos_cubed_sphere
+48 −13 atmos_model.F90
+121 −140 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_CPT_v0.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_RRTMGP.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_myj.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_sas.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+1 −1 ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_gf.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+3 −3 ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_ras.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+3 −3 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+2 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15plus.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15plusras.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+2 −1 ccpp/suites/suite_FV3_GFS_v16beta.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16beta_no_nsst.xml
+7 −2 ccpp/suites/suite_FV3_GSD_SAR.xml
+3 −3 ccpp/suites/suite_FV3_GSD_noah.xml
+91 −0 ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml
+4 −3 ccpp/suites/suite_FV3_GSD_v0.xml
+3 −3 ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+93 −0 ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+86 −0 ccpp/suites/suite_FV3_HRRR.xml
+92 −0 ccpp/suites/suite_FV3_RAP.xml
+2 −2 gfsphysics/CCPP_layer/CCPP_data.meta
+623 −154 gfsphysics/GFS_layer/GFS_diagnostics.F90
+26 −24 gfsphysics/GFS_layer/GFS_physics_driver.F90
+14 −4 gfsphysics/GFS_layer/GFS_restart.F90
+275 −64 gfsphysics/GFS_layer/GFS_typedefs.F90
+323 −37 gfsphysics/GFS_layer/GFS_typedefs.meta
+5 −5 gfsphysics/physics/GFS_debug.F90
+86 −2 io/FV3GFS_io.F90
2 changes: 1 addition & 1 deletion cmake/configure_wcoss_dell_p3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)
option(AVX2 "Enable AVX2 instruction set" ON)
option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)

option(INLINE_POST "Enable inline post" ON)
Expand Down
11 changes: 9 additions & 2 deletions conf/configure.fv3.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ LD = mpiifort
#########
# flags #
#########
# default is 64-bit OpenMP non-hydrostatic build using AVX2
DEBUG =
REPRO =
VERBOSE =
OPENMP = Y
AVX2 = Y
HYDRO = N
CCPP = N
QUAD_PRECISION = Y
Expand Down Expand Up @@ -68,8 +70,13 @@ ifeq ($(REPRO),Y)
FFLAGS += -qno-opt-dynamic-align
CFLAGS += -qno-opt-dynamic-align
else
FFLAGS += -xHOST -qno-opt-dynamic-align
CFLAGS += -xHOST -qno-opt-dynamic-align
ifeq ($(AVX2),Y)
FFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
CFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
else
FFLAGS += -qno-opt-dynamic-align
CFLAGS += -qno-opt-dynamic-align
endif
endif

ifeq ($(MULTI_GASES),Y)
Expand Down
7 changes: 5 additions & 2 deletions parm/ccpp_gsd.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

&diag_manager_nml
prepend_date = .F.
max_output_fields = @[MAX_OUTPUT_FIELDS]
/

&fms_io_nml
Expand Down Expand Up @@ -117,7 +118,8 @@
&gfs_physics_nml
fhzero = 6.
h2o_phys = .true.
ldiag3d = .false.
ldiag3d = @[LDIAG3D]
qdiag3d = @[QDIAG3D]
fhcyc = @[FHCYC]
nst_anl = .true.
use_ufo = .true.
Expand Down Expand Up @@ -148,7 +150,8 @@
satmedmf = .false.
lheatstrg = @[LHEATSTRG]
do_mynnedmf = @[DO_MYNNEDMF]
do_mynnsfclay = .false.
do_mynnsfclay = @[DO_MYNNSFCLAY]
effr_in = .true.
random_clds = .false.
trans_trac = .true.
cnvcld = .true.
Expand Down
1 change: 1 addition & 0 deletions parm/ccpp_gsd_sar.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
lheatstrg = .F.
do_mynnedmf = .T.
do_mynnsfclay = .false.
effr_in = .true.
random_clds = .false.
trans_trac = .true.
cnvcld = .false.
Expand Down
1 change: 1 addition & 0 deletions parm/ccpp_gsd_sar_25km.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
lheatstrg = .F.
do_mynnedmf = .true.
do_mynnsfclay = .false.
effr_in = .true.
random_clds = .false.
trans_trac = .true.
cnvcld = .false.
Expand Down
315 changes: 156 additions & 159 deletions tests/Compile_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

752 changes: 376 additions & 376 deletions tests/Compile_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

733 changes: 372 additions & 361 deletions tests/Compile_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

700 changes: 356 additions & 344 deletions tests/Compile_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

565 changes: 277 additions & 288 deletions tests/Compile_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fri Jun 26 14:05:55 UTC 2020
Wed Jul 1 19:38:58 UTC 2020
Start Regression test


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfdlmp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfdlmp_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfdlmp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfdlmp_prod
Checking test 001 fv3_ccpp_gfdlmp results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -50,8 +50,8 @@ Checking test 001 fv3_ccpp_gfdlmp results ....
Test 001 fv3_ccpp_gfdlmp PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v15p2_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v15p2_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v15p2_prod
Checking test 002 fv3_ccpp_gfs_v15p2 results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -118,8 +118,8 @@ Checking test 002 fv3_ccpp_gfs_v15p2 results ....
Test 002 fv3_ccpp_gfs_v15p2 PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v16beta_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v16beta_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v16beta_prod
Checking test 003 fv3_ccpp_gfs_v16beta results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -186,8 +186,8 @@ Checking test 003 fv3_ccpp_gfs_v16beta results ....
Test 003 fv3_ccpp_gfs_v16beta PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_rrtmgp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_rrtmgp_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_rrtmgp_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_rrtmgp_prod
Checking test 004 fv3_ccpp_rrtmgp results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -254,8 +254,8 @@ Checking test 004 fv3_ccpp_rrtmgp results ....
Test 004 fv3_ccpp_rrtmgp PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gsd_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gsd_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gsd_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gsd_prod
Checking test 005 fv3_ccpp_gsd results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -346,8 +346,8 @@ Checking test 005 fv3_ccpp_gsd results ....
Test 005 fv3_ccpp_gsd PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_thompson_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_thompson_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_thompson_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_thompson_prod
Checking test 006 fv3_ccpp_thompson results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -414,8 +414,8 @@ Checking test 006 fv3_ccpp_thompson results ....
Test 006 fv3_ccpp_thompson PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_thompson_no_aero_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_thompson_no_aero_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_thompson_no_aero_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_thompson_no_aero_prod
Checking test 007 fv3_ccpp_thompson_no_aero results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -482,14 +482,14 @@ Checking test 007 fv3_ccpp_thompson_no_aero results ....
Test 007 fv3_ccpp_thompson_no_aero PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_control_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_control_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_control_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_control_debug_prod
Checking test 008 fv3_ccpp_control_debug results ....
Test 008 fv3_ccpp_control_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v15p2_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v15p2_debug_prod
Checking test 009 fv3_ccpp_gfs_v15p2_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -556,8 +556,8 @@ Checking test 009 fv3_ccpp_gfs_v15p2_debug results ....
Test 009 fv3_ccpp_gfs_v15p2_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v16beta_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v16beta_debug_prod
Checking test 010 fv3_ccpp_gfs_v16beta_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -624,8 +624,8 @@ Checking test 010 fv3_ccpp_gfs_v16beta_debug results ....
Test 010 fv3_ccpp_gfs_v16beta_debug PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_rrtmgp_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_rrtmgp_debug_prod
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_rrtmgp_debug_ccpp
working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_rrtmgp_debug_prod
Checking test 011 fv3_ccpp_rrtmgp_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -693,5 +693,5 @@ Test 011 fv3_ccpp_rrtmgp_debug PASS


REGRESSION TEST WAS SUCCESSFUL
Fri Jun 26 14:35:45 UTC 2020
Elapsed time: 00h:29m:51s. Have a nice day!
Wed Jul 1 20:19:53 UTC 2020
Elapsed time: 00h:40m:55s. Have a nice day!
Loading