-
Notifications
You must be signed in to change notification settings - Fork 250
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.
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
Compute petlist bounds for each subcomponent from number of tasks. Update CICE #1200
Compute petlist bounds for each subcomponent from number of tasks. Update CICE #1200
Conversation
Would it be possible to add some error checks to catch things like setting the TPN inconsistent with the available cpu/node count for a platform and the specified THRD variable? For example, in Jet
So the error check would be that 24 ne 12*3. |
If this is always the case, which means we'll never run more threads per node than number of available cores on that node, then we can simply recompute TPN for a given test (or a group of tests) from TPN on that machine and number of threads, for example
|
I think your solution would be better. But we don't currently have a variable for the TPN for each platform, do we? |
We do not have that. But we can add, for example:
|
I think that would be a good idea. I think automating the calculations where possible is a big plus. Thanks for doing this work. |
Should I try to change these two inconsistent cases on Jet? What should we use for cpl_c384 and cpl_bmrk_aero 12x2 or 8x3? |
This is just a guess, but I think Cheyenne is our next smallest machine, so I would go w/ the THRD=3 case (8x3), which is what cheyenne uses. |
We do not even run the tests that are using these inconsistent tasking on Jet (cpld_control_c384_p8/cpld_restart_c384_p8 and cpld_bmark_p8). Maybe that's why we never noticed it. |
We run those tests on jet only in the rt_weekly.conf. But it may explain why they were so slow that they needed to get moved to the weekly. |
cpld_bmark_p8 12 TPN x 2 THRD requires 151 nodes, 8 TPN x 3 THRD needs 50% more, 226 nodes. I submitted 8x3 first, job waited in a queue almost 2 hours when I killed it. Then submitted 12x2, it also waited about an hour but eventually finished. It took about 25 minutes. /lfs4/HFIP/h-nems/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_297473/cpld_bmark_p8 |
For thread test, are we using either INPES=INPES/THRD or JNPES=JNPES/THRD? Or are we keeping INPES and JNPES the same as in control test? Strictly speaking, the former is testing thread and decomposition. |
Is the question about this particular test (cpld_bmark_p8) or in general? |
One way to reduce the resource requirement for THRD test is to reduce the number of mpi domains. I think that's what we are doing currently for lots (if not all) of regression tests. Specifically, I was thinking that, if we do this for jet test, cpld_bmark_p8 8x3 may not take up as many nodes. Then, there's a general question of how we want to do THRD test (maybe not for this PR). |
Correct, uncoupled control/threading tests are configured so that approximately same resources are used for both. I'm not familiar with the actual purpose and the reasons why this test in configured as it is now. |
…ed by each component
ba89e33
to
c3b1e7d
Compare
chm_petlist_bounds="0 $((ATM_compute_tasks - 1))" | ||
|
||
# MED | ||
med_petlist_bounds="0 $((ATM_compute_tasks - 1))" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There seems to be an issue which Moorthi first raised for running the mediator on more than 300 tasks. He found the execution much slower when too many PEs were given to the MED. So we've been keeping the MED tasks = the smaller of the ATM tasks or 288 (pe list 0:287). Have you seen in your tests an impact on runtime when the MED is allowed the same number as ATM for the bmrk_aero, for example?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't look carefully at runtime of each test, but I ran full test on gaea, jet and wcoss yesterday and all tests finished successfully. Do you know which tests have MED tasks limited to a subset of ATM tasks? Does this slowdown happen only on particular machine or on all machines?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested on cheyenne.intel at 41bf709 and all tests passed. It doesn't seem the number of mediator tasks had any real impact. The three tests where I know we limit the MED tasks to <300 are cpld_bmark_p8, cpld_control_c384 and cpld_control_c192. They were all +/- 20s of the current wall clock times.
cpld test failed on CI. Looking into this. |
This PR breaks the ORT scripts (and thus CI). Looking into fixing this. |
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
Automated RT Failure Notification |
I don't see that the settings would have changed for either c384 test on Jet, but both failures are timeouts. |
The two failed tests are now using 2 threads (12 TPN), let me try to run tests using one thread. |
After changing number of threads to 1 for control_c384* tests on Jet, all tests passed (fe1b815). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@DusanJovic-NOAA Really appreciate these changes. Thanks.
commit b68ca32 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 16 15:09:15 2022 -0600 add tasking change for cheyenne commit 638880f Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 16 15:02:15 2022 -0600 cheyenne.intel bmark_p8 1315.299978s commit d565860 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 16 12:30:02 2022 -0600 cheyenne.intel bmark-p8 = 1567.611026s *cpld_control_c192 1342s commit b3930ed Author: Denise.Worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 21:37:24 2022 +0000 dell-p3 cpld_bmark_p8 wall time = 1180.752102 commit 9b7a8b2 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 16:26:50 2022 -0400 gaea bmark_p8 wall time = 1219.003796 commit 36d512c Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 18:31:52 2022 +0000 hera bmark_p8 test wall time = 1077.963755 commit cf8e0e2 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 17:45:06 2022 +0000 set testing values * let jet.intel run all tests * set tries to 1 commit ca61c7b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 13:42:08 2022 -0400 set resources for coupled tests * make all platforms use the same cpld resources * jet bmark_p8 uses special values; in testing the default values time out w/ about 30mins of forecast time remaining commit 78b9c28 Author: Denise.Worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 15:49:56 2022 +0000 update default vars for dell *rt_007_cpld_control_c192_p8.log:[0] The total amount of wall time = 1068.155437 *rt_009_cpld_bmark_p8.log:[0] The total amount of wall time = 1185.657834 commit 1a67517 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed May 11 22:38:28 2022 +0000 fix default tasks commit 5936b5a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed May 11 15:22:50 2022 -0400 update cpl_c192 for waves commit 9d6cf0d Merge: d74b9b6 b751b8d Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed May 11 12:25:00 2022 -0400 Merge branch 'ufs-community:develop' into feature/testrtchanges commit b751b8d Author: Grant Firl <grant.firl@noaa.gov> Date: Wed May 11 09:04:49 2022 -0400 NSSL ccpp-physics bugfixes and new ccpp-framework debugging feature (ufs-community#1202) commit d74b9b6 Merge: 4687e90 7a9a5f1 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue May 10 17:40:59 2022 -0400 Merge branch 'develop' into feature/testrtchanges commit 4687e90 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue May 10 17:05:20 2022 -0400 intermediate commit prior to merging task PR commit 7a9a5f1 Merge: 917f55d 38f4f6a Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue May 10 15:58:18 2022 -0400 Merge branch 'ufs-community:develop' into develop commit 38f4f6a Author: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com> Date: Tue May 10 15:55:57 2022 -0400 Compute petlist bounds for each subcomponent from number of tasks. Update CICE (ufs-community#1200) * Instead of specifying petlist bounds (lower and upper bound), compute them using the number of tasks for each component. The function that computes petlist bounds assumes that the mediator always runs on the same tasks as ATM component, and that the Chemistry component also always runs on the same tasks as ATM. * Update CICE submodule (@DeniseWorthen) Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> commit 9d4245e Merge: 6ddbe69 0ee3448 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue May 10 08:22:48 2022 -0400 Merge branch 'ufs-community:develop' into feature/testrtchanges commit 917f55d Merge: 29f451b 0ee3448 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon May 9 18:48:55 2022 -0400 Merge branch 'ufs-community:develop' into develop commit 6ddbe69 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat May 7 16:26:51 2022 -0600 modifcations and verify against baseline * using Jessica's mod_def inputs in WW3_input_data_20220418, all baselines pass except for multigrid * cheyenne.intel: control_c192 1250s, control_bmark_p8 1500s * remove cpl_c96 default vars; these are used in noaero test but are not needed commit 90cc6cf Merge: 02d8590 29f451b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat May 7 14:36:58 2022 -0400 Merge branch 'develop' into feature/testrtchanges commit 02d8590 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat May 7 14:33:36 2022 -0400 revert bmark p8 changes * need to remove bmark p8 from cheyenne.intel commit 29f451b Merge: 4f931a1 f09e45b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu May 5 08:23:50 2022 -0400 Merge branch 'ufs-community:develop' into develop commit b8e0d72 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 16:58:04 2022 +0000 update RUN_BEG placement so it catches the restart commit 5e7faae Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 10:35:52 2022 -0400 revert some changes * revert end-of-run restart variable * remove ice,cmeps restarts * make ww3 interval 1 hour commit 2a9dcad Merge: 474bcbb 26d410a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 10:20:48 2022 -0400 Merge branch 'feature/cmake_meshcapbuild' into feature/testrtchanges commit 474bcbb Merge: 06c66d3 5caf30e Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 10:16:49 2022 -0400 Merge branch 'develop' into feature/testrtchanges commit 06c66d3 Merge: c98ad6a 07edf4c Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon May 2 09:39:38 2022 -0400 Merge branch 'ufs-community:develop' into feature/testrtchanges commit c98ad6a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sun May 1 10:53:39 2022 -0400 update for rt tests * reduce c192 to 30h * implement 3/1/1 restart test for bmark_p8 commit 6aa5b9b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sun May 1 10:27:44 2022 -0400 reduce c192 test to 30hrs commit 32873d3 Merge: 185baae 8c2d904 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sun May 1 10:15:21 2022 -0400 Merge branch 'feature/cmake_meshcapbuild' into feature/testrtchanges commit 185baae Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 15:36:51 2022 -0400 revert change in the AERO_HISTORY.rc commit 29f00df Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 15:31:25 2022 -0400 update c192 tasking in default vars commit 815b342 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 30 13:29:44 2022 -0600 add gocart inst_aod file for comparison at hour 9 commit 835908a Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 13:49:22 2022 -0400 add harness to control gocart history freq commit e37f090 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 09:29:58 2022 -0400 add todos for c192 tasking on other platforms commit 9acc6f6 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 29 17:51:14 2022 -0400 update c192 resources for hera and orion commit f9e01d5 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue Mar 29 15:12:07 2022 -0600 update WW3 * all baselines pass using new state_getfldptr interface * bmark_p8 contrl 1478s commit ba78277 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat Mar 26 15:49:16 2022 -0600 all baselines pass w/ fix2d branch commit fa1adb1 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Fri Mar 25 13:40:22 2022 -0600 update rt.wave_aero commit a80e036 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 09:52:29 2022 -0400 remove unused tasking setups commit 3c5afe9 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 09:46:45 2022 -0400 remove unused or temporary files commit fea06b4 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Fri Mar 25 06:33:42 2022 -0600 all baselines pass on cheyenne.intel * gnu testing is incomplete * cpld_control_c192_p8: 1348s * cpld_bmark_p8: 1442s * cpld_debug_p8: 684s commit 07311e6 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 06:44:58 2022 -0400 clean up comment in tests commit d189746 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 06:42:09 2022 -0400 add waves to c192 tasking commit 6de5193 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu Mar 24 04:39:12 2022 -0600 add back diag_table setting for noaero commit 598f0ef Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu Mar 24 04:13:38 2022 -0600 fix field table for gnu noaero test commit c9355ee Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu Mar 24 04:52:44 2022 -0400 rename gnu test and fix rt_gnu.conf commit f5d2c76 Merge: 1ee194b 0453056 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu Mar 24 04:42:57 2022 -0400 Merge branch 'feature/testrtchanges' of https://github.com/DeniseWorthen/ufs-weather-model into feature/testrtchanges commit 1ee194b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu Mar 24 04:42:01 2022 -0400 temp clean up tasking all platforms; gnu noaero commit 0453056 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 19:04:32 2022 -0600 cpld bmark p8 verifies w/ restart * control: 1564s, restart: 732s commit bca776b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 16:04:03 2022 -0600 fix output hour for cpld_bmark_p8 wave files *cpld_bmark_p8 test : 1490s commit cc06f96 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 15:52:27 2022 -0400 fix cheyenne tasking (again) commit a35755f Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 15:31:24 2022 -0400 fix tasks for bmark p8 test; add restart test commit 6ec17f5 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 14:16:11 2022 -0400 update bmark_p8 with changes from c384_p8 commit da58007 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 12:07:47 2022 -0600 multigrid and debug pass tested and passed commit 8f1e9aa Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 08:56:56 2022 -0600 remove file from comparison list for multigrid test * multigrid writes 'pnt' file as X.pnt.points which conflicts with shel writing it as X.pnt.ww3. Tried setting 'points' in multi.inp to empty string but model would not run; so remove this file from comparison commit 43dff6d Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 09:43:48 2022 -0400 update CNTL_LIST names and add test for multigrid commit 48df133 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 07:36:59 2022 -0600 all baselines pass commit baca83b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 08:31:19 2022 -0400 rename tests * create remaining control (c96) tests for decomp etc but compare against existing baseline name (control_c96). * update rt.wave_aero for new tests commit 4583940 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 06:08:08 2022 -0600 all baselines pass commit 7f9e8d0 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 06:33:33 2022 -0400 modify default nems.configure * retain only two nems.configure for cpld model, one with aero as the default and noaero for the gnu jobs * x out cpld p7 tests since they will be removed commit 75817c1 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 06:15:00 2022 -0400 removed commented out variables commit 3e6ad70 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 04:05:38 2022 -0600 all baselines pass commit 0d8247f Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 15:45:00 2022 -0400 update default field_table commit ae77588 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 11:44:55 2022 -0400 update default vars * comment out settings in tests which are defaults commit f95a76a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue Mar 22 08:40:35 2022 -0600 update baseline/verify; all tests pass * comparison of gocart file turned off in cpld debug until I can create one at fhmax=3 * all baselines pass--dt_inner fix resolved gocart restart file failure? * c192 control test: 1350s * c384 control test: 1440s * c96 debug (all components): 684s commit 034ba19 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 08:00:14 2022 -0400 update tests * make more corrections and consistency mods commit 924aa7f Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 07:09:56 2022 -0400 reduce fhmax for cpld debug to 3 hours commit 32a947e Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 06:47:48 2022 -0400 reorder runseq to match dev commit 89b8071 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 06:38:11 2022 -0400 fix tests and re-order *fix dt_inner for c192 * re-order items in tests to make comparison more direct commit 38abb07 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue Mar 22 03:31:40 2022 -0600 update to staged baseline, temp rt.wave_aero file * all tests run to completion * c96 control: 410s, restart: 225s * c192 control: 1140s, restart: 733s * c384 control: 1140s, restart: 640s * c96 debug: 1080s * restart tests provisionally pass with the following * c96: ww3 restart fails comparison * c192, c384: gocart file fails comparison commit 032352b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 18:25:48 2022 -0400 update tasking on cheyenne, add p8 debug commit ca298e6 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 17:55:46 2022 -0400 try setting all 3 restart tests commit 7332dd2 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 17:03:37 2022 -0400 update c96 restart commit 4c33e79 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon Mar 21 14:59:27 2022 -0600 control_atmwav test reproduces baseline develop-20220318 commit 4ecebf7 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 16:45:16 2022 -0400 update c96 restart version commit 5d5cc01 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon Mar 21 14:36:32 2022 -0600 add multigrid=true for use by atmw commit 49c5c67 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon Mar 21 13:31:28 2022 -0600 add fix for debug compile and change input data commit f67c01e Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 11:57:32 2022 -0400 update c96p8 test on cheyenne with gocart
* Add ufs driver. Remove NEMS submodule. Update CMEPS. Update CDEPS. Feature/ort addition. (ufs-community#931) * Add UFS driver, a copy of two fortran files from the NEMS repository. Remove NEMS submodule. * Update CMEPS for current escomp/master. Implement the ability to write mediator history files for ATM on tiles rather than mesh * Update CDEPS component. The updated CDEPS includes code updates for GFS v16 data mode. * Operation requirement test (ORT) for: - cpld_control_p7 thread and decomposition tests - cpld_bmark_p7 thread and decomposition tests - Due to the wave component in these tests, restart and debug do not work Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: BinLi-NOAA <bin.li@noaa.gov> * fv3atm cap cleanup (ufs-community#954) FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies. * CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts (ufs-community#962) This PR contains code changes 1) to remove old comments in GFS_typedefs.F90, increase cloud cover for Thompson MP by passing convective cloud water mixing ratio to progcld6. 2) Updates for auto fixes Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> * ccpp-physics ufs-community#806, #807, ufs-community#813, and ort modifications (ufs-community#970) - CCPP Physics changes: see Wrapper for ccpp-physics ufs-community#806, #807, ufs-community#813, NOAA-EMC/fv3atm#447. - UFS weather model changes for ORT updates following changes in Fix Auto-RT on Gaea, Jet and Orion ufs-community#965 * Wrapper for ccpp-physics ufs-community#808 and 816 (roughness length over ice and NoahMP tsurf bugfix) (ufs-community#971) * update submodule pointer for regression testing for ccpp-physics ufs-community#808,816: roughness length over ice and NoahMP tsurf bugfix * Reduce time step from 600s to 450s for tests control_csawmg and control_csawmg_debug Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: climbfuji <dom.heinzeller@icloud.com> * Use 'model set run clock' routine in FV3 NUOPC cap. (ufs-community#967) * Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver. * Fix model_configure file for two tests to define `fhrot` parameter. * Revert iovr=4 (exponential cloud overlap method) in RRTMG (ufs-community#963) Revert/cleanup iovr=4 in RRTMG per developer's request. The current exponential cloud overlapping method used in RRTMG represents the method used in the pre-2018 operational HWRF model. * Add fhzero ort test (ufs-community#977) * Fhzero ORT applies to the two tests `control` and `control_p7` * Test can be run by invoking, for example, `./opnReqTest -n control -c fhz` * Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_weekly.conf and update MOM6 to main branch (20211220) (ufs-community#976) * add a new cdeps test using GFS data mode * update rt_weekly.conf to include cpld_bmark_p7_35d tests * update MOM6 Co-authored-by: jiandewang <jiande.wang@noaa.gov> * Bug fixes for WAM physics and regression tests, remove duplicate modules from ccpp-physics CMakeLists.txt (ufs-community#947) *adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended). * Update global inline post for outputting foundation temperature (ufs-community#968) Update upp submodule in fv3atm with latest UPP version for outputting foundation temperature and fixing land-sea mask issue in global inline post. * Regression test bug fixes for running on Jet or with Rocoto (ufs-community#981) * Bug fixes for running on jet or with rocoto 1. Correctly detect Jet when deciding build job runtimes 2. Do not delete out and err files in compile & test jobs 3. Correct dependencies for WW3 in Rocoto 4. Do not hard-code ACCNR to h-nems This PR also contains fv3/ccpp physics (CCPP PR#812) updates that implements a vertically-integrated formula to properly compute tracer column mass and ensure mass conservation for all tracers except TKE. See issue NCAR/ccpp-physics#811 for details * MYNN sfclay (RAP suite) restart reproducibility (ufs-community#984) *This PR turns on the rap_restart tests. Bit-for-bit reproducibility is achieved with the bug fixes for MYNN sfclay in the associated fv3atm and ccpp-physics PRs. * fixes on initializing snow over fractional ice and GFS_surface_composite and z0ice value change (ufs-community#996) * Radar-derived microphysics temperature tendencies similar to operational HRRR (ufs-community#986) This PR implements a feature of the operational HRRR, radar-derived microphysics temperature tendencies applied in the first N minutes of the forecast to improve clouds in the first few hours. Two regression tests are added. * Turn on CICE albedo use by ATM for coupled model; update Prototype test suite to initial P8 configuration; (ufs-community#944) * add updates for suites, tests for initial P8 configuration * add IOPT_SFC=3 as default; set IOPT_SFC=1 in p7 tests * change min_seaice to 1e-6; set to 1e-11 in p7 tests * set dddmp=0.1 in both P7 and P8. This matches the final P7 configuration. It will change P7 baselines. * set cdmbwd in both P7 and P8 to the final P7 configuration. (1.0,2.2,1.0,1.0) for all resolutions. It will change P7 baselines. * add dusan's ecflow fix for wcoss2 * update FV3 with Moorthis' snod fix * update rt_weekly to use p8 tests * change integration length to 5 days * Thompson MP cloud tuning (ufs-community#1005) * improves cloud fraction when using Thompson MP. See NCAR/ccpp-physics#809 for more details. * Add a new HAFS regression test with Thompson MP and GFDL surface layer schemes and Corrected S4 template regression testing job card (ufs-community#995) * Added a new regression test for HAFS. * Fixed the S4 RT template job card. Co-authored-by: David Huber <david.huber@noaa.gov> Co-authored-by: Bin Liu <Bin.Liu@noaa.gov> * CCPP: Update consistency checks and effective radii calculation for Thompson MP (ufs-community#1000) This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml. * Rremove nems_datm related code, update CDEPS, and remove run directories that are no longer needed by other tests (ufs-community#1008) * Add fhzero ort to coupled tests (ufs-community#1009) * Add fhz ort to cpld tests * Set ACCNR in rt.sh, not detect_machine.sh. Add some comments explaining where the variable should not be set or used. Co-authored-by: Samuel Trahan <Samuel.Trahan@noaa.gov> * Unified write_netcdf, add single file 'cubed_sphere_grid' output (ufs-community#1011) * Unify write_netcdf and write_netcdf_parallel modules. * Add support for writing 'cubed_sphere_grid' history files in a single netcdf file. * Change standard name and unit of CCPP error flag variable in CCPP framework and physics (ufs-community#1013) * updates the submodule pointers for fv3atm, ccpp-framework and ccpp-physics for: Change standard name and unit of CCPP error flag variable in CCPP framework and physics. * ESMF managed threading (ufs-community#1018) Add code updates to enable the ESMF managed threading in UFS. Co-authored-by: Gerhard Theurich <gerhard.j.theurich@noaa.gov > * sync-ww3 (ufs-community#1026) * sync with ww3 develop branch * Revisions to repair iovr=5 cloud overlap option (ufs-community#1025) * This PR addresses part 2 of issue ufs-community#748 to activate the exponential-random cloud overlap method (iovr=5) in RRTMG. RT tests were added for iovr=4 and iovr=5 options * change iovr to use the environment variable in control.nml.IN; modify all tests that use control.nml.IN to set env. var. iovr=3 (except for new tests); remove restart files from new tests * 2D decomposition on write grid, bug fix in FV3GFS_IO.F90, and quad precision in stochastic physics (ufs-community#1028) - The 2D decomposition is enabled on write grid component. - FV3atm PR NOAA-EMC/fv3atm#468 from @MicroTed - stochastic physics PR NOAA-PSL/stochastic_physics#53 from Dom. Co-authored-by: Ted Mansell <ted.mansell@noaa.gov> Co-authored-by: Dom Heinzeller <heinzell@ucar.edu> * Update CMEPS for wave coupling (ufs-community#1034) * add run phases to allow waves to run in the slow loop * re-order hafs wave test * update aliases in fd_nems.yaml * update CMEPS to prevent advertise conflicts when s2sw is still using connectors * add correct masking variables to hafs nems.configure files * 4DIAU bug fix when iau_filter_increments=T (ufs-community#990) * Add lsm_cold_start variable for RUC LSM SCM support and gwdps bugfix (combined) (ufs-community#1037) Co-authored-by: @SMoorthi-emc * Update esmf 821b04 (ufs-community#1041) * Update the version of ESMF library to 8.2.1b04 * Add the write group lon info for upp 2d decomposition test. * Multiple output (nested) grids from fv3atm (ufs-community#1044) Update fv3atm to support writing multiple history files for parent and nested domains. Nested HAFS regression tests were updated to write out history files from all nested domains. Co-authored-by: Bin Liu <bin.liu@noaa.gov> * GPU-enabled version of Grell-Freitas convection in ccpp-physics (ufs-community#1043) * Enable Thompson microphysics with UFS-Aerosols and update GOCART (ufs-community#1049) This update allows the Thompson microphysics scheme to be used with prognostic aerosols (UFS-Aerosols) and updates GOCART to version 2.0.2. * Add support for Stochastically Perturbed Parameterizations (SPP) in FV3 (ufs-community#982) * Update CICE; add support for restart test when running single RT (was PR 1058); update MOM6 (was PR 1060) (ufs-community#1045) * update cice * (1) pointing MOM6 to testing branch (MOM6 main repo PR: mom-ocean/MOM6#1556 (comment)) (2) add three new files in mom_cmake file core/MOM_porous_barriers.F90 external/drifters/MOM_particles.F90 external/drifters/MOM_particles_types.F90 (3) explicitly set in MOM_input for all resolutions to reflect the default value changes in code to retain answer EPBL_MLD_BISECTION = True (default changed from T to F in this MOM6 PR) INTERNAL_WAVE_SPEED_BETTER_EST = False (default changed from F to T in this MOM6 PR) note BBL_USE_EOS now set to use the value of USE_EOS in this MOM6 PR, but we set BBL_USE_EOS explicit so it has no impact * remove duplicated CHL input setting in MOM_input_template_050 * add support for restart tests while running single RT * lateral boundary fix for regional runs (ufs-community#1050) This PR fixes a transient increase in noise caused by incorrect processing of winds along the lateral boundary on the final acoustic time step before fresh boundary information is ingested into the model. * Feature: NSSL Microphysics support (ufs-community#1032) * add new RT that uses NSSL MP; add new NSSL vars to default_vars.sh and rap.nml.IN; add new field table for using NSSL MP with hail on * p8b (with aerosols) (ufs-community#1071) updates all p8 tests to the p8b settings, which includes GOCART Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> * Split CCPP finalize into physics_finalize and (framework) finalize, fix CCPP's metadata2html.py (ufs-community#1061) * add a cdeps test using GFSv16 input data (ufs-community#1070) * CMAKE for WW3 (ufs-community#1089) * Use WW3 CMake build Co-authored-by: kgerheiser <kgerheiser@icloud.com> * Add 'valid time' variable using ISO string format (ufs-community#1073) * Require cmake version 3.19 * Update FV3: - Add 'valid time' variable using ISO string format to netcdf history files. - Use double precision variable to set value of 'time' attribute in wrt comp import state - Update ccpp/physics (setting surface-related interstitial variables for SCM prescribed-surface-flux mode) - Update inline_post_stub.F90 subroutine interfaces to match inline_post.F90 * Add hi-res regional test on small domain (ufs-community#1084) * Add hi-res regional test on small domain * Fix Lambert Conformal Conic mapping in the write component on the southern hemisphere (ufs-community#1087) * Subroutine `lambert` in the FV3 write component has been fixed to do the mapping on the southern hemisphere correctly. * CI fix - Docker container library updated. CI input data updated. Add chm_petlist_bounds. - Change gocart output file name for debug test - Changes for opnReqTest to also scan rt_gnu.conf - Change CI tests to noaero Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> * Rectify total number of Thompson MP species and add UFS-Aerosols to S2S and S2SW (ufs-community#1118) * Rectify total number of Thompson MP species * Implement S2SWA/S2SA build app as the only one enabling prognostic aerosols in fully coupled model. * Update output_fh documentation. * Add a cdeps test and update mom6, fv3, and weekly tests (ufs-community#1136) Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com> Co-authored-by: DusanJovic-NOAA <dusan.jovic@noaa.gov> * update submodule pointer for fv3atm * Update fms to 2021.04 (ufs-community#1135) * Update fms to 2021.04 * Add RT for ocean IAU * Update documentation Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> * land surface upgrades for p8 (ufs-community#1095) * reset the Noah-MP default options for those well tested * P8c: Added capability for cdmbgwd(1) to scale GSL blocking drag (ufs-community#1110) * Update ESMF to version 8.3.0bs09 (ufs-community#1146) * Update ESMF to version 8.3.0b09 * Increase wall clock limit for tests/regional_3km to 15 min * Update AutoRT to use tfe01 ecflow node on Jet * Updated Cheyenne baseline epicufsrt path * Updated Cheyenne epicufsrt hpc-stack build Co-authored-by: JONG KIM <jong.kim@noaa.gov> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> * Update rrfs conus regression tests to compute fluxes. * Remove nst_anl and a comment from the rrfs_conus13km_hrrr.nml.IN namelist template * release/p8c: updated the TKE-EDMF PBL and saSAS cumulus scheme plus bug fix for the Thompson scheme (issue ufs-community#881) (ufs-community#1120) * release/p8c: it is related to ccpp-physics PBL and cumulus updates plus a bug fix to the Thompson scheme * Bring AQM model into UFS & Update MOM6 mixed FMS (ufs-community#1137) * Add AQM submodule to integrate NOAA's Air Quality Model embedding the U.S. EPA Community Multiscale Air Quality Model (CMAQ). * MOM6: An alternate fix to class(*) issues with FMS 2022-01 Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Co-authored-by: jiandewang <jiande.wang@noaa.gov> * Radiation changes for prototype 8 (ufs-community#1090) * New feature in RRTMGP enabled ccpp-physics. * Updated physics. New FV3 interstitials. * Cleanup of RRTMGP regression tests. * Replaced cld_mynn_ naming convention with cld_pbl_ * Some more cleanup of cloud-fraction... * Pulled in Qingfu's changes to ccpp-physics * New RT's for RRTMGP p8. Revert change in ccpp-physics * Changed arguments to implied shape. in ccpp-physics * Updated RRTMGP regression tests * Changes to FV3/ccpp-physics. * RRTMGP RT cleanup, again. Bug-fix in FV3/ccpp-physics * Revert changes to names in FV3/ccpp-physics * Cleanup p8 tests. * More RT cleanup for p8. * Add GP setting to non-coupled p8 tests. * Added bounding to temperature at layer-interface used by RRTMGP. * Reorder loop * Combined gp sw and lw aerosol routines. Modest speedup (~4%). Add GP setting to test setup. * Add GP settings to cpld_control_c96_noaero_p8 test. * update test resources default_vars.sh * HAFS moving-nesting related developments (ufs-community#1104) * Add the storm-following or specified moving-nesting capability for both the regional and global configuration. * Expand the UFS/HAFS FV3ATM-HYCOM ocean coupling to support the static and moving nesting configuration. * Expand the write grid component to support outputting the moving nest domain properly. * Five HAFS related moving-nesting regression tests are added to test these newly added features. The regional_hafs RT was removed. Co-authored-by: Daniel Rosen <daniel.rosen@noaa.gov> Co-authored-by: Ufuk Turuncoglu <ufuk.turuncoglu@noaa.gov> Co-authored-by: uturuncoglu <turuncu@ucar.edu> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> Co-authored-by: William Ramstrom <William.Ramstrom@noaa.gov> Co-authored-by: A-Kyle <kyle.ahern@noaa.gov> * fv3atm: Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from ccpp_types; contains bug fix for WW3 debug (ufs-community#1130) Co-authored-by: Jessica Meixner <Jessica.Meixner@noaa.gov> * Close MOM6 1deg at j=1; Update input-data for P8c (ufs-community#909) * update all tests using 1deg MOM6/CICE6 * pre-pend ufs to existing topo edits filename when creating the new file * update input-data directory * Fix uninitialized min_rand variable in Thompson MP when using SPP (ufs-community#1152) * Updates to stochastic_physics and fv3 and CI * A bug fix for wet scavenging of aerosols and a minor modification for moisture property calculation (ufs-community#1176) * point to one_scheme_to_one_file PR branch (ufs-community#1175) * merge ufs-community develop * Point to gsl/merge-develop for FV3 * Changes missing from prior commit * use community version of hafs_regional_atm * merge rt.sh changes * Point to gsl/merge-develop-to-community branch for FV3 * Revert gsl-specific changes to rt.sh * Corrections to prior merge * corrections to FV3_HRRR tests * Add rrfs_smoke_conus13km_hrrr_warm test * Add FV3_HRRR_smoke to rt builds * Correct nst and domains_stack_size in rrfs_conus13km_hrrr.nml.IN * Set SFCLAY_COMPUTE_FLUX=.true. for rrfs_smoke tests * hera.gnu tests passed * Hera BUILD_WALLTIME of 1 hour due to occasional extreme contention for intel licenses * hera intel tests passed * Jet tests passed * Revert gsl-specific change to rt.sh * Point FV3/.gitmodules to Sam's fork * Correct issues found by reviewers in ccpp-physics and fv3atm * Rename mynnpbl to mynnedmf in fv3atm and ccpp-physics * FV3: Remove some empty _init and _finalize routines and update a comment in sgscloud_radpre * Feature/lndp noahmp2 : add land perturbation scheme for Noah-MP fractional veg (ufs-community#1143) Updates to allow land perturbation scheme to be applied for Noah-MP. Currently, for Noah-MP model parameters can perturb only vegetation fraction. Main code changes: -added lsm_noahmp model option to lndp_type==2 land perturbation scheme (fv3-atm, stochastic_physics) -updated comments -cleaned up the namelists to make the different options clearer. Removed misleading lndp_each_step variable from gfs_physics_nml, and replaced it with "lndp_model_type" in the nam_sfcperts namelist for the different forecast types (cycling DA, short forecasts, perturbing only initial conditions) (fv3-atm, stochastic_physics, ufs-weather-model) NOTE: see note below, re: specification of smc perturbation for RAP/HRRR/etc (lndp_model_type==2) -revised code in stochastic_physics_wrapper to only allocate arrays that will be used when passed into lndp_apply_perts (fv3-atm) -deleted unused albedo arrays in stochastic_physics_wrapper and lndp_apply_perts (fv3-atm, stochastic_physics) -fixed bug causing precision errors when calculating the soil moisture ice content (often ~0.0; stochastic_physics) -fixed bug in which lndp_apply_perts wasn't called for nscyc = 0. (fv3-atm) -increased max_nvar_lndp at Jeff Ator's request (fv3-atm) -added a new test for the Noah-MP and lndp==2 combination (ufs-weather-model) * Add \file to smoke files * Update CDEPS component, add hailcast code in FV3/atmos_cubed_sphere and reduce wall clock time used for the cpld_control_c192_p8 test on Jet (ufs-community#1156) Co-authored-by: Yunheng Wang * Update CMEPS; Add gocart userguide (was ufs-community#1182) (ufs-community#1189) * Update CMEPS submodule * Add GOCART documentation Co-authored-by: Li Pan <Li.Pan@noaa.gov> * Combine PROD and REPRO build options into 'Release' build type (ufs-community#1171) Combined PROD and REPRO build modes into 'Release' build type. Now only 'Debug' and 'Release' build type are supported. Both build types must produce bit-for-bit reproducible outputs using different number of threads, mpi tasks, different domain decomposition, have reproducible restarts etc. * Unify inline post interfaces (ufs-community#1181) * replace pwatclm to pwat in the all diag tables under tests/parm/diag_table. * adding bug fix from jili dong and removing U* averaging * adding bug fix from jili dong and removing U* averaging * Hera tests passed. * Remove some commented-out code from cu_gf_driver in ccpp-physics. * In FV3, turn rrtmg smoke band 10 into a model namelist variable * Switch ccpp-physics smoke arguments to implied shape * Remove some stops and gotos from ccpp-physics rrfs-smoke * In FV3, remove some hard-coded constants and rename some meta entries * In FV3, rename some standard_names, change a unit, and remove a "use physcons" * Updated settings for NoahMP, Thompson and RRTMGP in RTs (ufs-community#1196) * add NoahMP opt_trs to namelist * Updated namelist settings related to NoahMP scheme, Thompson scheme and RRTMGP (issue ufs-community#1173 and ufs-community#1185) * Updated some namelist settings and add/remove some RTs related to RRTMGP * Compute petlist bounds for each subcomponent from number of tasks. Update CICE (ufs-community#1200) * Instead of specifying petlist bounds (lower and upper bound), compute them using the number of tasks for each component. The function that computes petlist bounds assumes that the mediator always runs on the same tasks as ATM component, and that the Chemistry component also always runs on the same tasks as ATM. * Update CICE submodule (@DeniseWorthen) Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> * NSSL ccpp-physics bugfixes and new ccpp-framework debugging feature (ufs-community#1202) * Merge develop * hera.gnu tests passed * hera.intel tests passed * jet intel tests passed * hera.gnu tests passed. * fv3atm: Only add cnv_3d_ud_mf to the restart files when needed * More warnings not to change the conus13km tests * adjust BL_DATE in rt.sh to 20220516 * WCOSS Cray tests passed * fv3atm: pass some chemistry varibles to mynn_bl_driver correctly * [AutoRT] hera.gnu Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] hera.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] cheyenne.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * WCOSS Dell P3 tests passed * Correct argument passing within mynn edmf * [AutoRT] gaea.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] cheyenne.gnu Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * Orion RT Passed * [AutoRT] jet.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * Point to NOAA-EMC develop for FV3 * merge gsl institutional fork (ufs-community#1195) Merge in GSL institutional fork. * update FV3 to top of gsl/merge-community-to-develop * FV3: point to sam's repo * Point to GSL baseline areas * FV3/ccpp/physics: Change to GSL CODEOWNERS * hera.gnu tests passed * hera.intel passed * jet.intel tests passed * Set regression test path to GSL areas on Hera * FV3: Returned the comments on soil resistance back. Co-authored-by: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com> Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: BinLi-NOAA <bin.li@noaa.gov> Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> Co-authored-by: Grant Firl <grant.firl@noaa.gov> Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: mzhangw <mzhangw@gmail.com> Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com> Co-authored-by: SMoorthi-emc <47667426+SMoorthi-emc@users.noreply.github.com> Co-authored-by: ChunxiZhang-NOAA <49283036+ChunxiZhang-NOAA@users.noreply.github.com> Co-authored-by: David Huber <david.huber@noaa.gov> Co-authored-by: Bin Liu <Bin.Liu@noaa.gov> Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Co-authored-by: Gerhard Theurich <gerhard.j.theurich@noaa.gov > Co-authored-by: Ali.Abdolali <37336972+aliabdolali@users.noreply.github.com> Co-authored-by: Ted Mansell <ted.mansell@noaa.gov> Co-authored-by: Dom Heinzeller <heinzell@ucar.edu> Co-authored-by: Jeff Whitaker <jswhit@fastmail.fm> Co-authored-by: DomHeinzeller <58610420+DomHeinzeller@users.noreply.github.com> Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Co-authored-by: JeffBeck-NOAA <55201531+JeffBeck-NOAA@users.noreply.github.com> Co-authored-by: MatthewPyle-NOAA <48285220+MatthewPyle-NOAA@users.noreply.github.com> Co-authored-by: Jessica Meixner <jessica.meixner@noaa.gov> Co-authored-by: kgerheiser <kgerheiser@icloud.com> Co-authored-by: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Co-authored-by: joeolson42 <Joseph.B.Olson@noaa.gov> Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: HelinWei-NOAA <48133472+HelinWei-NOAA@users.noreply.github.com> Co-authored-by: mdtoyNOAA <73618848+mdtoyNOAA@users.noreply.github.com> Co-authored-by: JONG KIM <jong.kim@noaa.gov> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> Co-authored-by: Brian Curtis <64433609+BrianCurtis-NOAA@users.noreply.github.com> Co-authored-by: dustinswales <dustin.swales@noaa.gov> Co-authored-by: Daniel Rosen <daniel.rosen@noaa.gov> Co-authored-by: Ufuk Turuncoglu <ufuk.turuncoglu@noaa.gov> Co-authored-by: uturuncoglu <turuncu@ucar.edu> Co-authored-by: William Ramstrom <William.Ramstrom@noaa.gov> Co-authored-by: A-Kyle <kyle.ahern@noaa.gov> Co-authored-by: ClaraDraper-NOAA <33430543+ClaraDraper-NOAA@users.noreply.github.com> Co-authored-by: Li Pan <Li.Pan@noaa.gov>
* Add ufs driver. Remove NEMS submodule. Update CMEPS. Update CDEPS. Feature/ort addition. (#931) * Add UFS driver, a copy of two fortran files from the NEMS repository. Remove NEMS submodule. * Update CMEPS for current escomp/master. Implement the ability to write mediator history files for ATM on tiles rather than mesh * Update CDEPS component. The updated CDEPS includes code updates for GFS v16 data mode. * Operation requirement test (ORT) for: - cpld_control_p7 thread and decomposition tests - cpld_bmark_p7 thread and decomposition tests - Due to the wave component in these tests, restart and debug do not work Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: BinLi-NOAA <bin.li@noaa.gov> * fv3atm cap cleanup (#954) FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies. * CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts (#962) This PR contains code changes 1) to remove old comments in GFS_typedefs.F90, increase cloud cover for Thompson MP by passing convective cloud water mixing ratio to progcld6. 2) Updates for auto fixes Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> * ccpp-physics #806, #807, #813, and ort modifications (#970) - CCPP Physics changes: see Wrapper for ccpp-physics #806, #807, #813, NOAA-EMC/fv3atm#447. - UFS weather model changes for ORT updates following changes in Fix Auto-RT on Gaea, Jet and Orion #965 * Wrapper for ccpp-physics #808 and 816 (roughness length over ice and NoahMP tsurf bugfix) (#971) * update submodule pointer for regression testing for ccpp-physics #808,816: roughness length over ice and NoahMP tsurf bugfix * Reduce time step from 600s to 450s for tests control_csawmg and control_csawmg_debug Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: climbfuji <dom.heinzeller@icloud.com> * Use 'model set run clock' routine in FV3 NUOPC cap. (#967) * Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver. * Fix model_configure file for two tests to define `fhrot` parameter. * Revert iovr=4 (exponential cloud overlap method) in RRTMG (#963) Revert/cleanup iovr=4 in RRTMG per developer's request. The current exponential cloud overlapping method used in RRTMG represents the method used in the pre-2018 operational HWRF model. * Add fhzero ort test (#977) * Fhzero ORT applies to the two tests `control` and `control_p7` * Test can be run by invoking, for example, `./opnReqTest -n control -c fhz` * Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_weekly.conf and update MOM6 to main branch (20211220) (#976) * add a new cdeps test using GFS data mode * update rt_weekly.conf to include cpld_bmark_p7_35d tests * update MOM6 Co-authored-by: jiandewang <jiande.wang@noaa.gov> * Bug fixes for WAM physics and regression tests, remove duplicate modules from ccpp-physics CMakeLists.txt (#947) *adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended). * Update global inline post for outputting foundation temperature (#968) Update upp submodule in fv3atm with latest UPP version for outputting foundation temperature and fixing land-sea mask issue in global inline post. * Regression test bug fixes for running on Jet or with Rocoto (#981) * Bug fixes for running on jet or with rocoto 1. Correctly detect Jet when deciding build job runtimes 2. Do not delete out and err files in compile & test jobs 3. Correct dependencies for WW3 in Rocoto 4. Do not hard-code ACCNR to h-nems This PR also contains fv3/ccpp physics (CCPP PR#812) updates that implements a vertically-integrated formula to properly compute tracer column mass and ensure mass conservation for all tracers except TKE. See issue NCAR/ccpp-physics#811 for details * MYNN sfclay (RAP suite) restart reproducibility (#984) *This PR turns on the rap_restart tests. Bit-for-bit reproducibility is achieved with the bug fixes for MYNN sfclay in the associated fv3atm and ccpp-physics PRs. * fixes on initializing snow over fractional ice and GFS_surface_composite and z0ice value change (#996) * Radar-derived microphysics temperature tendencies similar to operational HRRR (#986) This PR implements a feature of the operational HRRR, radar-derived microphysics temperature tendencies applied in the first N minutes of the forecast to improve clouds in the first few hours. Two regression tests are added. * Turn on CICE albedo use by ATM for coupled model; update Prototype test suite to initial P8 configuration; (#944) * add updates for suites, tests for initial P8 configuration * add IOPT_SFC=3 as default; set IOPT_SFC=1 in p7 tests * change min_seaice to 1e-6; set to 1e-11 in p7 tests * set dddmp=0.1 in both P7 and P8. This matches the final P7 configuration. It will change P7 baselines. * set cdmbwd in both P7 and P8 to the final P7 configuration. (1.0,2.2,1.0,1.0) for all resolutions. It will change P7 baselines. * add dusan's ecflow fix for wcoss2 * update FV3 with Moorthis' snod fix * update rt_weekly to use p8 tests * change integration length to 5 days * Thompson MP cloud tuning (#1005) * improves cloud fraction when using Thompson MP. See NCAR/ccpp-physics#809 for more details. * Add a new HAFS regression test with Thompson MP and GFDL surface layer schemes and Corrected S4 template regression testing job card (#995) * Added a new regression test for HAFS. * Fixed the S4 RT template job card. Co-authored-by: David Huber <david.huber@noaa.gov> Co-authored-by: Bin Liu <Bin.Liu@noaa.gov> * CCPP: Update consistency checks and effective radii calculation for Thompson MP (#1000) This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml. * Rremove nems_datm related code, update CDEPS, and remove run directories that are no longer needed by other tests (#1008) * Add fhzero ort to coupled tests (#1009) * Add fhz ort to cpld tests * Set ACCNR in rt.sh, not detect_machine.sh. Add some comments explaining where the variable should not be set or used. Co-authored-by: Samuel Trahan <Samuel.Trahan@noaa.gov> * Unified write_netcdf, add single file 'cubed_sphere_grid' output (#1011) * Unify write_netcdf and write_netcdf_parallel modules. * Add support for writing 'cubed_sphere_grid' history files in a single netcdf file. * Change standard name and unit of CCPP error flag variable in CCPP framework and physics (#1013) * updates the submodule pointers for fv3atm, ccpp-framework and ccpp-physics for: Change standard name and unit of CCPP error flag variable in CCPP framework and physics. * ESMF managed threading (#1018) Add code updates to enable the ESMF managed threading in UFS. Co-authored-by: Gerhard Theurich <gerhard.j.theurich@noaa.gov > * sync-ww3 (#1026) * sync with ww3 develop branch * Revisions to repair iovr=5 cloud overlap option (#1025) * This PR addresses part 2 of issue #748 to activate the exponential-random cloud overlap method (iovr=5) in RRTMG. RT tests were added for iovr=4 and iovr=5 options * change iovr to use the environment variable in control.nml.IN; modify all tests that use control.nml.IN to set env. var. iovr=3 (except for new tests); remove restart files from new tests * 2D decomposition on write grid, bug fix in FV3GFS_IO.F90, and quad precision in stochastic physics (#1028) - The 2D decomposition is enabled on write grid component. - FV3atm PR NOAA-EMC/fv3atm#468 from @MicroTed - stochastic physics PR noaa-psd/stochastic_physics#53 from Dom. Co-authored-by: Ted Mansell <ted.mansell@noaa.gov> Co-authored-by: Dom Heinzeller <heinzell@ucar.edu> * Update CMEPS for wave coupling (#1034) * add run phases to allow waves to run in the slow loop * re-order hafs wave test * update aliases in fd_nems.yaml * update CMEPS to prevent advertise conflicts when s2sw is still using connectors * add correct masking variables to hafs nems.configure files * 4DIAU bug fix when iau_filter_increments=T (#990) * Add lsm_cold_start variable for RUC LSM SCM support and gwdps bugfix (combined) (#1037) Co-authored-by: @SMoorthi-emc * Update esmf 821b04 (#1041) * Update the version of ESMF library to 8.2.1b04 * Add the write group lon info for upp 2d decomposition test. * Multiple output (nested) grids from fv3atm (#1044) Update fv3atm to support writing multiple history files for parent and nested domains. Nested HAFS regression tests were updated to write out history files from all nested domains. Co-authored-by: Bin Liu <bin.liu@noaa.gov> * GPU-enabled version of Grell-Freitas convection in ccpp-physics (#1043) * Enable Thompson microphysics with UFS-Aerosols and update GOCART (#1049) This update allows the Thompson microphysics scheme to be used with prognostic aerosols (UFS-Aerosols) and updates GOCART to version 2.0.2. * Add support for Stochastically Perturbed Parameterizations (SPP) in FV3 (#982) * Update CICE; add support for restart test when running single RT (was PR 1058); update MOM6 (was PR 1060) (#1045) * update cice * (1) pointing MOM6 to testing branch (MOM6 main repo PR: https://github.com/mom-ocean/MOM6/pull/1556#issuecomment-1043374317) (2) add three new files in mom_cmake file core/MOM_porous_barriers.F90 external/drifters/MOM_particles.F90 external/drifters/MOM_particles_types.F90 (3) explicitly set in MOM_input for all resolutions to reflect the default value changes in code to retain answer EPBL_MLD_BISECTION = True (default changed from T to F in this MOM6 PR) INTERNAL_WAVE_SPEED_BETTER_EST = False (default changed from F to T in this MOM6 PR) note BBL_USE_EOS now set to use the value of USE_EOS in this MOM6 PR, but we set BBL_USE_EOS explicit so it has no impact * remove duplicated CHL input setting in MOM_input_template_050 * add support for restart tests while running single RT * lateral boundary fix for regional runs (#1050) This PR fixes a transient increase in noise caused by incorrect processing of winds along the lateral boundary on the final acoustic time step before fresh boundary information is ingested into the model. * Feature: NSSL Microphysics support (#1032) * add new RT that uses NSSL MP; add new NSSL vars to default_vars.sh and rap.nml.IN; add new field table for using NSSL MP with hail on * Merge ufs-community develop into gsl/develop (#119) * Add ufs driver. Remove NEMS submodule. Update CMEPS. Update CDEPS. Feature/ort addition. (#931) * Add UFS driver, a copy of two fortran files from the NEMS repository. Remove NEMS submodule. * Update CMEPS for current escomp/master. Implement the ability to write mediator history files for ATM on tiles rather than mesh * Update CDEPS component. The updated CDEPS includes code updates for GFS v16 data mode. * Operation requirement test (ORT) for: - cpld_control_p7 thread and decomposition tests - cpld_bmark_p7 thread and decomposition tests - Due to the wave component in these tests, restart and debug do not work Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: BinLi-NOAA <bin.li@noaa.gov> * fv3atm cap cleanup (#954) FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies. * CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts (#962) This PR contains code changes 1) to remove old comments in GFS_typedefs.F90, increase cloud cover for Thompson MP by passing convective cloud water mixing ratio to progcld6. 2) Updates for auto fixes Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> * ccpp-physics #806, #807, #813, and ort modifications (#970) - CCPP Physics changes: see Wrapper for ccpp-physics #806, #807, #813, NOAA-EMC/fv3atm#447. - UFS weather model changes for ORT updates following changes in Fix Auto-RT on Gaea, Jet and Orion #965 * Wrapper for ccpp-physics #808 and 816 (roughness length over ice and NoahMP tsurf bugfix) (#971) * update submodule pointer for regression testing for ccpp-physics #808,816: roughness length over ice and NoahMP tsurf bugfix * Reduce time step from 600s to 450s for tests control_csawmg and control_csawmg_debug Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: climbfuji <dom.heinzeller@icloud.com> * Use 'model set run clock' routine in FV3 NUOPC cap. (#967) * Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver. * Fix model_configure file for two tests to define `fhrot` parameter. * Revert iovr=4 (exponential cloud overlap method) in RRTMG (#963) Revert/cleanup iovr=4 in RRTMG per developer's request. The current exponential cloud overlapping method used in RRTMG represents the method used in the pre-2018 operational HWRF model. * Add fhzero ort test (#977) * Fhzero ORT applies to the two tests `control` and `control_p7` * Test can be run by invoking, for example, `./opnReqTest -n control -c fhz` * Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_weekly.conf and update MOM6 to main branch (20211220) (#976) * add a new cdeps test using GFS data mode * update rt_weekly.conf to include cpld_bmark_p7_35d tests * update MOM6 Co-authored-by: jiandewang <jiande.wang@noaa.gov> * Bug fixes for WAM physics and regression tests, remove duplicate modules from ccpp-physics CMakeLists.txt (#947) *adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended). * Update global inline post for outputting foundation temperature (#968) Update upp submodule in fv3atm with latest UPP version for outputting foundation temperature and fixing land-sea mask issue in global inline post. * Regression test bug fixes for running on Jet or with Rocoto (#981) * Bug fixes for running on jet or with rocoto 1. Correctly detect Jet when deciding build job runtimes 2. Do not delete out and err files in compile & test jobs 3. Correct dependencies for WW3 in Rocoto 4. Do not hard-code ACCNR to h-nems This PR also contains fv3/ccpp physics (CCPP PR#812) updates that implements a vertically-integrated formula to properly compute tracer column mass and ensure mass conservation for all tracers except TKE. See issue NCAR/ccpp-physics#811 for details * MYNN sfclay (RAP suite) restart reproducibility (#984) *This PR turns on the rap_restart tests. Bit-for-bit reproducibility is achieved with the bug fixes for MYNN sfclay in the associated fv3atm and ccpp-physics PRs. * fixes on initializing snow over fractional ice and GFS_surface_composite and z0ice value change (#996) * Radar-derived microphysics temperature tendencies similar to operational HRRR (#986) This PR implements a feature of the operational HRRR, radar-derived microphysics temperature tendencies applied in the first N minutes of the forecast to improve clouds in the first few hours. Two regression tests are added. * Turn on CICE albedo use by ATM for coupled model; update Prototype test suite to initial P8 configuration; (#944) * add updates for suites, tests for initial P8 configuration * add IOPT_SFC=3 as default; set IOPT_SFC=1 in p7 tests * change min_seaice to 1e-6; set to 1e-11 in p7 tests * set dddmp=0.1 in both P7 and P8. This matches the final P7 configuration. It will change P7 baselines. * set cdmbwd in both P7 and P8 to the final P7 configuration. (1.0,2.2,1.0,1.0) for all resolutions. It will change P7 baselines. * add dusan's ecflow fix for wcoss2 * update FV3 with Moorthis' snod fix * update rt_weekly to use p8 tests * change integration length to 5 days * Thompson MP cloud tuning (#1005) * improves cloud fraction when using Thompson MP. See NCAR/ccpp-physics#809 for more details. * Add a new HAFS regression test with Thompson MP and GFDL surface layer schemes and Corrected S4 template regression testing job card (#995) * Added a new regression test for HAFS. * Fixed the S4 RT template job card. Co-authored-by: David Huber <david.huber@noaa.gov> Co-authored-by: Bin Liu <Bin.Liu@noaa.gov> * CCPP: Update consistency checks and effective radii calculation for Thompson MP (#1000) This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml. * Rremove nems_datm related code, update CDEPS, and remove run directories that are no longer needed by other tests (#1008) * Add fhzero ort to coupled tests (#1009) * Add fhz ort to cpld tests * Set ACCNR in rt.sh, not detect_machine.sh. Add some comments explaining where the variable should not be set or used. Co-authored-by: Samuel Trahan <Samuel.Trahan@noaa.gov> * Unified write_netcdf, add single file 'cubed_sphere_grid' output (#1011) * Unify write_netcdf and write_netcdf_parallel modules. * Add support for writing 'cubed_sphere_grid' history files in a single netcdf file. * Change standard name and unit of CCPP error flag variable in CCPP framework and physics (#1013) * updates the submodule pointers for fv3atm, ccpp-framework and ccpp-physics for: Change standard name and unit of CCPP error flag variable in CCPP framework and physics. * ESMF managed threading (#1018) Add code updates to enable the ESMF managed threading in UFS. Co-authored-by: Gerhard Theurich <gerhard.j.theurich@noaa.gov > * sync-ww3 (#1026) * sync with ww3 develop branch * Revisions to repair iovr=5 cloud overlap option (#1025) * This PR addresses part 2 of issue #748 to activate the exponential-random cloud overlap method (iovr=5) in RRTMG. RT tests were added for iovr=4 and iovr=5 options * change iovr to use the environment variable in control.nml.IN; modify all tests that use control.nml.IN to set env. var. iovr=3 (except for new tests); remove restart files from new tests * 2D decomposition on write grid, bug fix in FV3GFS_IO.F90, and quad precision in stochastic physics (#1028) - The 2D decomposition is enabled on write grid component. - FV3atm PR NOAA-EMC/fv3atm#468 from @MicroTed - stochastic physics PR noaa-psd/stochastic_physics#53 from Dom. Co-authored-by: Ted Mansell <ted.mansell@noaa.gov> Co-authored-by: Dom Heinzeller <heinzell@ucar.edu> * Update CMEPS for wave coupling (#1034) * add run phases to allow waves to run in the slow loop * re-order hafs wave test * update aliases in fd_nems.yaml * update CMEPS to prevent advertise conflicts when s2sw is still using connectors * add correct masking variables to hafs nems.configure files * 4DIAU bug fix when iau_filter_increments=T (#990) * Add lsm_cold_start variable for RUC LSM SCM support and gwdps bugfix (combined) (#1037) Co-authored-by: @SMoorthi-emc * Update esmf 821b04 (#1041) * Update the version of ESMF library to 8.2.1b04 * Add the write group lon info for upp 2d decomposition test. * Multiple output (nested) grids from fv3atm (#1044) Update fv3atm to support writing multiple history files for parent and nested domains. Nested HAFS regression tests were updated to write out history files from all nested domains. Co-authored-by: Bin Liu <bin.liu@noaa.gov> * GPU-enabled version of Grell-Freitas convection in ccpp-physics (#1043) * Enable Thompson microphysics with UFS-Aerosols and update GOCART (#1049) This update allows the Thompson microphysics scheme to be used with prognostic aerosols (UFS-Aerosols) and updates GOCART to version 2.0.2. * Add support for Stochastically Perturbed Parameterizations (SPP) in FV3 (#982) * Update CICE; add support for restart test when running single RT (was PR 1058); update MOM6 (was PR 1060) (#1045) * update cice * (1) pointing MOM6 to testing branch (MOM6 main repo PR: https://github.com/mom-ocean/MOM6/pull/1556#issuecomment-1043374317) (2) add three new files in mom_cmake file core/MOM_porous_barriers.F90 external/drifters/MOM_particles.F90 external/drifters/MOM_particles_types.F90 (3) explicitly set in MOM_input for all resolutions to reflect the default value changes in code to retain answer EPBL_MLD_BISECTION = True (default changed from T to F in this MOM6 PR) INTERNAL_WAVE_SPEED_BETTER_EST = False (default changed from F to T in this MOM6 PR) note BBL_USE_EOS now set to use the value of USE_EOS in this MOM6 PR, but we set BBL_USE_EOS explicit so it has no impact * remove duplicated CHL input setting in MOM_input_template_050 * add support for restart tests while running single RT * lateral boundary fix for regional runs (#1050) This PR fixes a transient increase in noise caused by incorrect processing of winds along the lateral boundary on the final acoustic time step before fresh boundary information is ingested into the model. * Update pointer to FV3 * Point to Christina's branches. * Update RT log for Hera Intel. * Adding RT log for Hera GNU tests. * Updating RT log for Jet Intel tests. * Latest regression tests on Jet. * Adding regression logs. * Updating regression test date stamp. * Point to GSL repositories for FV3 and FV3/ccpp/physics Co-authored-by: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com> Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: BinLi-NOAA <bin.li@noaa.gov> Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> Co-authored-by: Grant Firl <grant.firl@noaa.gov> Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: mzhangw <mzhangw@gmail.com> Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com> Co-authored-by: Samuel Trahan (NOAA contractor) <39415369+SamuelTrahanNOAA@users.noreply.github.com> Co-authored-by: SMoorthi-emc <47667426+SMoorthi-emc@users.noreply.github.com> Co-authored-by: ChunxiZhang-NOAA <49283036+ChunxiZhang-NOAA@users.noreply.github.com> Co-authored-by: David Huber <david.huber@noaa.gov> Co-authored-by: Bin Liu <Bin.Liu@noaa.gov> Co-authored-by: Samuel Trahan <Samuel.Trahan@noaa.gov> Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Co-authored-by: Gerhard Theurich <gerhard.j.theurich@noaa.gov > Co-authored-by: Ali.Abdolali <37336972+aliabdolali@users.noreply.github.com> Co-authored-by: Ted Mansell <ted.mansell@noaa.gov> Co-authored-by: Dom Heinzeller <heinzell@ucar.edu> Co-authored-by: Jeff Whitaker <jswhit@fastmail.fm> Co-authored-by: DomHeinzeller <58610420+DomHeinzeller@users.noreply.github.com> Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Co-authored-by: JeffBeck-NOAA <55201531+JeffBeck-NOAA@users.noreply.github.com> Co-authored-by: MatthewPyle-NOAA <48285220+MatthewPyle-NOAA@users.noreply.github.com> * Remove GF Consistency Check & Add SDFs - V2 (#120) * - Removes consistency check in GF, allows GF to run with different or no shallow scheme - Add additional RAP based SDF * - Add regression test logs * jet intel test * point to gsl/develop for FV3 Co-authored-by: Samuel Trahan <Samuel.Trahan@noaa.gov> * p8b (with aerosols) (#1071) updates all p8 tests to the p8b settings, which includes GOCART Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> * Update to top of FV3 to get latest ccpp-physics codeowners (#123) * Split CCPP finalize into physics_finalize and (framework) finalize, fix CCPP's metadata2html.py (#1061) * add a cdeps test using GFSv16 input data (#1070) * CMAKE for WW3 (#1089) * Use WW3 CMake build Co-authored-by: kgerheiser <kgerheiser@icloud.com> * Add 'valid time' variable using ISO string format (#1073) * Require cmake version 3.19 * Update FV3: - Add 'valid time' variable using ISO string format to netcdf history files. - Use double precision variable to set value of 'time' attribute in wrt comp import state - Update ccpp/physics (setting surface-related interstitial variables for SCM prescribed-surface-flux mode) - Update inline_post_stub.F90 subroutine interfaces to match inline_post.F90 * Add hi-res regional test on small domain (#1084) * Add hi-res regional test on small domain * Fix Lambert Conformal Conic mapping in the write component on the southern hemisphere (#1087) * Subroutine `lambert` in the FV3 write component has been fixed to do the mapping on the southern hemisphere correctly. * CI fix - Docker container library updated. CI input data updated. Add chm_petlist_bounds. - Change gocart output file name for debug test - Changes for opnReqTest to also scan rt_gnu.conf - Change CI tests to noaero Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> * Rectify total number of Thompson MP species and add UFS-Aerosols to S2S and S2SW (#1118) * Rectify total number of Thompson MP species * Implement S2SWA/S2SA build app as the only one enabling prognostic aerosols in fully coupled model. * Update output_fh documentation. * Add a cdeps test and update mom6, fv3, and weekly tests (#1136) Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com> Co-authored-by: DusanJovic-NOAA <dusan.jovic@noaa.gov> * Updates to the MYNN-EDMF (#129) * update submodule pointer for fv3atm * Fault tolerance in rt.sh usage of rocoto. * Update baseline date. * Bug fixes to rocoto changes. * Hera gnu tests passed. * Sleep 60 seconds betwen calls to rocotorun to avoid seeing submitted jobs in an inconsistent state when the batch scheduler is overwhelmed. * Hera intel tests passed. * Jet intel tests passed. * Corrections to Rocoto reliability changes * Point to gsl/develop for FV3 Co-authored-by: samuel.trahan <Samuel.Trahan@noaa.gov> * GWD, LSM and MYNN physics updates from RRFS_dev branch (#130) * GWD, LSM and MYNN physics updates from RRFS_dev branch * Temporary push to fork for transfer to Jet. * Added regression test logs required for PR * Reverting back to original rt.sh * hera.gnu tests passed * Jet intel tests passed. * Hera intel tests passed * Point to gsl/develop for FV3 Co-authored-by: samuel.trahan <Samuel.Trahan@noaa.gov> * update submodule pointer for fv3atm * Update fms to 2021.04 (#1135) * Update fms to 2021.04 * Add RT for ocean IAU * Update documentation Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> * Point to top of gsl/develop for ccpp-physics * land surface upgrades for p8 (#1095) * reset the Noah-MP default options for those well tested * P8c: Added capability for cdmbgwd(1) to scale GSL blocking drag (#1110) * Update ESMF to version 8.3.0bs09 (#1146) * Update ESMF to version 8.3.0b09 * Increase wall clock limit for tests/regional_3km to 15 min * Update AutoRT to use tfe01 ecflow node on Jet * Updated Cheyenne baseline epicufsrt path * Updated Cheyenne epicufsrt hpc-stack build Co-authored-by: JONG KIM <jong.kim@noaa.gov> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> * Update rrfs conus regression tests to compute fluxes. * Remove nst_anl and a comment from the rrfs_conus13km_hrrr.nml.IN namelist template * release/p8c: updated the TKE-EDMF PBL and saSAS cumulus scheme plus bug fix for the Thompson scheme (issue #881) (#1120) * release/p8c: it is related to ccpp-physics PBL and cumulus updates plus a bug fix to the Thompson scheme * Bring AQM model into UFS & Update MOM6 mixed FMS (#1137) * Add AQM submodule to integrate NOAA's Air Quality Model embedding the U.S. EPA Community Multiscale Air Quality Model (CMAQ). * MOM6: An alternate fix to class(*) issues with FMS 2022-01 Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Co-authored-by: jiandewang <jiande.wang@noaa.gov> * Radiation changes for prototype 8 (#1090) * New feature in RRTMGP enabled ccpp-physics. * Updated physics. New FV3 interstitials. * Cleanup of RRTMGP regression tests. * Replaced cld_mynn_ naming convention with cld_pbl_ * Some more cleanup of cloud-fraction... * Pulled in Qingfu's changes to ccpp-physics * New RT's for RRTMGP p8. Revert change in ccpp-physics * Changed arguments to implied shape. in ccpp-physics * Updated RRTMGP regression tests * Changes to FV3/ccpp-physics. * RRTMGP RT cleanup, again. Bug-fix in FV3/ccpp-physics * Revert changes to names in FV3/ccpp-physics * Cleanup p8 tests. * More RT cleanup for p8. * Add GP setting to non-coupled p8 tests. * Added bounding to temperature at layer-interface used by RRTMGP. * Reorder loop * Combined gp sw and lw aerosol routines. Modest speedup (~4%). Add GP setting to test setup. * Add GP settings to cpld_control_c96_noaero_p8 test. * update test resources default_vars.sh * HAFS moving-nesting related developments (#1104) * Add the storm-following or specified moving-nesting capability for both the regional and global configuration. * Expand the UFS/HAFS FV3ATM-HYCOM ocean coupling to support the static and moving nesting configuration. * Expand the write grid component to support outputting the moving nest domain properly. * Five HAFS related moving-nesting regression tests are added to test these newly added features. The regional_hafs RT was removed. Co-authored-by: Daniel Rosen <daniel.rosen@noaa.gov> Co-authored-by: Ufuk Turuncoglu <ufuk.turuncoglu@noaa.gov> Co-authored-by: uturuncoglu <turuncu@ucar.edu> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> Co-authored-by: William Ramstrom <William.Ramstrom@noaa.gov> Co-authored-by: A-Kyle <kyle.ahern@noaa.gov> * fv3atm: Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from ccpp_types; contains bug fix for WW3 debug (#1130) Co-authored-by: Jessica Meixner <Jessica.Meixner@noaa.gov> * Close MOM6 1deg at j=1; Update input-data for P8c (#909) * update all tests using 1deg MOM6/CICE6 * pre-pend ufs to existing topo edits filename when creating the new file * update input-data directory * Fix uninitialized min_rand variable in Thompson MP when using SPP (#1152) * Updates to stochastic_physics and fv3 and CI * Add RRFS-Smoke and regression tests. * "update .gitmodules to point to the gsl/develop-smoke" * "push tests/tests/rrfs_smoke_conus13km_hrrr_warm" * Point to gsl/develop-smoke for ccpp-physics * "update .gitmodules" * "point to gsl/develop-smoke branch" * "point to gsl/develop-smoke with active flag updates" * "upload the hera.intel and hera.gnu regression test log files" * Add the rrfs_smoke_conus13km_hrrr_warm regression test. * Remove an extra read that went out of bounds * hera.gnu tests passed * hera.intel tests passed * jet.intel tests passed * Point to gsl/develop for FV3 * Point .gitmodules to NOAA-GSL Co-authored-by: samuel.trahan <Samuel.Trahan@noaa.gov> * A bug fix for wet scavenging of aerosols and a minor modification for moisture property calculation (#1176) * point to one_scheme_to_one_file PR branch (#1175) * merge ufs-community develop * Point to gsl/merge-develop for FV3 * Changes missing from prior commit * use community version of hafs_regional_atm * merge rt.sh changes * Point to gsl/merge-develop-to-community branch for FV3 * Revert gsl-specific changes to rt.sh * Corrections to prior merge * corrections to FV3_HRRR tests * Add rrfs_smoke_conus13km_hrrr_warm test * Add FV3_HRRR_smoke to rt builds * Correct nst and domains_stack_size in rrfs_conus13km_hrrr.nml.IN * Set SFCLAY_COMPUTE_FLUX=.true. for rrfs_smoke tests * hera.gnu tests passed * Hera BUILD_WALLTIME of 1 hour due to occasional extreme contention for intel licenses * hera intel tests passed * Jet tests passed * Revert gsl-specific change to rt.sh * Point FV3/.gitmodules to Sam's fork * Correct issues found by reviewers in ccpp-physics and fv3atm * Rename mynnpbl to mynnedmf in fv3atm and ccpp-physics * FV3: Remove some empty _init and _finalize routines and update a comment in sgscloud_radpre * Feature/lndp noahmp2 : add land perturbation scheme for Noah-MP fractional veg (#1143) Updates to allow land perturbation scheme to be applied for Noah-MP. Currently, for Noah-MP model parameters can perturb only vegetation fraction. Main code changes: -added lsm_noahmp model option to lndp_type==2 land perturbation scheme (fv3-atm, stochastic_physics) -updated comments -cleaned up the namelists to make the different options clearer. Removed misleading lndp_each_step variable from gfs_physics_nml, and replaced it with "lndp_model_type" in the nam_sfcperts namelist for the different forecast types (cycling DA, short forecasts, perturbing only initial conditions) (fv3-atm, stochastic_physics, ufs-weather-model) NOTE: see note below, re: specification of smc perturbation for RAP/HRRR/etc (lndp_model_type==2) -revised code in stochastic_physics_wrapper to only allocate arrays that will be used when passed into lndp_apply_perts (fv3-atm) -deleted unused albedo arrays in stochastic_physics_wrapper and lndp_apply_perts (fv3-atm, stochastic_physics) -fixed bug causing precision errors when calculating the soil moisture ice content (often ~0.0; stochastic_physics) -fixed bug in which lndp_apply_perts wasn't called for nscyc = 0. (fv3-atm) -increased max_nvar_lndp at Jeff Ator's request (fv3-atm) -added a new test for the Noah-MP and lndp==2 combination (ufs-weather-model) * Add \file to smoke files * Update CDEPS component, add hailcast code in FV3/atmos_cubed_sphere and reduce wall clock time used for the cpld_control_c192_p8 test on Jet (#1156) Co-authored-by: Yunheng Wang * Update CMEPS; Add gocart userguide (was #1182) (#1189) * Update CMEPS submodule * Add GOCART documentation Co-authored-by: Li Pan <Li.Pan@noaa.gov> * Combine PROD and REPRO build options into 'Release' build type (#1171) Combined PROD and REPRO build modes into 'Release' build type. Now only 'Debug' and 'Release' build type are supported. Both build types must produce bit-for-bit reproducible outputs using different number of threads, mpi tasks, different domain decomposition, have reproducible restarts etc. * Unify inline post interfaces (#1181) * replace pwatclm to pwat in the all diag tables under tests/parm/diag_table. * adding bug fix from jili dong and removing U* averaging * adding bug fix from jili dong and removing U* averaging * Hera tests passed. * Remove some commented-out code from cu_gf_driver in ccpp-physics. * In FV3, turn rrtmg smoke band 10 into a model namelist variable * Switch ccpp-physics smoke arguments to implied shape * Remove some stops and gotos from ccpp-physics rrfs-smoke * In FV3, remove some hard-coded constants and rename some meta entries * In FV3, rename some standard_names, change a unit, and remove a "use physcons" * Updated settings for NoahMP, Thompson and RRTMGP in RTs (#1196) * add NoahMP opt_trs to namelist * Updated namelist settings related to NoahMP scheme, Thompson scheme and RRTMGP (issue #1173 and #1185) * Updated some namelist settings and add/remove some RTs related to RRTMGP * Compute petlist bounds for each subcomponent from number of tasks. Update CICE (#1200) * Instead of specifying petlist bounds (lower and upper bound), compute them using the number of tasks for each component. The function that computes petlist bounds assumes that the mediator always runs on the same tasks as ATM component, and that the Chemistry component also always runs on the same tasks as ATM. * Update CICE submodule (@DeniseWorthen) Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> * NSSL ccpp-physics bugfixes and new ccpp-framework debugging feature (#1202) * Merge develop * hera.gnu tests passed * hera.intel tests passed * jet intel tests passed * hera.gnu tests passed. * fv3atm: Only add cnv_3d_ud_mf to the restart files when needed * More warnings not to change the conus13km tests * adjust BL_DATE in rt.sh to 20220516 * WCOSS Cray tests passed * fv3atm: pass some chemistry varibles to mynn_bl_driver correctly * [AutoRT] hera.gnu Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] hera.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] cheyenne.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * WCOSS Dell P3 tests passed * Correct argument passing within mynn edmf * [AutoRT] gaea.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] cheyenne.gnu Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * Orion RT Passed * [AutoRT] jet.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * Point to NOAA-EMC develop for FV3 * merge gsl institutional fork (#1195) Merge in GSL institutional fork. * update FV3 to top of gsl/merge-community-to-develop * FV3: point to sam's repo * Point to GSL baseline areas * FV3/ccpp/physics: Change to GSL CODEOWNERS * hera.gnu tests passed * hera.intel passed * jet.intel tests passed * Set regression test path to GSL areas on Hera * FV3: Returned the comments on soil resistance back. * point to gsl/develop for fv3atm * Merge May 16 ufs-community develop to gsl/develop (#138) * Add ufs driver. Remove NEMS submodule. Update CMEPS. Update CDEPS. Feature/ort addition. (#931) * Add UFS driver, a copy of two fortran files from the NEMS repository. Remove NEMS submodule. * Update CMEPS for current escomp/master. Implement the ability to write mediator history files for ATM on tiles rather than mesh * Update CDEPS component. The updated CDEPS includes code updates for GFS v16 data mode. * Operation requirement test (ORT) for: - cpld_control_p7 thread and decomposition tests - cpld_bmark_p7 thread and decomposition tests - Due to the wave component in these tests, restart and debug do not work Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: BinLi-NOAA <bin.li@noaa.gov> * fv3atm cap cleanup (#954) FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies. * CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts (#962) This PR contains code changes 1) to remove old comments in GFS_typedefs.F90, increase cloud cover for Thompson MP by passing convective cloud water mixing ratio to progcld6. 2) Updates for auto fixes Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> * ccpp-physics #806, #807, #813, and ort modifications (#970) - CCPP Physics changes: see Wrapper for ccpp-physics #806, #807, #813, NOAA-EMC/fv3atm#447. - UFS weather model changes for ORT updates following changes in Fix Auto-RT on Gaea, Jet and Orion #965 * Wrapper for ccpp-physics #808 and 816 (roughness length over ice and NoahMP tsurf bugfix) (#971) * update submodule pointer for regression testing for ccpp-physics #808,816: roughness length over ice and NoahMP tsurf bugfix * Reduce time step from 600s to 450s for tests control_csawmg and control_csawmg_debug Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: climbfuji <dom.heinzeller@icloud.com> * Use 'model set run clock' routine in FV3 NUOPC cap. (#967) * Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver. * Fix model_configure file for two tests to define `fhrot` parameter. * Revert iovr=4 (exponential cloud overlap method) in RRTMG (#963) Revert/cleanup iovr=4 in RRTMG per developer's request. The current exponential cloud overlapping method used in RRTMG represents the method used in the pre-2018 operational HWRF model. * Add fhzero ort test (#977) * Fhzero ORT applies to the two tests `control` and `control_p7` * Test can be run by invoking, for example, `./opnReqTest -n control -c fhz` * Add a new CDEPS test to use GSFv16 data mode in CDEPS ,update rt_weekly.conf and update MOM6 to main branch (20211220) (#976) * add a new cdeps test using GFS data mode * update rt_weekly.conf to include cpld_bmark_p7_35d tests * update MOM6 Co-authored-by: jiandewang <jiande.wang@noaa.gov> * Bug fixes for WAM physics and regression tests, remove duplicate modules from ccpp-physics CMakeLists.txt (#947) *adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended). * Update global inline post for outputting foundation temperature (#968) Update upp submodule in fv3atm with latest UPP version for outputting foundation temperature and fixing land-sea mask issue in global inline post. * Regression test bug fixes for running on Jet or with Rocoto (#981) * Bug fixes for running on jet or with rocoto 1. Correctly detect Jet when deciding build job runtimes 2. Do not delete out and err files in compile & test jobs 3. Correct dependencies for WW3 in Rocoto 4. Do not hard-code ACCNR to h-nems This PR also contains fv3/ccpp physics (CCPP PR#812) updates that implements a vertically-integrated formula to properly compute tracer column mass and ensure mass conservation for all tracers except TKE. See issue NCAR/ccpp-physics#811 for details * MYNN sfclay (RAP suite) restart reproducibility (#984) *This PR turns on the rap_restart tests. Bit-for-bit reproducibility is achieved with the bug fixes for MYNN sfclay in the associated fv3atm and ccpp-physics PRs. * fixes on initializing snow over fractional ice and GFS_surface_composite and z0ice value change (#996) * Radar-derived microphysics temperature tendencies similar to operational HRRR (#986) This PR implements a feature of the operational HRRR, radar-derived microphysics temperature tendencies applied in the first N minutes of the forecast to improve clouds in the first few hours. Two regression tests are added. * Turn on CICE albedo use by ATM for coupled model; update Prototype test suite to initial P8 configuration; (#944) * add updates for suites, tests for initial P8 configuration * add IOPT_SFC=3 as default; set IOPT_SFC=1 in p7 tests * change min_seaice to 1e-6; set to 1e-11 in p7 tests * set dddmp=0.1 in both P7 and P8. This matches the final P7 configuration. It will change P7 baselines. * set cdmbwd in both P7 and P8 to the final P7 configuration. (1.0,2.2,1.0,1.0) for all resolutions. It will change P7 baselines. * add dusan's ecflow fix for wcoss2 * update FV3 with Moorthis' snod fix * update rt_weekly to use p8 tests * change integration length to 5 days * Thompson MP cloud tuning (#1005) * improves cloud fraction when using Thompson MP. See NCAR/ccpp-physics#809 for more details. * Add a new HAFS regression test with Thompson MP and GFDL surface layer schemes and Corrected S4 template regression testing job card (#995) * Added a new regression test for HAFS. * Fixed the S4 RT template job card. Co-authored-by: David Huber <david.huber@noaa.gov> Co-authored-by: Bin Liu <Bin.Liu@noaa.gov> * CCPP: Update consistency checks and effective radii calculation for Thompson MP (#1000) This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml. * Rremove nems_datm related code, update CDEPS, and remove run directories that are no longer needed by other tests (#1008) * Add fhzero ort to coupled tests (#1009) * Add fhz ort to cpld tests * Set ACCNR in rt.sh, not detect_machine.sh. Add some comments explaining where the variable should not be set or used. Co-authored-by: Samuel Trahan <Samuel.Trahan@noaa.gov> * Unified write_netcdf, add single file 'cubed_sphere_grid' output (#1011) * Unify write_netcdf and write_netcdf_parallel modules. * Add support for writing 'cubed_sphere_grid' history files in a single netcdf file. * Change standard name and unit of CCPP error flag variable in CCPP framework and physics (#1013) * updates the submodule pointers for fv3atm, ccpp-framework and ccpp-physics for: Change standard name and unit of CCPP error flag variable in CCPP framework and physics. * ESMF managed threading (#1018) Add code updates to enable the ESMF managed threading in UFS. Co-authored-by: Gerhard Theurich <gerhard.j.theurich@noaa.gov > * sync-ww3 (#1026) * sync with ww3 develop branch * Revisions to repair iovr=5 cloud overlap option (#1025) * This PR addresses part 2 of issue #748 to activate the exponential-random cloud overlap method (iovr=5) in RRTMG. RT tests were added for iovr=4 and iovr=5 options * change iovr to use the environment variable in control.nml.IN; modify all tests that use control.nml.IN to set env. var. iovr=3 (except for new tests); remove restart files from new tests * 2D decomposition on write grid, bug fix in FV3GFS_IO.F90, and quad precision in stochastic physics (#1028) - The 2D decomposition is enabled on write grid component. - FV3atm PR NOAA-EMC/fv3atm#468 from @MicroTed - stochastic physics PR noaa-psd/stochastic_physics#53 from Dom. Co-authored-by: Ted Mansell <ted.mansell@noaa.gov> Co-authored-by: Dom Heinzeller <heinzell@ucar.edu> * Update CMEPS for wave coupling (#1034) * add run phases to allow waves to run in the slow loop * re-order hafs wave test * update aliases in fd_nems.yaml * update CMEPS to prevent advertise conflicts when s2sw is still using connectors * add correct masking variables to hafs nems.configure files * 4DIAU bug fix when iau_filter_increments=T (#990) * Add lsm_cold_start variable for RUC LSM SCM support and gwdps bugfix (combined) (#1037) Co-authored-by: @SMoorthi-emc * Update esmf 821b04 (#1041) * Update the version of ESMF library to 8.2.1b04 * Add the write group lon info for upp 2d decomposition test. * Multiple output (nested) grids from fv3atm (#1044) Update fv3atm to support writing multiple history files for parent and nested domains. Nested HAFS regression tests were updated to write out history files from all nested domains. Co-authored-by: Bin Liu <bin.liu@noaa.gov> * GPU-enabled version of Grell-Freitas convection in ccpp-physics (#1043) * Enable Thompson microphysics with UFS-Aerosols and update GOCART (#1049) This update allows the Thompson microphysics scheme to be used with prognostic aerosols (UFS-Aerosols) and updates GOCART to version 2.0.2. * Add support for Stochastically Perturbed Parameterizations (SPP) in FV3 (#982) * Update CICE; add support for restart test when running single RT (was PR 1058); update MOM6 (was PR 1060) (#1045) * update cice * (1) pointing MOM6 to testing branch (MOM6 main repo PR: https://github.com/mom-ocean/MOM6/pull/1556#issuecomment-1043374317) (2) add three new files in mom_cmake file core/MOM_porous_barriers.F90 external/drifters/MOM_particles.F90 external/drifters/MOM_particles_types.F90 (3) explicitly set in MOM_input for all resolutions to reflect the default value changes in code to retain answer EPBL_MLD_BISECTION = True (default changed from T to F in this MOM6 PR) INTERNAL_WAVE_SPEED_BETTER_EST = False (default changed from F to T in this MOM6 PR) note BBL_USE_EOS now set to use the value of USE_EOS in this MOM6 PR, but we set BBL_USE_EOS explicit so it has no impact * remove duplicated CHL input setting in MOM_input_template_050 * add support for restart tests while running single RT * lateral boundary fix for regional runs (#1050) This PR fixes a transient increase in noise caused by incorrect processing of winds along the lateral boundary on the final acoustic time step before fresh boundary information is ingested into the model. * Feature: NSSL Microphysics support (#1032) * add new RT that uses NSSL MP; add new NSSL vars to default_vars.sh and rap.nml.IN; add new field table for using NSSL MP with hail on * p8b (with aerosols) (#1071) updates all p8 tests to the p8b settings, which includes GOCART Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> * Split CCPP finalize into physics_finalize and (framework) finalize, fix CCPP's metadata2html.py (#1061) * add a cdeps test using GFSv16 input data (#1070) * CMAKE for WW3 (#1089) * Use WW3 CMake build Co-authored-by: kgerheiser <kgerheiser@icloud.com> * Add 'valid time' variable using ISO string format (#1073) * Require cmake version 3.19 * Update FV3: - Add 'valid time' variable using ISO string format to netcdf history files. - Use double precision variable to set value of 'time' attribute in wrt comp import state - Update ccpp/physics (setting surface-related interstitial variables for SCM prescribed-surface-flux mode) - Update inline_post_stub.F90 subroutine interfaces to match inline_post.F90 * Add hi-res regional test on small domain (#1084) * Add hi-res regional test on small domain * Fix Lambert Conformal Conic mapping in the write component on the southern hemisphere (#1087) * Subroutine `lambert` in the FV3 write component has been fixed to do the mapping on the southern hemisphere correctly. * CI fix - Docker container library updated. CI input data updated. Add chm_petlist_bounds. - Change gocart output file name for debug test - Changes for opnReqTest to also scan rt_gnu.conf - Change CI tests to noaero Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> * Rectify total number of Thompson MP species and add UFS-Aerosols to S2S and S2SW (#1118) * Rectify total number of Thompson MP species * Implement S2SWA/S2SA build app as the only one enabling prognostic aerosols in fully coupled model. * Update output_fh documentation. * Add a cdeps test and update mom6, fv3, and weekly tests (#1136) Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com> Co-authored-by: DusanJovic-NOAA <dusan.jovic@noaa.gov> * update submodule pointer for fv3atm * Update fms to 2021.04 (#1135) * Update fms to 2021.04 * Add RT for ocean IAU * Update documentation Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> * land surface upgrades for p8 (#1095) * reset the Noah-MP default options for those well tested * P8c: Added capability for cdmbgwd(1) to scale GSL blocking drag (#1110) * Update ESMF to version 8.3.0bs09 (#1146) * Update ESMF to version 8.3.0b09 * Increase wall clock limit for tests/regional_3km to 15 min * Update AutoRT to use tfe01 ecflow node on Jet * Updated Cheyenne baseline epicufsrt path * Updated Cheyenne epicufsrt hpc-stack build Co-authored-by: JONG KIM <jong.kim@noaa.gov> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> * Update rrfs conus regression tests to compute fluxes. * Remove nst_anl and a comment from the rrfs_conus13km_hrrr.nml.IN namelist template * release/p8c: updated the TKE-EDMF PBL and saSAS cumulus scheme plus bug fix for the Thompson scheme (issue #881) (#1120) * release/p8c: it is related to ccpp-physics PBL and cumulus updates plus a bug fix to the Thompson scheme * Bring AQM model into UFS & Update MOM6 mixed FMS (#1137) * Add AQM submodule to integrate NOAA's Air Quality Model embedding the U.S. EPA Community Multiscale Air Quality Model (CMAQ). * MOM6: An alternate fix to class(*) issues with FMS 2022-01 Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Co-authored-by: jiandewang <jiande.wang@noaa.gov> * Radiation changes for prototype 8 (#1090) * New feature in RRTMGP enabled ccpp-physics. * Updated physics. New FV3 interstitials. * Cleanup of RRTMGP regression tests. * Replaced cld_mynn_ naming convention with cld_pbl_ * Some more cleanup of cloud-fraction... * Pulled in Qingfu's changes to ccpp-physics * New RT's for RRTMGP p8. Revert change in ccpp-physics * Changed arguments to implied shape. in ccpp-physics * Updated RRTMGP regression tests * Changes to FV3/ccpp-physics. * RRTMGP RT cleanup, again. Bug-fix in FV3/ccpp-physics * Revert changes to names in FV3/ccpp-physics * Cleanup p8 tests. * More RT cleanup for p8. * Add GP setting to non-coupled p8 tests. * Added bounding to temperature at layer-interface used by RRTMGP. * Reorder loop * Combined gp sw and lw aerosol routines. Modest speedup (~4%). Add GP setting to test setup. * Add GP settings to cpld_control_c96_noaero_p8 test. * update test resources default_vars.sh * HAFS moving-nesting related developments (#1104) * Add the storm-following or specified moving-nesting capability for both the regional and global configuration. * Expand the UFS/HAFS FV3ATM-HYCOM ocean coupling to support the static and moving nesting configuration. * Expand the write grid component to support outputting the moving nest domain properly. * Five HAFS related moving-nesting regression tests are added to test these newly added features. The regional_hafs RT was removed. Co-authored-by: Daniel Rosen <daniel.rosen@noaa.gov> Co-authored-by: Ufuk Turuncoglu <ufuk.turuncoglu@noaa.gov> Co-authored-by: uturuncoglu <turuncu@ucar.edu> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> Co-authored-by: William Ramstrom <William.Ramstrom@noaa.gov> Co-authored-by: A-Kyle <kyle.ahern@noaa.gov> * fv3atm: Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from ccpp_types; contains bug fix for WW3 debug (#1130) Co-authored-by: Jessica Meixner <Jessica.Meixner@noaa.gov> * Close MOM6 1deg at j=1; Update input-data for P8c (#909) * update all tests using 1deg MOM6/CICE6 * pre-pend ufs to existing topo edits filename when creating the new file * update input-data directory * Fix uninitialized min_rand variable in Thompson MP when using SPP (#1152) * Updates to stochastic_physics and fv3 and CI * A bug fix for wet scavenging of aerosols and a minor modification for moisture property calculation (#1176) * point to one_scheme_to_one_file PR branch (#1175) * merge ufs-community develop * Point to gsl/merge-develop for FV3 * Changes missing from prior commit * use community version of hafs_regional_atm * merge rt.sh changes * Point to gsl/merge-develop-to-community branch for FV3 * Revert gsl-specific changes to rt.sh * Corrections to prior merge * corrections to FV3_HRRR tests * Add rrfs_smoke_conus13km_hrrr_warm test * Add FV3_HRRR_smoke to rt builds * Correct nst and domains_stack_size in rrfs_conus13km_hrrr.nml.IN * Set SFCLAY_COMPUTE_FLUX=.true. for rrfs_smoke tests * hera.gnu tests passed * Hera BUILD_WALLTIME of 1 hour due to occasional extreme contention for intel licenses * hera intel tests passed * Jet tests passed * Revert gsl-specific change to rt.sh * Point FV3/.gitmodules to Sam's fork * Correct issues found by reviewers in ccpp-physics and fv3atm * Rename mynnpbl to mynnedmf in fv3atm and ccpp-physics * FV3: Remove some empty _init and _finalize routines and update a comment in sgscloud_radpre * Feature/lndp noahmp2 : add land perturbation scheme for Noah-MP fractional veg (#1143) Updates to allow land perturbation scheme to be applied for Noah-MP. Currently, for Noah-MP model parameters can perturb only vegetation fraction. Main code changes: -added lsm_noahmp model option to lndp_type==2 land perturbation scheme (fv3-atm, stochastic_physics) -updated comments -cleaned up the namelists to make the different options clearer. Removed misleading lndp_each_step variable from gfs_physics_nml, and replaced it with "lndp_model_type" in the nam_sfcperts namelist for the different forecast types (cycling DA, short forecasts, perturbing only initial conditions) (fv3-atm, stochastic_physics, ufs-weather-model) NOTE: see note below, re: specification of smc perturbation for RAP/HRRR/etc (lndp_model_type==2) -revised code in stochastic_physics_wrapper to only allocate arrays that will be used when passed into lndp_apply_perts (fv3-atm) -deleted unused albedo arrays in stochastic_physics_wrapper and lndp_apply_perts (fv3-atm, stochastic_physics) -fixed bug causing precision errors when calculating the soil moisture ice content (often ~0.0; stochastic_physics) -fixed bug in which lndp_apply_perts wasn't called for nscyc = 0. (fv3-atm) -increased max_nvar_lndp at Jeff Ator's request (fv3-atm) -added a new test for the Noah-MP and lndp==2 combination (ufs-weather-model) * Add \file to smoke files * Update CDEPS component, add hailcast code in FV3/atmos_cubed_sphere and reduce wall clock time used for the cpld_control_c192_p8 test on Jet (#1156) Co-authored-by: Yunheng Wang * Update CMEPS; Add gocart userguide (was #1182) (#1189) * Update CMEPS submodule * Add GOCART documentation Co-authored-by: Li Pan <Li.Pan@noaa.gov> * Combine PROD and REPRO build options into 'Release' build type (#1171) Combined PROD and REPRO build modes into 'Release' build type. Now only 'Debug' and 'Release' build type are supported. Both build types must produce bit-for-bit reproducible outputs using different number of threads, mpi tasks, different domain decomposition, have reproducible restarts etc. * Unify inline post interfaces (#1181) * replace pwatclm to pwat in the all diag tables under tests/parm/diag_table. * adding bug fix from jili dong and removing U* averaging * adding bug fix from jili dong and removing U* averaging * Hera tests passed. * Remove some commented-out code from cu_gf_driver in ccpp-physics. * In FV3, turn rrtmg smoke band 10 into a model namelist variable * Switch ccpp-physics smoke arguments to implied shape * Remove some stops and gotos from ccpp-physics rrfs-smoke * In FV3, remove some hard-coded constants and rename some meta entries * In FV3, rename some standard_names, change a unit, and remove a "use physcons" * Updated settings for NoahMP, Thompson and RRTMGP in RTs (#1196) * add NoahMP opt_trs to namelist * Updated namelist settings related to NoahMP scheme, Thompson scheme and RRTMGP (issue #1173 and #1185) * Updated some namelist settings and add/remove some RTs related to RRTMGP * Compute petlist bounds for each subcomponent from number of tasks. Update CICE (#1200) * Instead of specifying petlist bounds (lower and upper bound), compute them using the number of tasks for each component. The function that computes petlist bounds assumes that the mediator always runs on the same tasks as ATM component, and that the Chemistry component also always runs on the same tasks as ATM. * Update CICE submodule (@DeniseWorthen) Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> * NSSL ccpp-physics bugfixes and new ccpp-framework debugging feature (#1202) * Merge develop * hera.gnu tests passed * hera.intel tests passed * jet intel tests passed * hera.gnu tests passed. * fv3atm: Only add cnv_3d_ud_mf to the restart files when needed * More warnings not to change the conus13km tests * adjust BL_DATE in rt.sh to 20220516 * WCOSS Cray tests passed * fv3atm: pass some chemistry varibles to mynn_bl_driver correctly * [AutoRT] hera.gnu Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] hera.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] cheyenne.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * WCOSS Dell P3 tests passed * Correct argument passing within mynn edmf * [AutoRT] gaea.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * [AutoRT] cheyenne.gnu Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * Orion RT Passed * [AutoRT] jet.intel Job Completed. on-behalf-of @ufs-community <brian.curtis@noaa.gov> * Point to NOAA-EMC develop for FV3 * merge gsl institutional fork (#1195) Merge in GSL institutional fork. * update FV3 to top of gsl/merge-community-to-develop * FV3: point to sam's repo * Point to GSL baseline areas * FV3/ccpp/physics: Change to GSL CODEOWNERS * hera.gnu tests passed * hera.intel passed * jet.intel tests passed * Set regression test path to GSL areas on Hera * FV3: Returned the comments on soil resistance back. Co-authored-by: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com> Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: BinLi-NOAA <bin.li@noaa.gov> Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> Co-authored-by: Grant Firl <grant.firl@noaa.gov> Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: mzhangw <mzhangw@gmail.com> Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com> Co-authored-by: SMoorthi-emc <47667426+SMoorthi-emc@users.noreply.github.com> Co-authored-by: ChunxiZhang-NOAA <49283036+ChunxiZhang-NOAA@users.noreply.github.com> Co-authored-by: David Huber <david.huber@noaa.gov> Co-authored-by: Bin Liu <Bin.Liu@noaa.gov> Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Co-authored-by: Gerhard Theurich <gerhard.j.theurich@noaa.gov > Co-authored-by: Ali.Abdolali <37336972+aliabdolali@users.noreply.github.com> Co-authored-by: Ted Mansell <ted.mansell@noaa.gov> Co-authored-by: Dom Heinzeller <heinzell@ucar.edu> Co-authored-by: Jeff Whitaker <jswhit@fastmail.fm> Co-authored-by: DomHeinzeller <58610420+DomHeinzeller@users.noreply.github.com> Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Co-authored-by: JeffBeck-NOAA <55201531+JeffBeck-NOAA@users.noreply.github.com> Co-authored-by: MatthewPyle-NOAA <48285220+MatthewPyle-NOAA@users.noreply.github.com> Co-authored-by: Jessica Meixner <jessica.meixner@noaa.gov> Co-authored-by: kgerheiser <kgerheiser@icloud.com> Co-authored-by: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Co-authored-by: joeolson42 <Joseph.B.Olson@noaa.gov> Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: HelinWei-NOAA <48133472+HelinWei-NOAA@users.noreply.github.com> Co-authored-by: mdtoyNOAA <73618848+mdtoyNOAA@users.noreply.github.com> Co-authored-by: JONG KIM <jong.kim@noaa.gov> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> Co-authored-by: Brian Curtis <64433609+BrianCurtis-NOAA@users.noreply.github.com> Co-authored-by: dustinswales <dustin.swales@noaa.gov> Co-authored-by: Daniel Rosen <daniel.rosen@noaa.gov> Co-authored-by: Ufuk Turuncoglu <ufuk.turuncoglu@noaa.gov> Co-authored-by: uturuncoglu <turuncu@ucar.edu> Co-authored-by: William Ramstrom <William.Ramstrom@noaa.gov> Co-authored-by: A-Kyle <kyle.ahern@noaa.gov> Co-authored-by: ClaraDraper-NOAA <33430543+ClaraDraper-NOAA@users.noreply.github.com> Co-authored-by: Li Pan <Li.Pan@noaa.gov> * Correct .gitmodules * Gsl/may16 followup pr (#139) * new tests * point to gsl/may16-followup-pr branch of fv3 * Change suite_FV3_GFS_v15_thompson_mynn to not use mynn surface layer scheme (from T…
PR Checklist
This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model wiki if you are unsure how to do this.
This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR
An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
are specified below.
Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.
New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.
Instructions: All subsequent sections of text should be filled in as appropriate.
The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.
Description
Instead of specifying petlist bounds (lower and upper bound), compute them using the number of tasks for each component. The function that computes petlist bounds assumes that the mediator always runs on the same tasks as ATM component, and that the Chemistry component also always runs on the same tasks as ATM.
Update CICE submodule (#1201)
Issue(s) addressed
Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues must always be created before starting work on a PR branch!)
Testing
How were these changes tested? Full test passed on wcoss, hera and orion
What compilers / HPCs was it tested with? Intel
Are the changes covered by regression tests? Yes.
Have regression tests and unit tests (utests) been run? Yes.
On which platforms and with which compilers? wcoss, hera and orion
Dependencies