Skip to content

Commit

Permalink
Merge NCAR:dtc/develop into ufs-community:develop
Browse files Browse the repository at this point in the history 
- for macOS with LLVM clang, turn off OpenMP (from UFS public release)
- switch to Intel 18 on wcoss_cray
- new regression tests with RRTMGP using current control as basis

Squashed commit of the following:

commit 528c789415d6433530ed5d7867a0054cba3981ae
Merge: e447123 1e400e4
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Apr 14 07:03:41 2020 -0600

    Merge pull request #40 from climbfuji/update_dtc_develop_from_emc_develop_and_missing_ccnin_updates

    Update NCAR dtc/develop from EMC master, apply missing updates from CCN/IN commit

commit 1e400e40b5868d894bcb66aefdfdc5507eedf988
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Apr 14 07:00:12 2020 -0600

    Revert change to .gitmodules and update submodule pointer for fv3atm

commit ebb041a336f9b7dfbb6d9b13913305edf76b7131
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Apr 13 14:50:26 2020 -0600

    Fix typo in tests/rt_ccpp_dtc.conf

commit 6c0f94617d91a33375cddb3f20aa808bbab11dc1
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Apr 13 08:45:52 2020 -0600

    tests/rt_ccpp_dtc.conf: remove move tests that are already covered in tests/rt.conf

commit 246c251fb9366001c8bde0d9332e6c7e7141c6f0
Merge: 87876b1 7c3cdca
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Sat Apr 11 06:18:32 2020 -0600

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into update_dtc_develop_from_emc_develop_and_missing_ccnin_updates

commit 87876b15c3977fa624d90331db5effe8d6746d98
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Apr 10 14:24:02 2020 -0600

    Update .gitmodules and submodule pointer for fv3atm for code review and testing

commit e4471237aa8e62420daa30ce031e706953c4cbf6
Merge: fa94ff7 6897b78
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Apr 10 11:39:04 2020 -0600

    Merge pull request #38 from climbfuji/update_dtc_develop_from_emc_develop_and_other_updates_20200409

    Update dtc/develop from develop and other updates 2020/04/09

commit 6897b78788837f6e9fab200f14965889397d6549
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Apr 10 11:36:59 2020 -0600

    Revert change to .gitmodules and update submodule pointers for fv3atm

commit 53b8c994c3ecdb33a4b90159fc0bb16d641fd369
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 20:28:45 2020 -0600

    Update .gitmodules and submodule pointer for FV3 for code review and testing

commit e38adebd16f0c342c155456ce7c7d3af551e9820
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 20:28:17 2020 -0600

    CMakeLists.txt: require CMake 3.0

commit fb9f7511749290ecc47acd96bfd1033ae76e9a97
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 20:27:48 2020 -0600

    tests/rt.sh: align directory structure on Cheyenne with Hera, update date tag of regression test baseline

commit a91446ca83b1f69bde1ae0ade3d3961603e2cded
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 20:27:17 2020 -0600

    tests/rt_gnu.conf: compile on all platforms, not just on cheyenne (but don't run anywhere else yet)

commit af7042e26978255bd224577c6d93b99fcab3b3f9
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 20:26:33 2020 -0600

    tests/fv3_conf/ccpp_control_run.IN: change name of input data for RRTMGP tests

commit 11f6d44c1f9edd30ade6826b968d8d9ce9e2ac8e
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 20:25:55 2020 -0600

    cmake/configure_macosx.gnu.cmake: turn OpenMP off for LLVM clang compilers

commit d248227e78ae9e13006e1c88f3301d4d61fd1f8f
Merge: dc3590f ed314ae
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 11:05:05 2020 -0600

    Merge branch 'wcoss_cray_intel18' of https://github.com/DusanJovic-NOAA/ufs-weather-model into update_dtc_develop_from_emc_develop_and_other_updates_20200409

commit dc3590fd48463e4be6083e31dfdd590b61adbb19
Merge: fa94ff7 7097078
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 9 10:40:26 2020 -0600

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into dtc/develop

commit ed314ae6f5c3a847d7b35c7a008655a78a1e844e
Merge: f030745 7097078
Author: Dusan Jovic <dusan.jovic@noaa.gov>
Date:   Thu Apr 9 16:12:50 2020 +0000

    Merge branch 'develop' into wcoss_cray_intel18

commit f030745a83d8767247e8a24d339f3be02c084d4e
Author: Dusan Jovic <dusan.jovic@noaa.gov>
Date:   Wed Apr 8 20:15:09 2020 +0000

    Swicth to Intel 18 on WCOSS Cray. Run full rt.sh test on WCOSS Cray.

commit fa94ff7c2366b45ee4007ee39a66157c9ac84d74
Merge: 300a02d 78232d1
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Apr 3 15:35:01 2020 -0600

    Merge pull request #34 from climbfuji/update_submodule_pointer_fv3atm_20200403

    Update submodule pointer for fv3atm 2020/04/03

commit 78232d1a64066e484ad7ecca29e6cb27d813b7f8
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Apr 3 15:33:24 2020 -0600

    Update submodule pointer for fv3atm

commit 300a02da78769e73a82a6e490d9569168e619626
Merge: 02683a1 1b2c8e5
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Apr 3 11:48:04 2020 -0600

    Merge pull request #33 from climbfuji/avoid_recompile_without_change

    dtc/develop: speed up static compilation

commit 1b2c8e54e605101fa81463d06204f73c38476c48
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Apr 3 11:47:41 2020 -0600

    Revert change to .gitmodules, update submodule pointers for fv3atm

commit 93f78a0adec482e955422d1cad8b450fbaf5e1eb
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 2 13:59:12 2020 -0600

    Update .gitmodules and submodule pointer for fv3atm for code review and testing

commit 02683a142cb039e3aaa45ad3fa7b33211ac4b56b
Merge: 1336960 b6584d0
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Apr 2 08:14:47 2020 -0600

    Merge pull request #32 from climbfuji/cleanup_radiation_tendencies

    Cleanup radiation tendencies, add RRTMGP tests on Cheyenne

commit b6584d043bac3f632d9d3009b69580e8212a197e
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Apr 2 08:14:10 2020 -0600

    Revert change to .gitmodules and update submodule pointer for fv3atm

commit 7e39d9a5b495de78cec2714792291c8bbcf014bc
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Apr 1 10:13:45 2020 -0600

    Add RRTMGP tests and other DEBUG tests to regression test configurations for Cheyenne

commit a753eee47443b7627fb7b767de7a4c768524a015
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Apr 1 10:12:46 2020 -0600

    Update .gitmodules and submodule pointer for fv3atm for code review and testing

commit 133696003b12fbbc683fda6e6b8bf8a2a0f3ff55
Merge: 75145a6 1c5ea68
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Mar 30 09:19:36 2020 -0600

    Merge pull request #31 from climbfuji/update_cheyenne_gnu_to_9-1-0

    Update GNU compiler on Cheyenne to version 9.1.0

commit 1c5ea68db6a4b7c0fcee2be6dbbc78c13fd59bd4
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Mar 30 07:57:45 2020 -0600

    modulefiles/cheyenne.gnu/fv3: update GNU compiler used on Cheyenne to version 9.1.0 to be able to compile RRTMGP code

commit 75145a6fcd06dd224d510cf6ca00dc83862525f4
Merge: b02442b 6d42d95
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Mar 26 10:38:57 2020 -0600

    Merge pull request #29 from climbfuji/add_rrtmgp_dom

    RRTMGP in ufs-weather-model

commit 6d42d95235a8291629d77f42c1c5cf2d4f516102
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 26 10:36:08 2020 -0600

    Revert change .gitmodules and update submodule pointer for fv3atm

commit 55936be6cb9ee463bb7195173fe58a1ec05f1e8f
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 26 10:12:14 2020 -0600

    Update submodule pointer for FV3 following code review changes

commit 9a647bd60a72f1a6454bbcb263d4361189c368d8
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Mar 25 14:44:11 2020 -0600

    Add REPRO test for fv3_ccpp_rrtmgp

commit a799e2958eed087ef594c9191da2dd23c94fcc39
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Mar 25 06:25:12 2020 -0600

    Update submodule pointer for fv3atm after merging Python 3 compatibility PR

commit e04023e2abbde1f0b6d43dc5100b5af2cbb5e005
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Mar 23 13:59:44 2020 -0600

    Update submodule pointer for FV3 after RRTMGP bugfixes

commit bf0a2c421997f9aca4e29066de59d6b9061b6274
Merge: b6d9813 44604a0
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 19 11:57:40 2020 -0600

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into add_rrtmgp_dom

commit b6d9813220f8c40294ea0f823f4d9bdcc165f40d
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 19 11:46:35 2020 -0600

    Add RRTMGP regression tests in DEBUG and PROD mode, update compile_cmake.sh to work with the CCPP framework changes

commit acd17fcdbbd113187814b4e5cf1d0a46bedfff7b
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Mar 18 06:31:56 2020 -0600

    Update .gitmodules and submodule pointer for fv3atm for code review and testing

commit b02442b1e24e6291229edb3b9381d201b6c49baf
Merge: 028f778 1c9fb8b
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Mar 17 08:11:23 2020 -0600

    Merge pull request #28 from climbfuji/final_pr_before_merging_to_develop_or_master_20200313

    dtc/develop: final PR before merging to develop or master (support for hera.gnu, change rt.sh logic for parsing rt config files)

commit 1c9fb8b164922e600c8f44e3034574a60d66cf21
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Mar 17 08:10:01 2020 -0600

    Revert change to .gitmodules and update submodule pointer for fv3atm; keep NEMS submodule pointer as-is for now

commit 12cd2813ab10c63e812bb18e1d9db748810d54b6
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Mar 16 20:30:59 2020 -0600

    Update submodule pointer for fv3atm

commit d260b130908c761dbe774ae389ff0bc43e4006ec
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Mar 16 10:10:37 2020 -0600

    tests/rt_gnu.conf: run GFDLMP tests only on Cheyenne

commit 24026e9e6fe0203c3ffeb4b547422cce10a1d801
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Sun Mar 15 19:36:13 2020 -0600

    Update .gitmodules and submodule pointers for FV3 and NEMS for code review and testing

commit 3ff3f621a2641d547e77b620dfc4492badc07a43
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Sun Mar 15 19:35:53 2020 -0600

    Support for hera.gnu, compiler-specific baseline directory on hera, modify rt.sh so that COMPILE and APPBUILD lines without a machine name are executed on all machines (same as RUN lines), change rt_gnu.conf accordingly

commit 028f7786ef05d422dba7578fd2eaff78cc92f182
Merge: cf3ba9a 103078a
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Fri Mar 13 13:08:58 2020 -0600

    Merge pull request #27 from climbfuji/update_from_dev_emc_20200312_and_other_changes

    Update from emc/develop 2020/03/12 and other changes

commit 103078a0b1337fd0cc7bf71af61d63a108e1579e
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Mar 13 13:06:56 2020 -0600

    Revert change to .gitmodules, update submodule pointer for fv3atm

commit 46b67da2ee62bca1d91b52115b536c8c942d8696
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Mar 13 07:49:51 2020 -0600

    Bugfixes to regression test configuration files

commit 43467b8c07a1d5ad2eafa3404fb654f1c49b1c02
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 13:17:53 2020 -0600

    Turn of IPD stochy test, turn off IPD Thompson test, add GSD debug test, add Thompson/Thompson-no-aerosol prod and debug test

commit def339f4fb1a058edd751e2af2656a32b0b8c9e6
Merge: 9a35215 cf3ba9a
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 13:16:08 2020 -0600

    Update date tag for baseline to 20200313

commit cf3ba9a6fa36acf1dd78d4d50068b0039c51b277
Merge: bde9300 edcf5df
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Mar 12 13:11:19 2020 -0600

    Merge pull request #26 from climbfuji/merge_emc_develop_20200311_after_moorthi_before_dycore_pr7

    dtc/develop: merge emc/develop 2020/03/11 (after Moorthi's commit, before dycore OMP bugfix)

commit edcf5dfd7a48a2b181775a743b3b1a8b0c705d50
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 13:09:30 2020 -0600

    Revert change .gitmodules and update submodule pointer for FV3

commit 9a352157499fa50686cf824ec739871afea3b63e
Merge: 91a72c6 0b62be9
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 11:22:59 2020 -0600

    Merge branch 'merge_emc_develop_20200311_after_moorthi_before_dycore_pr7' of https://github.com/climbfuji/ufs-weather-model into merge_emc_develop_20200311_after_moorthi_before_dycore_pr7

commit 0b62be9d52379406a1b8d0e2fd708705aa676724
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 11:22:39 2020 -0600

    tests/rt_ccpp_dtc.conf: bugfix, remove test that is no longer exercise/doesn't have a baseline

commit 91a72c6e7b7b44c864ecb73e1f2031d7a327b7d5
Merge: 1bb0c09 0a88706
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 10:40:24 2020 -0600

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into merge_emc_develop_20200311_after_moorthi_before_dycore_pr7

commit 1bb0c093de9a7a00f98733a4ba543f9928683021
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Mar 12 08:54:02 2020 -0600

    Update .gitmodules and submodule pointer for FV3 for code review and testing, update CCPP regression tests from IPD, update tests/rt_ipd_prod_only.conf

commit 2e485f130d044d7e3c189d8b691f5a3ed10be23c
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Mar 11 15:14:01 2020 -0600

    Update submodule pointer for NEMS

commit 2a8b0a1cb78773228014a3ed6543204d7c31bc86
Merge: bde9300 efd63fb
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Mar 11 14:59:44 2020 -0600

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into dtc/develop

commit bde930024ebb6be41652f13a4fab2928e198ae5c
Merge: 67943a5 2d22078
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Mar 9 12:45:51 2020 -0600

    Merge pull request #24 from climbfuji/update_dtc_develop_from_emc

    Update dtc/develop from emc/develop 2020/03/04

commit 2d22078fc4ba0b9243cf733fd985b206425709c4
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Mar 9 12:44:14 2020 -0600

    Revert change to .gitmodules, update submodule pointer for FV3

commit 6e7230e3203d23e9ab2d54e40d1c1d306aef27d0
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Mar 9 10:22:28 2020 -0600

    Remove regional tests that do not run on Cheyenne anyway, they are tested in rt.conf for all other machines

commit b28f277fdb604382d255fa25e78cfe9556f7aee5
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Mar 6 14:46:47 2020 -0700

    Bugfix for CCPP IAU test, turn off global c768 tests (frequent out-of-memory errors for both IPD and CCPP), turn off CCPP dynamic tests in rt_ccpp_dtc.conf and merge HAFS and CAPS regression tests into rt_ccpp_dtc.conf

commit 6150bd4d288fe20a01810df00e6518ab00b77bf0
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Mar 4 09:37:20 2020 -0700

    Update submodule pointer for .gitmodules for code review and testing

commit 8d50b738f67b8d7f724c7d8e01e1d4664d7412f7
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Mar 4 09:31:33 2020 -0700

    CCPP regression test updates from IPD

commit d951469aeff67a51991aea6b3c3e1a5aa60e5c9b
Merge: 67943a5 47c7f9b
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Feb 28 09:02:05 2020 -0700

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into dtc/develop

commit 67943a550c6783a8aa3575e608bf5c3688ddbab5
Merge: 2919f28 e07e3ea
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Feb 20 10:43:57 2020 -0700

    Merge pull request #22 from climbfuji/update_rt_intel_cheyenne

    dtc/develop: update rt_intel.conf (for Cheyenne only)

commit e07e3eae9b715ce8a59c08a6f3a0837b81a40851
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Feb 20 10:37:43 2020 -0700

    Update tests/rt_intel.conf to reflect removal of GFSv15 and GFSv15plus regression tests

commit 2919f28a56fb3127fca33976c4840cad156be4d1
Merge: 4b36630 3fe4713
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Feb 6 13:39:06 2020 -0700

    Merge pull request #21 from climbfuji/dom_combine_prs_20200204

    dtc/develop: combined PRs for ccpp-framework and ccpp-physics

commit 3fe471391d68c969718f8764e835064cca72bd53
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Feb 6 13:38:26 2020 -0700

    Revert change to .gitmodules, update submodule pointer for fv3atm

commit 21e1c31cc7d9e7bf753d89df040b74edd78a0eab
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Feb 4 17:22:47 2020 -0700

    Update .gitmodules and submodule pointer for fv3atm for code review and testing

commit 4b36630a4076a4ef18d3c7651ab20f04c88908b2
Merge: 4c2d541 2907bf9
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Feb 3 07:51:23 2020 -0700

    Merge pull request #20 from climbfuji/update_dtc_develop_from_develop

    dtc/develop: update from develop 2020/01/27

commit 2907bf95aa319e3ece0e4de2ff24858b01427327
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Feb 3 07:49:41 2020 -0700

    Revert .gitmodules change, update submodule pointers

commit 85e5a911ab95f532f7bdd4465eb4996225e58a35
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Jan 29 16:42:58 2020 -0700

    Bugfix for tests/rt_ccpp_dtc.conf, need to specify dependencies for restart tests

commit c61c4216adb669358380b79aeb3b60e399c198b0
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Jan 29 08:39:46 2020 -0700

    Bugfix for tests/rt_ccpp_dtc.conf, need to specify machine names for each COMPILE command

commit 5df8b17873e1004497226b203765fad32d7e6b7a
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Jan 28 16:19:47 2020 -0700

    Revert baseline directory change in tests/rt.sh, use DTC baseline

commit 5507b9a53e32ce9076f6bca1767a47a42ab053c1
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Jan 27 12:29:08 2020 -0700

    Update tests/rt_ccpp_dtc.conf and tests/rt_gnu.conf; add temporary regression test config tests/rt_ipd_prod_only.conf

commit 6ab3fda31af1372903b80a5c98377aafa3fdb19e
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Jan 27 11:53:34 2020 -0700

    Update .gitmodules to use EMC'S NEMS repository instead of the NCAR fork

commit 23cdb90b6dbf89a04047b74516d9fd5ed6ceae00
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Jan 27 11:34:39 2020 -0700

    Update .gitmodules for code review and testing

commit e69a08bdd7ec4c8079d04cb44a06ec46f90e2988
Merge: 4c2d541 52795b8
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Jan 27 11:33:00 2020 -0700

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into dtc/develop

commit 4c2d541b95b34aa6507ffda2ccfd10058b039689
Merge: 5f1e9b4 2b6903e
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Thu Dec 26 08:04:33 2019 -0700

    Merge pull request #19 from climbfuji/sar_fix_hrrr_ics

    Add regression test fv3_ccpp_gsd_sar_25km_debug

commit 2b6903e7ee545fc5a0a5300d6190aee459d1dab6
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Dec 26 08:02:40 2019 -0700

    Updates for new regression test fv3_ccpp_gsd_sar_25km_debug

commit c428ab3e07ad6f994e384c396cc89931ba32c62b
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Dec 26 08:02:02 2019 -0700

    Update submodule pointer for FV3 following merge of https://github.com/NCAR/fv3atm/pull/22

commit 5f1e9b49b99ecc29878d5f7894f1d977501176d1
Merge: 9fad3f0 5b1e5d6
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Wed Dec 25 20:02:45 2019 -0700

    Merge pull request #17 from climbfuji/ww3_rt_ccpp_dtc_conf

    dtc/develop: turn off WW3 tests in rt_ccpp_dtc.conf for platforms other than hera.intel

commit 00d8b7718c906dba49b81e44efa72d35cb504a52
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 23 16:16:10 2019 -0700

    Add regression test fv3_ccpp_gsd_sar_25km_debug

commit 26b0ffa860608e9578b4d63c5a69a368782e6741
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 23 14:36:57 2019 -0700

    Update submodule pointer for FV3

commit 9fad3f0890a856fe1062a7cb3ad99383f9a61f09
Merge: 430976c 0bcd135
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Sun Dec 22 20:47:58 2019 -0700

    Merge pull request #18 from climbfuji/revert_queue_change_cheyenne

    Revert PBS queue change on Cheyenne

commit 0bcd1350b8a3e90616e8172a2a66fb4de88a7880
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Sun Dec 22 20:45:16 2019 -0700

    Revert PBS queue change on Cheyenne (back to premium)

commit 5b1e5d6ee8eaa2f859302ee52df0c1f8e35c2354
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Dec 20 10:26:44 2019 -0700

    Update of tests/rt_ccpp_dtc.conf: WW3 only supported on hera (hera.intel)

commit 430976cee88d38609e36c78c4ebe1021800cba66
Merge: bf05b97 22efd1f
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Dec 17 15:51:59 2019 -0700

    Merge pull request #16 from climbfuji/update_dtc_develop_from_ufs_public_release_20191216

    Update dtc/develop from EMC develop and ufs_public_release 2019/12/16

commit 22efd1f20708386b0a5bd805154108e524aca589
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Dec 17 15:51:12 2019 -0700

    Update submodule pointer for FV3 following the merge of https://github.com/NCAR/fv3atm/pull/21

commit caf8a8e7e8fe67ce479722e861d77966428c4dc1
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Dec 17 14:39:07 2019 -0700

    tests/rt.sh: update regression test baseline to trunk-20191217

commit fb701e32644081009dc0d4cc99a0ddf04fee62c8
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Dec 17 14:33:18 2019 -0700

    tests/fv3_conf/ccpp_*_run.IN: remove INPUT and RESTART as first step, because CCPP regression test directories are reused when the same job is run twice in CCPP dynamic and static mode

commit d071710fdcdb731eeed4017296f0f2fb1022e0a9
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 16 07:25:55 2019 -0700

    Rename suite FV3_GFS_v15.2 to FV3_GFS_v15p2, convert line endings to unix for  parm/ccpp_v15p2_c96.nml.IN and parm/ccpp_v16beta_c96.nml.IN, updates from ufs_public_release branch

commit 5a64854f435cee8d3d6d0096b4da0fdb50389aa9
Merge: bf05b97 3bc41ff
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Sat Dec 14 07:17:25 2019 -0700

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into dtc/develop

commit bf05b97c62a08ca7adf9dfe18345339a1f15f24f
Merge: 9ac4703 b294dad
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Mon Dec 9 11:06:01 2019 -0700

    Merge pull request #11 from climbfuji/update_dtc_develop_from_emc_develop_and_collect_updates_20191205

    Update dtc/develop from EMC develop and collect updates 2019/12/05

commit b294dad3f8d410157d12ed4d503be4f41dc2fc1b
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 9 11:05:27 2019 -0700

    Update submodule pointer for FV3

commit b95c95add815cf5b91c128179d4487db9bb3d17a
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Sun Dec 8 06:41:37 2019 -0700

    Update path to fix files for CCPP FA regression test, add rt_ccpp_hafs.conf

commit 2c913a44762795495399af6dadd6c143979775f2
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Sat Dec 7 08:08:11 2019 -0700

    GFS v15.2 and GFS v16beta namelists for CCPP for UFS public release

commit 343c81601079265df3de8dac6834f1c8e41fd5b6
Merge: e34a99d e8896bb
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Dec 6 07:53:03 2019 -0700

    Merge branch 'dtc/develop' of https://github.com/panll/ufs-weather-model into update_dtc_develop_from_emc_develop_and_collect_updates_20191205

commit e8896bb03ffe55ffab67bf2ff9989ff3ce1d77fb
Author: Linlin.Pan <Linlin.Pan@noaa.gov>
Date:   Fri Dec 6 00:32:57 2019 +0000

    adding namelists for v15.2 and v16

commit ba683e9b08e0c3cef4ccde4cdc19c711a5201742
Merge: 0bf138f 9ac4703
Author: panll <lpan@ucar.edu>
Date:   Thu Dec 5 17:20:20 2019 -0700

    Merge pull request #1 from NCAR/dtc/develop

    update

commit e34a99d9cba55140106086bb663d4bcd75c0b9d1
Merge: 9ac4703 7b70ad9
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Thu Dec 5 15:52:42 2019 -0700

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into dtc/develop

commit 9ac4703f17beabf2148cbe9faebd0b63eb2add17
Merge: 0bf138f 69ed25d
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Tue Dec 3 15:24:27 2019 -0700

    Merge pull request #9 from climbfuji/dtc_develop_udpate_from_emc_20191127

    dtc/develop: update from EMC 2019/11/27

commit 69ed25d21eb3a0896b9bbb8578a0a6db27a8a75d
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Dec 3 15:23:54 2019 -0700

    Update submodule pointer for FV3

commit 20d3b9844615fe674db7c5ca49d34897d2d42f39
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 2 11:13:37 2019 -0700

    tests/fv3_conf/ccpp_control_run.IN, tests/rt_ccpp_dtc.conf: bugfixes for new, coupled FV3-WW3 tests

commit bc29b379d541ab84fb09d358300d0791cf5ba5d6
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 2 11:12:50 2019 -0700

    tests/rt.sh: change default queue on cheyenne from premium to economy

commit e26a6145cbd6239b2662580ceb881d58a6bb5ad9
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 2 11:12:22 2019 -0700

    tests/rt.conf: move cheyenne.intel tests to tests/rt_intel.conf

commit 860f00e19d05a9104c9987e6fe4b4d719e0a00d7
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 2 11:10:53 2019 -0700

    Point to 2019.01 tag for FMS, update .gitmodules

commit 51d57f830ebbf941e26d710d28184f52543a34d5
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Mon Dec 2 11:03:10 2019 -0700

    Update submodule pointer for FV3

commit 03e8e036cb9d5ca45ccbf7fb57e9f313d6118534
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Nov 29 17:01:30 2019 -0700

    Follow-up bugfix for tests/fv3_conf/ccpp_gsd_sar_run.IN, insert missing 'FV3' in path

commit af5fce1939fe3a105246041b6ca2180e49515265
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Fri Nov 29 17:00:51 2019 -0700

    conf/configure.fv3.*.gnu: add '-Wall' to Fortran debug flags

commit 2deb2e16798cea96a9879159ea5f28eebf3b78d2
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Nov 27 15:28:01 2019 -0700

    Update of CCPP regression test configurations to reflect changes from EMC

commit defe5faedbc930ff8d6cd4cf1ecd2f0ab4140e24
Merge: 49d5095 dca7a75
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Nov 27 15:03:38 2019 -0700

    Merge branch 'develop' of https://github.com/ufs-community/ufs-weather-model into HEAD

commit 49d5095ebf0b2e2c66438b6ae38d44957c9fa070
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Nov 27 14:38:29 2019 -0700

    tests/fv3_conf/ccpp_gsd_sar_run.IN: bugfix, correct path to CCPP libraries for dynamic build

commit 4227033d37ee4bec3685a106eca5967bbabcbf0c
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Nov 27 14:37:43 2019 -0700

    Update submodule pointer for WW3 to match EMC

commit 0bf138fabb51b071e54891b1f60ae5fb720e0736
Merge: 2857a21 04ad3e6
Author: Dom Heinzeller <dom.heinzeller@icloud.com>
Date:   Wed Nov 27 13:47:47 2019 -0700

    Merge pull request #8 from climbfuji/merge-gsd_develop-and-nems_machine_env_var

    dtc/develop: merge gsd/develop, allow environment variable NEMS_MACHINE to overwrite (or set) MACHINE_ID

commit 04ad3e68d43d9689fa6bb1f952c70daafa13540b
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Wed Nov 27 13:46:15 2019 -0700

    Update submodule pointer for FV3

commit 77bdaa9c6e61e973a05f3ddfbe9b6682ccb4207c
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Nov 26 20:23:00 2019 -0700

    parm/ccpp_gsd_sar.nml.IN, tests/rt_ccpp_gsd.conf: bugfixes for SAR and drag suite regression tests

commit 5b903fb718a20b04d862a6043d85c72ec4f0f7f9
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Nov 26 12:03:50 2019 -0700

    Update submodule pointer for FV3

commit d541054af0c7085f961a3e8099627f0dba891285
Merge: 6fc17ca c37646e
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Nov 26 09:03:12 2019 -0700

    Merge branch 'nems_machine_env_var' of https://github.com/climbfuji/ufs-weather-model into dtc/develop

commit 6fc17ca178b20fe57111ef3b7ee2a22f3c0b31dc
Author: Dom Heinzeller <climbfuji@ymail.com>
Date:   Tue Nov 26 09:02:09 2019 -0700

    Merge NEMSfv3gfs gsd/develop into ufs-weather-model dtc/develop, squashed commit of the following:

    commit a9afb3607115ba35cc3c841bf48d410a048912c8
    Merge: 6c9a70dc 2d13e99d
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Thu Nov 21 15:44:02 2019 -0700

        Merge pull request #279 from climbfuji/update_submodule_pointers_rdlai

        Initialize Leaf Area Index (LAI) from climatology and other submodule updates

    commit 2d13e99dc0c5a39ece155e6ac6eb2bd5ddcc1037
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Thu Nov 21 15:43:07 2019 -0700

        Update submodule pointers for ccpp/physics and FV3

    commit 1653ff116ddca30b690a7375006139eab55237de
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Thu Nov 21 12:59:39 2019 -0700

        Update submodule pointers for FV3 and ccpp/physics

    commit caed402a8f5a6a535e58284f63f678e692f341d9
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Wed Nov 20 16:24:56 2019 -0700

        Update submodule pointer for stochastic physics to point to the head of the master branch

    commit 38c66d903797bdc7dbbc99589badece212a63412
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Wed Nov 20 16:13:30 2019 -0700

        Update FMS to the head of the GFS-FMS branch

    commit 29fbfcad795536eb763499ea98e9596d03c9d483
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Wed Nov 20 16:13:08 2019 -0700

        Update submodule WW3 to point back to the NOAA-EMC version, set correct hash

    commit 6c9a70dcdf5da8f1f678ad17523ef7533291062f
    Merge: 8b1bd280 fd8b7b48
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Nov 19 20:54:26 2019 -0700

        Merge pull request #278 from climbfuji/add_gsd_sar_regression_test

        gsd/develop: add GSD SAR regression test

    commit fd8b7b487a7b6a2cb3ad0a2e395aaf874b6efd8f
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Tue Nov 19 20:53:00 2019 -0700

        tests/tests/fv3_ccpp_gsd_sar: bugfix, correct name of control directory

    commit 86cc553107ace9e66429fbfee6e6e2a1dca88c73
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Mon Nov 18 14:39:06 2019 -0700

        tests/tests/fv3_ccpp_gsd_sar: correct list of files to check

    commit 43dbf0504cf5f86b9ad416e2d6358043df3863fb
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Mon Nov 18 09:22:07 2019 -0700

        Add regression test for GSD SAR

    commit 8b1bd2805a2543bb1a434dcc0718ca89e27ba284
    Merge: c73f665b 13329bf9
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Sat Nov 2 06:08:45 2019 +0900

        Merge pull request #277 from climbfuji/gsd_develop_update_submodule_pointer_ccpp_physics_20191102g

        gsd/develop: update submodule pointer for ccpp-physics 2019/11/01

    commit 13329bf9b7d8191a4e85789d52f4a6174bf61c50
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Sat Nov 2 06:06:24 2019 +0900

        Update submodule pointer for ccpp/physics

    commit c73f665b5838a2db86ba5bf65157c89f4ed90cc5
    Merge: fafa77ee 0f0778d4
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Mon Oct 28 12:54:28 2019 +0900

        Merge pull request #276 from climbfuji/gsd_debug_test_and_submodule_pointer_update_20191028

        gsd/develop: add CCPP GSD suite debug test, reduce timestep for Thompson MP tests, update submodule pointers

    commit 0f0778d4cb84150c2b1b3a2e0fe7501b897f2d9f
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Mon Oct 28 12:39:54 2019 +0900

        Update submodule pointer for ccpp/physics

    commit c3c0379e1cb10b7060095b9a85c045d6b3058e8b
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Mon Oct 28 12:33:09 2019 +0900

        Add new regression test for GSD suite in DEBUG mode

    commit cc2706d9c35fbbd69048c244dc0997107b9a3c78
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Fri Oct 25 11:14:30 2019 +0900

        Reduce timestep for regression tests using Thompson MP from 1200s to 600s

    commit fafa77eeae3696ff1fd9922b88becd3644b9dd55
    Merge: f3d1f6d2 e6b48fbe
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Thu Oct 24 11:00:48 2019 +0900

        Merge pull request #275 from climbfuji/gsd_develop_update_submodule_pointer_20191024

        gsd/develop: update submodule pointer, remote theia

    commit e6b48fbea416696a5b23f6910df2697334c8d656
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Thu Oct 24 10:57:13 2019 +0900

        Update submodule pointer for ccpp/physics

    commit 1bc10a8b7da94ed4d3648157ad9a8dfcef25180a
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Mon Oct 21 08:20:15 2019 +0900

        Update submodule pointer for ccpp-physics

    commit b583bd011b9e4139c3ff9efc7fa0240554d39a28
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Mon Oct 21 08:19:12 2019 +0900

        tests/rt_ccpp_gsd.conf: remove theia

    commit f3d1f6d212199af9eb47cd4e723eecbbdbd1f76c
    Merge: eac6d996 deec3095
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Sun Oct 13 14:59:39 2019 +0900

        Merge pull request #265 from climbfuji/update_submodule_pointers_20191011_1

        gsd/develop: update submodule pointers for FMS and ccpp/physics

    commit deec3095e43efd3b1599052525a631faea17d7d0
    Author: Dom Heinzeller <climbfuji@ymail.com>
    Date:   Fri Oct 11 08:01:14 2019 +0900

        Update submodule pointers for ccpp/physics and FMS

    commit eac6d996d84085d4010e8e1bfc8dff1855f9e21f
    Merge: 49f6c48e e49075d7
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Sep 24 14:21:16 2019 -0600

        Merge pull request #257 from climbfuji/update_submodule_pointers_gsd_develop_20190924

        gsd/develop: update submodule pointers 2019/09/24

    commit e49075d70b330b2a7dfa907d9bc7ad6e97a48992
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Sep 24 14:19:43 2019 -0600

        Update submodule pointers for FV3, NEMS, ccpp-framework, ccpp-physics

    commit 49f6c48edc94ba9d9ac0c143b6068ce56159cb00
    Merge: 5ea40b23 221bd404
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Sep 24 12:56:42 2019 -0600

        Merge pull request #256 from climbfuji/update_gsd_develop_from_gmtb_develop_20190924

        Update gsd/develop from gmtb/develop 2019/09/24

    commit 221bd404496a25f133b1f4e7aaf068225dfd9446
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Sep 24 12:51:44 2019 -0600

        Update CODEOWNERS and .gitmodules for gsd/develop, update submodule pointers

    commit e30fc6c67c3c98ceab5b0859fe47780de0859b91
    Merge: e7691783 3042e609
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Sep 24 10:53:31 2019 -0600

        Merge pull request #255 from climbfuji/cleanup_remove_thompson_satadj

        gmtb/develop: cleanup work 2019/09/24

    commit 3042e6090e4e4b6d3f22d2e3ee0677df057263ae
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Sep 24 09:52:12 2019 -0600

        Update submodule pointer for ccpp-physics, remove Thompson MP + saturation adjustment tests

    commit e7691783692215fb713ba60ae2799f33a2147efe
    Merge: f1b4c707 d5051cd2
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Mon Sep 23 10:16:50 2019 -0600

        Merge pull request #254 from climbfuji/update_submodule_pointers_20190923

        Update submodule pointers 2019/09/23

    commit d5051cd2f28c7cb2df686db02664f98584c3fb70
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Mon Sep 23 10:15:15 2019 -0600

        Update submodule pointers following https://github.com/NCAR/NEMSfv3gfs/pull/251 et al.

    commit f1b4c70787e949ac3557a4f4f89e549574c4065c
    Merge: 4d78478e e86179ec
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Mon Sep 23 09:33:06 2019 -0600

        Merge pull request #251 from climbfuji/gmtb_develop_update_from_master_20190920

        gmtb/develop: update from master 2019/09/20, remove TRANSITION mode

    commit e86179ec519baba659f29c71ea119cf010e6020c
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 20 19:59:53 2019 -0600

        Update submodule pointer for ccpp/physics

    commit 136b3af34a6c4c9c759fa13f49ca0009e8e9d1c4
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 20 08:55:40 2019 -0600

        Remove TRANSITION mode

    commit 20a5de0f2bab4ddea82df0bb2682738244ac86f0
    Merge: c97254f5 31e98b23
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 20 07:41:07 2019 -0600

        Merge branch 'master' of gerrit:NEMSfv3gfs into HEAD

    commit c97254f5dc9e84281fa26098b603e3436cead0ac
    Merge: 4d78478e fadc8080
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 20 07:24:46 2019 -0600

        Merge branch 'master' of https://github.com/NCAR/NEMSfv3gfs into HEAD

    commit 4d78478e98a4aa1e547dc714b9dd7b895f71f351
    Merge: af03bb30 4c1b7e7b
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Thu Sep 19 16:10:13 2019 -0600

        Merge pull request #250 from climbfuji/update_submodule_pointers_20190919

        Update submodule pointers for FV3, ccpp-physics, ccpp-framework 2019/09/19

    commit 4c1b7e7b99568e8e3d19c5727e6ba41b2c3ae2d7
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Sep 19 16:08:16 2019 -0600

        Update submodule pointers for FV3, ccpp-physics, ccpp-framework

    commit af03bb30daac3be4b6aca41043612743f66d618c
    Merge: 80ff65a6 5aab0bee
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Thu Sep 19 14:40:18 2019 -0600

        Merge pull request #249 from climbfuji/myj_with_dom_mods

        gmtb/develop: MYJ PBL/SFC, Noah MP, Cheyenne modulefiles, cleanup rt*.conf

    commit 5aab0bee5e2952529cafb2191f0b8c6f53ea4f43
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 18 13:54:29 2019 -0600

        Update submodule pointer for FMS and ccpp/physics

    commit 1d09c3b363c6c0ac05cabe4ce6ec2d4cc86499ae
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 18 13:49:09 2019 -0600

        Bugfix for modulefiles/macosx.gnu/fv3

    commit 04321dc32e522e2ece1ddd952c5771922b45ce6a
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Mon Sep 16 15:40:52 2019 -0600

        Update submodule pointers for FV3 and ccpp/physics

    commit 2bc9874472eb499d7381a37782fbf3ac04af266b
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Mon Sep 16 15:37:57 2019 -0600

        ccpp/CMakeLists.txt: for GNU and REPRO mode, add -g to compiler options

    commit 9f5a6ca3be704d40d2473f5bb8017195dbd5d93e
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 17:21:26 2019 -0600

        Add hera.intel to rt_ccpp_caps.conf, rt_ccpp_gmtb.conf, rt_ccpp_gsd.conf

    commit a747a0687153c1e69f8a741bcbdbc67eff766943
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:43:45 2019 -0600

        Update submodule pointers for FV3, ccpp-framework, ccpp-physics

    commit 9091411f3fe01d44701545ed75d0b5fc90c313b0
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:43:24 2019 -0600

        Update ESMF version for macOS and linux platforms

    commit f1c3c4a37351e7097505cfe5ca136e4b2d5e5d2e
    Merge: 1aedd2bb 80ff65a6
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:41:38 2019 -0600

        Merge branch 'gmtb/develop' of https://github.com/NCAR/NEMSfv3gfs into myj_with_dom_mods

    commit 1aedd2bb06899f3c273fb151d54e6c9c0b2bf2d8
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:25:52 2019 -0600

        tests/rt_ccpp_gmtb.conf: formatting changes

    commit 80ff65a69a144127015aa1703a73dbc123df008e
    Merge: a6b70173 4183ee57
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Fri Sep 13 16:23:34 2019 -0600

        Merge pull request #246 from climbfuji/gmtb_develop_metadata2html_batchconvert

        gmtb/develop: metadata2html batch processing

    commit 141f41e44c3977287808bb4d08f8adfeb2ecbcc1
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:10:38 2019 -0600

        Remove redundant regression test configurations

    commit 940b7d1a6de99438a9e5a33bab836dab52e8a0a6
    Merge: 26acc72b 3c961fa0
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:08:26 2019 -0600

        Merge branch 'noahmp' of https://github.com/grantfirl/NEMSfv3gfs into myj_with_dom_mods

    commit 26acc72b9c895c28f213a73aa17dbe4a953fdaab
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:01:40 2019 -0600

        Combining CCPP GFDLMP namelist template with MYJ changes, add default values to tests/default_vars.sh

        Remove separate regression test config for MYJ, add to rt_ccpp_gmtb.conf

    commit abf19ed89d7d0a84840cfccf759d2cad7b8c5526
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 16:00:17 2019 -0600

        modulefiles/cheyenne.*/fv3: update ESMF to 8.0.0bs48, use modules instead of setting environment variables manually

    commit 8a1cc14102eab44fdda81daaec0c0f6ba6a60a51
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 15:59:30 2019 -0600

        ccpp/suites/suite_FV3_GFS_2017_myj.xml: update with stochastic_physics and UGWD changes

    commit 3c961fa0bcf21dc5e5020b1a326caf47c580c58b
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Fri Sep 13 14:52:04 2019 -0600

        add noahmp tests to rt.conf and rt_ccpp_gmtb.conf

    commit db00f41e14c62aeadad503119e95f287562bd4d7
    Merge: b34799b2 282ad6b6
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Sep 13 10:46:04 2019 -0600

        Merge branch 'myj_from_qingfu' into detect_machine_cheyenne_update_20190912

    commit a6b701733c4b1571a8a54c12db2142b3b5f9b815
    Merge: 079b0b14 b34799b2
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Fri Sep 13 09:37:14 2019 -0600

        Merge pull request #247 from climbfuji/detect_machine_cheyenne_update_20190912

        gmtb/develop: update tests/detect_machine.sh for Cheyenne

    commit b34799b26f6c956adc313027ffd6c51204e19acb
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Sep 12 21:17:03 2019 -0600

        tests/detect_machine.sh: detect cheyenne with and without .ib. in hostname

    commit 4183ee576bfedea4fec85c72d3f0d8f26c2900e7
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Sep 12 15:38:08 2019 -0600

        ccpp/config/ccpp_prebuild_config.py: remove outdated version number from comment

    commit 92d6056d8b90d98e3ae2ffca275d5767f634b449
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Sep 12 08:45:09 2019 -0600

        Update submodule pointer for ccpp/framework

    commit 25486e833de3d752824ef391474f939daf370ca4
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Sep 12 08:44:55 2019 -0600

        ccpp/config/ccpp_prebuild_config.py: add new variable METADATA_HTML_OUTPUT_DIR required for metadata2html batch processing

    commit d5dff46bb109e9a9c4707941013db1e47f221760
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Tue Sep 10 17:42:35 2019 -0600

        remove stochastic physics calls from suite_FV3_GFS_2017_gfdlmp_noahmp.xml

    commit d114de7b13be53593146c39cacf939affda4c56f
    Merge: 2c378470 079b0b14
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Tue Sep 10 17:38:07 2019 -0600

        Merge branch 'gmtb/develop' into noahmp

    commit 079b0b14c8dabc0e510119de4be1ab0ec0c39dc2
    Merge: c28e4020 20a8a674
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Sun Sep 8 20:44:52 2019 -0600

        Merge pull request #245 from climbfuji/gmtb_develop_update_submodule_pointers_20190908

        gmtb/develop: update submodule pointers 2019/09/08

    commit 20a8a674fd496965423d07936039a355df1da0ff
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Sun Sep 8 20:42:53 2019 -0600

        Update submodule pointers for FV3, NEMS, ccpp-framework, ccpp-physics

    commit c28e4020d3616f8b2de6d42f7b15e49a34f6e8fa
    Merge: 5b120105 69b55a7c
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Sun Sep 8 20:32:26 2019 -0600

        Merge pull request #243 from climbfuji/gmtb_develop_monster_merge_20190904

        Convert all schemes to new metadata, merge gsd/develop, update from Vlab, update of CCPP physics with IPD physics changes, GNU portability

    commit 2c378470a94f672d726a865ee67fc18e61e5e86c
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Fri Sep 6 15:13:34 2019 -0600

        move calculation of precipitation rates for NoahMP to pre-NoahMP scheme rather than GFS_MP_generic_post for B4B testing

    commit 69b55a7c7c39ece01f97fef334012cbcc5a6e079
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Sep 5 21:48:25 2019 -0600

        Update submodule pointer for ccpp/framework

    commit e67e618bb89dd396235e5dff186d11b458169b0b
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 21:18:48 2019 -0600

        Bugfix for GSD suites: replace gwdps_pre with GFS_GWD_generic_pre

    commit fadc80809693b39557f8ab4b75329bbf0106c519
    Merge: 64f209ce 097468ca
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Wed Sep 4 16:45:51 2019 -0600

        Merge pull request #244 from climbfuji/github_master_update_submodule_pointer_FV3_20190904

        GitHub master: update submodule pointer for FV3

    commit 097468ca99392eb208ee90039f3fc9b1e07ce903
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 16:44:20 2019 -0600

        Update submodule pointer for FV3

    commit 64f209cee5a7f364d5a93df27ad8e071f7f4682d
    Merge: 45b389ae 8fe8d004
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Wed Sep 4 16:41:54 2019 -0600

        Merge pull request #242 from climbfuji/github_master_update_from_vlab_master_20190904

        Update GitHub master from Vlab master 2019/09/04

    commit a105b2c92f91557b74cf439740628cfbddbc845c
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 15:41:35 2019 -0600

        Update submodule pointers for FV3 and ccpp/physics

    commit d5c4e5faa2994d2d75c48d27121ccb5bc46b9c9e
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 15:41:18 2019 -0600

        ccpp/config/ccpp_prebuild_config.py: add new dependency ccpp/physics/physics/samfaerosols.F

    commit bd52519b589955ecf40e8e3dc2dfe6b087419210
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Wed Sep 4 13:36:21 2019 -0600

        add noahmp-specific rt.conf

    commit 7d142eb30608f14e8a2a7995f8f37bd8b52445af
    Author: Jun Wang <jun.wang@noaa.gov>
    Date:   Tue Sep 3 01:39:37 2019 +0000

        NEMSfv3gfs: this commits #refs 67151, Add aerosol transport to SAMF deep convection scheme, #refs 67152, Export instantaneous convective specific humidity tendency

        Change-Id: Iaad6fd2aef539341bccec8665a790421a1794951

    commit da04e9ae8ecd7448732903b138ae29a675509b37
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 11:04:02 2019 -0600

        ccpp/suites/suite_FV3_GFS_v15_gf.xml: fix merge conflict

    commit 3b81d224bdb9b33a7b5743a6c7f1bd836d46cb26
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 11:00:34 2019 -0600

        ccpp/suites/*.xml: remove stochastic_physics and stochastic_physics_sfc schemes from new SDFs

    commit 3c247950ad1ddcfe34a3f9a53f53127309a5b3d1
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 10:57:18 2019 -0600

        Update submodule pointers for ccpp/framework and ccpp/physics

    commit 8fe8d0041c672b12da0e360f59ab2aa746efbef2
    Author: Jun Wang <jun.wang@noaa.gov>
    Date:   Tue Sep 3 01:39:37 2019 +0000

        NEMSfv3gfs: this commits #refs 67151, Add aerosol transport to SAMF deep convection scheme, #refs 67152, Export instantaneous convective specific humidity tendency

        Change-Id: Iaad6fd2aef539341bccec8665a790421a1794951

    commit 7b9cd36b2d17dfbe7693b1669077c7a07b4b8342
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 10:11:08 2019 -0600

        ccpp/config/ccpp_prebuild_config.py: add sfc_cice scheme

    commit 79e5cd20c3b40effb990573a013e040b03ccb08b
    Merge: b9e05586 5ea40b23
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 09:18:44 2019 -0600

        Merge branch 'gsd/develop' of https://github.com/NCAR/NEMSfv3gfs into gaea_update_stochastic_physics_metadata_conversion

    commit b9e05586d33eac6902fb3e64d7646489c3b25fe1
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 08:22:02 2019 -0600

        modulefiles/macosx.gnu/fv3: improve setting compilers so that it works when MPIF90 etc are not set

    commit ceef678c966308e22ba2d08fd26a6526e6f4064b
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Sep 4 08:18:39 2019 -0600

        ccpp/config/ccpp_prebuild_config.py: add ccpp_types to converted metadata dictionary

    commit 0aafc0a34ed6649d8e54d058f96e83712162bbda
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Tue Sep 3 15:08:02 2019 -0600

        update SDF using noahmp

    commit 99626b8c2da1a22d6abb9da32cc3fc9168614ba7
    Merge: 235b712b 5b120105
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Tue Sep 3 15:06:00 2019 -0600

        Merge branch 'gmtb/develop' of https://github.com/NCAR/NEMSfv3gfs into noahmp

    commit caa9037ab43b21fd727d1d030b4cef9ecab7f1d3
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Wed Jul 10 08:05:30 2019 -0600

        compsets/fv3.input: set variables DO_SPPT, DO_SHUM, DO_SKEB, DO_SFCPERTS for fv3_stochy test

    commit bf8c2ded4b6779c9e1446507057f38a384b98167
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Jul 9 14:33:37 2019 -0600

        parm/input.nml.IN, tests/tests/fv3_stochy: add new namelist options do_sppt, do_shum, do_skeb, do_sfcperts to namelist template, set for fv3_stochy test

    commit 85b7a7a2c32a19971ac89255f9b9d595829902a7
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Jul 9 14:31:48 2019 -0600

        ccpp/config/ccpp_prebuild_config.py, ccpp/suites/*: remove stochastic physics from CCPP config and suite definition files

    commit d33df0427b1d6df35ff92edcab2e152d08499f15
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Jul 9 14:30:55 2019 -0600

        Add new submodule stochastic_physics, located in directory with same name

    commit c061af4a2d8f1a8318ca40aacdfb25ccec353f15
    Merge: 2483ed32 5b120105
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Sep 3 09:22:32 2019 -0600

        Merge branch 'gmtb/develop' of https://github.com/NCAR/NEMSfv3gfs into gaea_update_stochastic_physics_metadata_conversion

    commit 5b1201056ec3187c04f7edb9d8afaac2465b4e9b
    Merge: 0ab90a12 fd7d0f1e
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Sep 3 09:19:54 2019 -0600

        Merge pull request #239 from climbfuji/gmtb_develop_update_from_master_20190830

        gmtb/develop: update from master 2019/08/30

    commit 2483ed324e53de72fa67de24cb1d04d492b1c862
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Sep 3 08:31:04 2019 -0600

        ccpp/build_ccpp.sh modulefiles/gaea.intel/fv3: update for gaea following wcoss_cray to avoid setting NETCDF and HDF5 in modulefile

    commit 45b389ae0e2fea91bb71edcceef481601827a5c5
    Merge: 257f2a2e ce0c61f6
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Sep 3 08:23:51 2019 -0600

        Merge pull request #240 from climbfuji/update_submodule_pointer_in_NEMSfv3gfs_20190903

        master: update submodule pointers for FV3, NEMS, WW3

    commit ce0c61f644c95afc7f8dfa49ce6678d40356f54b
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Sep 3 08:22:21 2019 -0600

        Update submodule pointers for FV3, NEMS, WW3

    commit 257f2a2eec6f9ca902c4a2aac9fd312f24470d9b
    Merge: a1a54d1f 95583de5
    Author: Laurie Carson <carson@ucar.edu>
    Date:   Mon Sep 2 14:15:08 2019 -0600

        Merge pull request #238 from climbfuji/update_from_noaaemc_dev_20190830

        Update GitHub NCAR master from Vlab master

    commit fd7d0f1e022c60a010691a51dbc866b82a48c1c1
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 30 15:43:28 2019 -0600

        Update submodule pointer for ccpp-physics

    commit 15c64a190aa7af38dce3a9154d7bae9bbe1e381c
    Author: Jun Wang <jun.wang@noaa.gov>
    Date:   Tue Aug 27 20:23:05 2019 +0000

        NEMSfv3gfs: this commits #refs 66699, Calling radiative transfer parameterizations on each physics time step, #refs 66931,fix time window for accumulated fields in fv3 with IAU, #refs 62918,output omega field in fv3 history file and #65894,add WW3 component in NEMSfv3gfs(part2)

        Change-Id: I85286a530943fe67839e1afe2c94653faba27b2d

    commit 50962a88c93b90930d747e1e007f10c21b042fdb
    Author: Jun Wang <jun.wang@noaa.gov>
    Date:   Sun Aug 25 02:56:05 2019 +0000

        NEMSfv3gfs: this commits #refs 59519, separate FV3 dynamical core repository from FV3

        Change-Id: I0f7ba54ca67ef6aeef0d529b3005f3fef7bc3aa9

    commit 5f481c8f5a36a2c0ae56dd02645bd5ec591dcc6f
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 30 15:33:53 2019 -0600

        Update .gitmodules to point to NCAR repro and branch gmtb/develop for new submodule WW3, update submodule pointer

    commit 872693bea7e160edb478b05cfb68e96e3671ec8c
    Author: Jessica.Meixner <Jessica.Meixner@noaa.gov>
    Date:   Tue Aug 20 12:10:34 2019 +0000

        NEMSfv3gfs: this commit refs #65894, adding WW3

    commit 95583de5ce6c4cbb83abe35b969476ba88628cca
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 30 11:29:32 2019 -0600

        Add default branch develop for WW3 and update submodule pointer

    commit a2fc15ec2140ef5b5e80dc4bd4b2d88430a9d59d
    Author: Jun Wang <jun.wang@noaa.gov>
    Date:   Tue Aug 27 20:23:05 2019 +0000

        NEMSfv3gfs: this commits #refs 66699, Calling radiative transfer parameterizations on each physics time step, #refs 66931,fix time window for accumulated fields in fv3 with IAU, #refs 62918,output omega field in fv3 history file and #65894,add WW3 component in NEMSfv3gfs(part2)

        Change-Id: I85286a530943fe67839e1afe2c94653faba27b2d

    commit c15a5f76e78c08c68e3afb0d5e5194f55dcdd855
    Author: Jun Wang <jun.wang@noaa.gov>
    Date:   Sun Aug 25 02:56:05 2019 +0000

        NEMSfv3gfs: this commits #refs 59519, separate FV3 dynamical core repository from FV3

        Change-Id: I0f7ba54ca67ef6aeef0d529b3005f3fef7bc3aa9

    commit 100dc801cb2901618f778720c6ad4426070ce4c7
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 30 10:17:47 2019 -0600

        Update .gitmodules so that WW3 points to the NCAR repository

    commit 25aa6fe7d55240903a132fc81dd9fb9b8aca0631
    Author: Jessica.Meixner <Jessica.Meixner@noaa.gov>
    Date:   Tue Aug 20 12:10:34 2019 +0000

        NEMSfv3gfs: this commit refs #65894, adding WW3

    commit 0ab90a125b63b89d29bb73e0f640000b6c5b74a0
    Merge: cee7b3fe b77f1471
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Fri Aug 30 07:42:51 2019 -0600

        Merge pull request #237 from climbfuji/gmtb_develop_update_submodule_pointers_20190830_1

        gmtb/develop: update submodule pointers for FV3, NEMS, ccpp/framework, ccpp/physics

    commit b77f14719ac17b564f85d69383c99b8b161de817
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 30 07:40:55 2019 -0600

        Update submodule pointers for FV3, NEMS, ccpp/framework, ccpp/physics

    commit cee7b3fe354e07a29dbc9fa49235d909f4cf528a
    Merge: f4671a1c d02d0c16
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Fri Aug 30 07:39:01 2019 -0600

        Merge pull request #234 from climbfuji/bugfix_rt_conf

        gmtb/develop: bugfix for rt.conf

    commit a1a54d1f5159aa927ac4d4b01abaa6548040ff52
    Merge: 8a1e235d ed0c436a
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Thu Aug 29 15:32:08 2019 -0600

        Merge pull request #236 from grantfirl/master

        add Julie as codeowner

    commit ed0c436ad2aa1c52a6a6a5fa1ca7a9fc210956d3
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Thu Aug 29 15:00:06 2019 -0600

        add Julie as codeowner

    commit f4671a1c9f394609f33e0f04a893ab1a8147f8bb
    Merge: ea22d467 a667940f
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Thu Aug 29 14:58:30 2019 -0600

        Merge pull request #235 from grantfirl/gmtb/develop

        add Julie as codeowner

    commit a667940f9cfff12e41cb5134f86e66babc76081f
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Thu Aug 29 14:52:42 2019 -0600

        add Julie as codeowner

    commit d02d0c1679ffd3b57b2d2d049f86efdc531b51fd
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Aug 29 08:06:47 2019 -0600

        Update submodule pointers for FV3 NEMS ccpp/physics

    commit 65238966d6c574b314bc1b0e487e59f78d9b5552
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Thu Aug 29 08:06:02 2019 -0600

        tests/rt.conf: bugfix, correct name of suite FV3_GFS_2017_gfdlmprad_gwd to FV3_GFS_2017_gfdlmp_gwd

    commit 282ad6b657ff250eefba8092975b484681479d8a
    Author: Qingfu Liu <Qingfu.Liu@noaa.gov>
    Date:   Wed Aug 28 19:53:24 2019 +0000

        correct file content tests/tests/fv3_ccpp_gfs_myj

    commit 29993a06e32ea08b588bed93d7e088ea386daf7c
    Author: Qingfu Liu <Qingfu.Liu@noaa.gov>
    Date:   Wed Aug 28 19:49:13 2019 +0000

        correct file content tests/tests/fv3_ccpp_gfs_myj

    commit 5ea40b233539ed0b8a86d8ef54ed59cba4c89621
    Merge: e06da970 01f6a0f8
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Aug 27 16:40:43 2019 -0600

        Merge pull request #232 from climbfuji/gsd_develop_update_submodule_pointers_20190827

        gsd/develop: update submodule pointers for FV3 and ccpp/physics

    commit 01f6a0f87727751a8252a576bceed7bc5b9729a7
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 16:39:04 2019 -0600

        Update submodule pointers for FV3 and ccpp/physics

    commit ea22d467cb4e6289768ca625133f68d803cc4772
    Merge: 8ba3d4ae 3150c4b4
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Aug 27 16:32:58 2019 -0600

        Merge pull request #231 from climbfuji/update_submodule_pointers_gmtb_develop_20190827

        gmtb/develop: update submodule pointers for FV3, NEMS, ccpp/physics

    commit 3150c4b432ac93119c578a1d0cb12a7b0e1e3fd6
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 16:30:38 2019 -0600

        Update submodule pointers for FV3 NEMS ccpp/physics

    commit 8ba3d4ae5bfd786895d54c26f398821d28601821
    Merge: 6aba4551 f91d7846
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Aug 27 15:45:47 2019 -0600

        Merge pull request #230 from climbfuji/hera_update_20190827

        gmtb/develop: update hera config, enable regression testing

    commit f91d78461f1608bfdbe1de0d38a9527f8381cea7
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 15:04:42 2019 -0600

        Update submodule pointer for NEMS

    commit 235b712ba15d59c4d56aa990d3a9edeb30999496
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Mon Aug 26 15:40:00 2019 -0600

        add CCPP-based NoahMP test to RTs for rt_ccpp_gmtb.conf (plus new SDF based on suite_FV3_GFS_2017_gfdlmp.xml)

    commit e74e0d2ebd6430e39c2f869c7241be858776f385
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 13:53:55 2019 -0600

        Update submodule pointer for NEMS

    commit 290a484f1e3be763aced44c2dfd099c6d832ce2e
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 13:53:33 2019 -0600

        rt_hera_test.conf: temporary regression test config for testing on hera

    commit c52d27b0d8e99029d1e723ecde07d3ba0813da09
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 13:52:20 2019 -0600

        tests/rt.sh: enable regression testing with rt.sh, changes from Ratko, update STMP and PTMP for GMTB

    commit 6b9508c93f81383418ad1b779ce8d4bc2358aba4
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 13:48:01 2019 -0600

        modulefiles/hera.intel/fv3: update path to modules following transition from Juno test system to hera

    commit eb229d3cb145a7811d69348cb2167fbd5a5a097d
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 13:47:33 2019 -0600

        ccpp/build_ccpp.sh and conf/configure.fv3.hera.intel: don't use the AVX512 flags yet on hera

    commit 6aba455146a4a8d4629704e5226570116091691f
    Merge: 5c289838 75b5715e
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Aug 27 07:17:17 2019 -0600

        Merge pull request #229 from climbfuji/gmtb_develop_update_submodule_20190827

        gmtb/develop: update submodule pointers for FV3, ccpp-physics, ccpp-framework

    commit 75b5715e41c6f978defaa04e38d41b8d20326488
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Tue Aug 27 07:15:40 2019 -0600

        Update submodule pointer for FV3, ccpp-physics, ccpp-framework

    commit 5c289838c1bc9d443319e4cdad4b23df5215fc77
    Merge: eb7b7ae8 48000a93
    Author: Dom Heinzeller <dom.heinzeller@icloud.com>
    Date:   Tue Aug 27 07:13:20 2019 -0600

        Merge pull request #218 from bluefinweiwei/cires_ugwp

        UGWP Version 0

    commit 51299cadc6514199225605df04246e54446d6486
    Author: Qingfu Liu <Qingfu.Liu@noaa.gov>
    Date:   Tue Aug 27 11:03:43 2019 +0000

        add MYJ surface layer scheme and MYJ PBL scheme to CCPP

    commit 75596f60b0d684413cf8a6f42567cd92195b3661
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Mon Aug 26 13:34:15 2019 -0600

        remove noahmp_pre.F90 from CCPP config since code was moved to existing interstitial scheme

    commit d913c69b7e11b23f5666c4f8432a6e0c80fe7036
    Author: Grant Firl <grantf@ucar.edu>
    Date:   Fri Aug 23 18:04:07 2019 -0600

        remove module_wrf_utl.f90 from ccpp_prebuild_config scheme dependency list

    commit 48000a93dfd9b07159d3d006016c854e14a20886
    Merge: 266c9885 e38eda36
    Author: Weiwei <42526954+bluefinweiwei@users.noreply.github.com>
    Date:   Fri Aug 23 13:53:36 2019 -0600

        Merge pull request #3 from climbfuji/ugwd_dom

        Delete tests/rt_with_ugwp.conf

    commit e38eda36b8d1d7181400059c3d7cc1af3511534d
    Merge: 789ab6bc 266c9885
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 23 13:50:02 2019 -0600

        Merge branch 'cires_ugwp' of https://github.com/bluefinweiwei/NEMSfv3gfs into ugwd_dom

    commit 789ab6bc2ae4e04cdeaa580abbb0cbcf0c4d9cb7
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 23 13:48:59 2019 -0600

        Delete tests/rt_with_ugwp.conf

    commit 266c9885f97153154fa6caaaf0bbac87addda38b
    Author: Weiwei <42526954+bluefinweiwei@users.noreply.github.com>
    Date:   Fri Aug 23 13:47:39 2019 -0600

        Delete rt_ugwp_only.conf

        Removed.

    commit b27a08aa3d2544024a0fb6adf0a38d339ac3a18c
    Merge: 5ffd3ed8 adc9df36
    Author: Weiwei <42526954+bluefinweiwei@users.noreply.github.com>
    Date:   Fri Aug 23 13:22:27 2019 -0600

        Merge pull request #2 from climbfuji/ugwd_dom

        UGWD update for open PR to gmtb/develop

    commit adc9df36fbe5a866bcab77f709d368286d2a496d
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 23 11:59:13 2019 -0600

        Update submodule pointers

    commit 4410e285d4f0a99a68f2da799fa8d9d117e8ef1a
    Merge: 1499c32c eb7b7ae8
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 23 09:34:58 2019 -0600

        Merge branch 'gmtb/develop' of https://github.com/NCAR/NEMSfv3gfs into ugwd_dom

    commit 1499c32c862f4471a72c85204208d01c847f8d2d
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 23 09:11:39 2019 -0600

        Update submodule pointers for FV3, ccpp/framework, ccpp/physics

    commit 7ae19849e6a6365adab0642e674a3e16b04cbbf3
    Author: Dom Heinzeller <dom.heinzeller@noaa.gov>
    Date:   Fri Aug 23 09:10:02 2019 -0600

        ccpp/suites/*: rename gwdps_pre to…
  • Loading branch information
@climbfuji
climbfuji committed Apr 14, 2020
1 parent 7b54850 commit e7a7f23
Show file tree
Hide file tree
Showing 14 changed files with 295 additions and 121 deletions.
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.0)

foreach(env_var IN ITEMS
CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_Fortran_COMPILER
Expand All @@ -13,7 +13,9 @@ set(CMAKE_CXX_COMPILER $ENV{CMAKE_CXX_COMPILER})
set(CMAKE_Fortran_COMPILER $ENV{CMAKE_Fortran_COMPILER})
set(CMAKE_Platform $ENV{CMAKE_Platform})

project(NEMSfv3gfs C CXX Fortran)
project(ufs-weather-model
VERSION 1.0
LANGUAGES C CXX Fortran)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
find_package(MPI REQUIRED)
Expand Down
5 changes: 5 additions & 0 deletions cmake/configure_macosx.gnu.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ option(DEBUG "Enable DEBUG mode" OFF)
option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
# OpenMP broken for clang compiler
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang*")
option(OPENMP "Enable OpenMP threading" OFF)
else()
option(OPENMP "Enable OpenMP threading" ON)
endif()
option(AVX2 "Enable AVX2 instruction set" OFF)

option(INLINE_POST "Enable inline post" OFF)
Expand Down
6 changes: 3 additions & 3 deletions modulefiles/cheyenne.gnu/fv3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ module-whatis "loads NEMS FV3 prerequisites for Cheyenne/GNU"
## this typically includes compiler, MPI and job scheduler
##
module load ncarenv/1.3
module load gnu/8.3.0
module load gnu/9.1.0
module load mpt/2.19
module load ncarcompilers/0.5.0
module load netcdf/4.6.3
module load netcdf/4.7.3

module use -a /glade/p/ral/jntp/GMTB/tools/modulefiles/gnu-8.3.0/mpt-2.19
module use -a /glade/p/ral/jntp/GMTB/tools/modulefiles/gnu-9.1.0/mpt-2.19

##
## use pre-compiled EMSF library for above compiler / MPI combination
Expand Down
7 changes: 3 additions & 4 deletions modulefiles/wcoss_cray/fv3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ module-whatis "loads NEMS FV3 prerequisites on Surge and Luna"
module load PrgEnv-intel
module rm intel
module rm NetCDF-intel-sandybridge/4.2
module load intel/16.3.210
module load intel/18.1.163
module load cray-netcdf/4.3.3.1
module load cray-hdf5/1.8.14
module load xt-lsfhpc/9.1.3
module load craype-haswell
module load python/2.7.14
module load cmake/3.6.2
module load cmake/3.16.2
#
## WCOSS cray for WW3
module load gcc/4.9.2
Expand Down Expand Up @@ -58,14 +58,13 @@ module load udreg
module load ugni

module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
module load esmf/8.0.0
module load esmf/8.0.0_intel18

module swap pmi pmi/5.0.11

##
## load cmake
##
module load cmake/3.6.2
setenv CMAKE_C_COMPILER cc
setenv CMAKE_CXX_COMPILER CC
setenv CMAKE_Fortran_COMPILER ftn
Expand Down
10 changes: 10 additions & 0 deletions parm/ccpp_control.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,16 @@
nspinup = 1000
iseed_ca = 0
isppt_deep = .false.
do_RRTMGP = @[DO_RRTMGP]
active_gases = 'h2o_co2_o3_n2o_ch4_o2'
ngases = 6
lw_file_gas = 'rrtmgp-data-lw-g256-2018-12-04.nc'
lw_file_clouds = 'rrtmgp-cloud-optics-coeffs-lw.nc'
sw_file_gas = 'rrtmgp-data-sw-g224-2018-12-04.nc'
sw_file_clouds = 'rrtmgp-cloud-optics-coeffs-sw.nc'
rrtmgp_cld_optics = 0
rrtmgp_nrghice = 3
rrtmgp_ngauss_ang = 3
/

&interpolator_nml
Expand Down
1 change: 1 addition & 0 deletions tests/compile_cmake.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ if [[ "${MAKE_OPT}" == *"CCPP=Y"* ]]; then
)

# Read list of schemes, caps, and static API
source ${BUILD_DIR}/FV3/ccpp/physics/CCPP_TYPEDEFS.sh
source ${BUILD_DIR}/FV3/ccpp/physics/CCPP_SCHEMES.sh
source ${BUILD_DIR}/FV3/ccpp/physics/CCPP_CAPS.sh
source ${BUILD_DIR}/FV3/ccpp/physics/CCPP_STATIC_API.sh
Expand Down
3 changes: 3 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ export MAKE_NH=.T.
export MOUNTAIN=.F.
export NA_INIT=1

# Radiation
export DO_RRTMGP=.F.

# Microphysics
export IMP_PHYSICS=11
# GFDL MP
Expand Down
4 changes: 4 additions & 0 deletions tests/fv3_conf/ccpp_control_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ cp @[RTPWD]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
cp @[RTPWD]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
fi

if [ $DO_RRTMGP = .T. ]; then
cp @[RTPWD]/FV3_input_data_RRTMGP/* .
fi

cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml

# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh
Expand Down
29 changes: 16 additions & 13 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ RUN | fv3_rasmgshoc
RUN | fv3_csawmg3shoc127 | standard | | fv3 |
RUN | fv3_satmedmf | standard | | fv3 |
RUN | fv3_lheatstrg | standard | | fv3 |
RUN | fv3_gfsv16_csawmg | standard | | fv3 |
RUN | fv3_gfsv16_csawmg | standard | | fv3 |
RUN | fv3_gocart_clm | standard | | fv3 |
RUN | fv3_gfsv16_csawmgt | standard | | fv3 |
RUN | fv3_gfsv16_csawmgt | standard | | fv3 |

COMPILE | WW3=Y | standard | wcoss_cray | fv3 |
COMPILE | WW3=Y | standard | wcoss_dell_p3 | fv3 |
Expand Down Expand Up @@ -110,9 +110,9 @@ RUN | fv3_csawmgshoc
RUN | fv3_csawmg3shoc127 | standard | | fv3 |
RUN | fv3_csawmg | standard | | fv3 |
RUN | fv3_satmedmf | standard | | fv3 |
RUN | fv3_gfsv16_csawmg | standard | | fv3 |
RUN | fv3_gfsv16_csawmg | standard | | fv3 |
RUN | fv3_gocart_clm | standard | | fv3 |
RUN | fv3_gfsv16_csawmgt | standard | | fv3 |
RUN | fv3_gfsv16_csawmgt | standard | | fv3 |

COMPILE | REPRO=Y WW3=Y | standard | wcoss_cray | fv3 |
COMPILE | REPRO=Y WW3=Y | standard | wcoss_dell_p3 | fv3 |
Expand Down Expand Up @@ -379,19 +379,21 @@ RUN | fv3_ccpp_thompson_no_aero
# CCPP PROD tests #
#######################################################################################################################################################################################

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP | standard | hera.intel | fv3 |

RUN | fv3_ccpp_gfs_v15p2 | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta | standard | hera.intel | fv3 |
RUN | fv3_ccpp_rrtmgp | standard | hera.intel | fv3 |

#######################################################################################################################################################################################
# CCPP DEBUG tests #
#######################################################################################################################################################################################

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP DEBUG=Y | standard | hera.intel | fv3 |

RUN | fv3_ccpp_gfs_v15p2_debug | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_debug | standard | hera.intel | fv3 |
RUN | fv3_ccpp_rrtmgp_debug | standard | hera.intel | fv3 |

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | wcoss_cray | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | wcoss_dell_p3 | fv3 |
Expand All @@ -404,11 +406,11 @@ RUN | fv3_ccpp_thompson_debug
RUN | fv3_ccpp_thompson_no_aero_debug | standard | | fv3 |
#######################################################################################################################################################################################
#######################################################################################################################################################################################
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | wcoss_cray | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | wcoss_dell_p3 | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | gaea.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | jet.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | wcoss_cray | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | wcoss_dell_p3 | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | gaea.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v16_csawmg | standard | jet.intel | fv3 |

RUN | fv3_ccpp_gfsv16_csawmg | standard | | fv3 |
RUN | fv3_ccpp_gfsv16_csawmgt | standard | | fv3 |
Expand All @@ -419,16 +421,17 @@ COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | gaea.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | jet.intel | fv3 |

RUN | fv3_ccpp_gocart_clm | standard | | fv3 |
RUN | fv3_ccpp_gocart_clm | standard | | fv3 |

#######################################################################################################################################################################################
# CCPP REPRO tests #
#######################################################################################################################################################################################

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta REPRO=Y | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP REPRO=Y | standard | hera.intel | fv3 |

RUN | fv3_ccpp_gfs_v15p2 | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta | standard | hera.intel | fv3 |
RUN | fv3_ccpp_rrtmgp | standard | hera.intel | fv3 |

#######################################################################################################################################################################################
# IPD REPRO tests (verify against CCPP REPRO tests) #
Expand Down
49 changes: 26 additions & 23 deletions tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,18 @@ elif [[ $MACHINE_ID = hera.* ]]; then
QUEUE=debug
# ACCNR=fv3-cpu
PARTITION=
dprefix=/scratch1/NCEPDEV
DISKNM=$dprefix/nems/emc.nemspara/RT
STMP=$dprefix/stmp4
PTMP=$dprefix/stmp2
#
# DTC baseline
dprefix=/scratch1/BMC/gmtb
DISKNM=$dprefix/ufs-weather-model/RT
STMP=$dprefix
PTMP=$dprefix
# EMC baseline
#dprefix=/scratch1/NCEPDEV
#DISKNM=$dprefix/nems/emc.nemspara/RT
#STMP=$dprefix/stmp4
#PTMP=$dprefix/stmp2
#

SCHEDULER=slurm
cp fv3_conf/fv3_slurm.IN_hera fv3_conf/fv3_slurm.IN
Expand Down Expand Up @@ -274,7 +282,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
QUEUE=premium
PARTITION=
dprefix=/glade/scratch
DISKNM=/glade/p/ral/jntp/GMTB/NEMSfv3gfs/RT
DISKNM=/glade/p/ral/jntp/GMTB/ufs-weather-model/RT
STMP=$dprefix
PTMP=$dprefix
SCHEDULER=pbs
Expand Down Expand Up @@ -321,11 +329,6 @@ ECFLOW=false
KEEP_RUNDIR=false

TESTS_FILE='rt.conf'
# Switch to special regression test config on wcoss_cray:
# don't run the IPD and CCPP tests in REPRO mode.
if [[ $MACHINE_ID = wcoss_cray ]]; then
TESTS_FILE='rt_wcoss_cray.conf'
fi

SET_ID='standard'
while getopts ":cfsl:mkreh" opt; do
Expand Down Expand Up @@ -373,14 +376,21 @@ while getopts ":cfsl:mkreh" opt; do
esac
done

# Fix me - make those definitions and DISKNM consistent
if [[ $MACHINE_ID = hera.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200323/${COMPILER^^}}
elif [[ $MACHINE_ID = cheyenne.* ]]; then
RTPWD=${RTPWD:-$DISKNM/develop-20200323/${COMPILER^^}}
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = cheyenne.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/dtc-develop-20200413/${COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200323}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/dtc-develop-20200413}
fi
# DH* temporarily - remove before final merge to dtc/develop
## Fix me - make those definitions and DISKNM consistent
#if [[ $MACHINE_ID = hera.* ]]; then
# RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200323/${COMPILER^^}}
#elif [[ $MACHINE_ID = cheyenne.* ]]; then
# RTPWD=${RTPWD:-$DISKNM/develop-20200323/${COMPILER^^}}
#else
# RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200323}
#fi
# *DH

shift $((OPTIND-1))
[[ $# -gt 1 ]] && usage
Expand Down Expand Up @@ -644,13 +654,6 @@ while read -r line; do
RT_SUFFIX=${RT_SUFFIX:-""}
BL_SUFFIX=${BL_SUFFIX:-""}

if [[ $MACHINE_ID = wcoss_cray ]]; then
if [[ $RT_SUFFIX != "" || $BL_SUFFIX != "" ]]; then
# skip all REPRO and/or CCPP runs on wcoss_cray. FIXME
continue
fi
fi

if [[ $ROCOTO == true && $new_compile == true ]]; then
new_compile=false
in_metatask=true
Expand Down
Loading

0 comments on commit e7a7f23

Please sign in to comment.