update MOM6 to its main repo. 20240401 commit #2241
Conversation
|
@jkbk2004 can you add this PR to the commit queue ? It is a relative simple one with no BL change so can be combined with other PR |
…e statement on hera fv3_slurm.IN
…dress shellcheck issues
|
@jiandewang #2173 has been merged in and we'd like to get started with testing for this PR, please go ahead and re-sync your branch, thanks! |
…er-model into feature/update-MOM6-20240401
|
@BrianCurtis-NOAA I saw you merged some of your fixing in this PR, are you plan to process this PR today ? |
Yes, we are processing it right now. @zach1221 is running hera to make sure we get any early indication of failures, and i'm running on WCOSS2 to get it in before the prod switch tomorrow morning. |
FernandoAndrade-NOAA
added
No Baseline Change
thanks for the heads up. It is great that you are running this PR now as a new GFDL MOM6 candidate PR will come late this week. In ths way I can do clean test for the upcoming new code. |
|
FYI added small fix to move directory checks a little lower after the mkdir commands in |
|
Hera seems to be running through all the tests fine, but it's just taking a while. I'll go ahead and get the rest started. |
zach1221
added
hercules-RT
on-behalf-of @ufs-community <[email protected]>
epic-cicd-jenkins
removed
No Baseline Change
on-behalf-of @ufs-community <[email protected]>
|
Testing is complete. I have followed up on the mom6 sub-pr to begin the merging process. |
|
just merged MOM6 (hash # 0730606b), is it the time for me to do the submodule revert ? |
|
revert MOM6 submodule done |
|
Why are these two new log files tests/logs/RT-run-Derecho.log and tests/logs/RT-run-Hercules.log committed to the repository? This PR did not change the baselines yet tests/test_changes.list file indicates that 14 tests had changes, why? Shouldn't this file be empty if there are no baseline changes? |
|
Did @jiandewang ever commit a test change list? It seems the current list is from #2173. So does that mean that EPIC regenerated baselines those tests, even if that was not required? |
|
The "bl_date.conf" has not be updated in this PR, which means no baseline changes. In that case "test_changes.list" must be empty, by definition. Conversely, whenever "bl_date.conf" is updated the "test_changes.list" file must not be empty, also by definition. |
|
Agreed. Does there need to be a logic check in the RT scripts to verify that the two conditions are met? Or do we rely on CMs checking that the two conditions agree? In this case, I don't see that an updated test_changes.list was ever committed. |
|
I did approve it, so I missed those as well. Thanks for catching them. @jkbk2004 can we get those files removed from the repo in Ufuk's PR ? |
@BrianCurtis-NOAA sure! @zach1221 @FernandoAndrade-NOAA FYI |
I did committed an empty test_changes.list at the time when I generated this PR. Just re-cloned my original PR (created on Apr 15, hash # dc550f0). test_changes.list is an empty file |
I suspect the original empty test_changes.list was overwritten by this step, this is why @DeniseWorthen think it is from #2173 |
|
@jiandewang That is probably what happened, because as someone updates their (or someone else's) PR branch as develop moves along, they need to remember to always "git checkout --ours test_changes.list". |
commit f234a3e Author: Ufuk Turunçoğlu <[email protected]> Date: Tue Apr 30 11:35:25 2024 -0600 Fix for land component model (ufs-community#2191) * UFSWM - fix fully coupled land component configuration * NOAHMP - get fixed information from surface file commit 04bbc15 Author: jiandewang <[email protected]> Date: Thu Apr 25 14:52:00 2024 -0400 update MOM6 to its main repo. 20240401 commit (ufs-community#2241) * UFSWM - * MOM6 - update MOM6 to its main repo. 20240401 commit (NCAR-candidate-20240319) commit b6c576d Author: Daniel Sarmiento <[email protected]> Date: Tue Apr 23 12:24:22 2024 -0400 Merged global namelist (ufs-community#2173) * UFSWM - global_control.nml_IN has been added as the new regression test namelist template for all global regression tests. The namelist now uses pointers (i.e. @[abc]) for variables and default values have been added to the default_vars.sh script. A new section in default_vars.sh has been added (export_tiled) to account for tiled RTs that pulls the correct parameter files using the ATMRES variable. Regression tests have been modified to account for these changes. Tests that were not compatible with the GFSv17_p8 core have been disabled for now. They will be turned on as they are updated from GFSv16 to GFSv17. commit 5d2ca19 Author: WenMeng-NOAA <[email protected]> Date: Fri Apr 19 13:59:12 2024 -0400 Update upp submodule (ufs-community#2213) * UFSWM - Update inline post * FV3 - Update upp submodule for inline post commit 47c0099 Author: Brian Curtis <[email protected]> Date: Wed Apr 17 15:59:48 2024 -0400 Add bash linting to CI. Cleanup .sh scripts a bit. Address .sh bugs. Adds -v Verbose option. (ufs-community#2218) Remove nowarn Intel compiler flag (ufs-community#2225) * UFSWM - Add bash linting to CI: - uses superlinter to check for consistent bash code writing - Cleans up .sh scripts to comply with superlinter - Cleans up .sh scripts to be more consistent, easier to read. - Add's -v verbose option if debugging outputs needed, otherwise simplifies rt.sh run echo's. - Addresses smaller bugs - quota/timeout search logic adjusted. - check for dirs existing (DISKNM, STMP, PTMP) before starting. - adjustments/cleanup to ecflow/rocoto sections - rt.sh will attempt to start ecflow, and only stop ecflow if it started from rt.sh. - fix for issue where run_dir will not delete properly. * FV3: Address compiler warnings * atmos_cubed_sphere: Address compiler warnings. commit 4f32a4b Author: Rick Grubin <[email protected]> Date: Mon Apr 15 07:21:08 2024 -0600 Document ATMW / ATMAERO / HAFS WM configurations (ufs-community#2160) * UFSWM * doc/Userguide * source * conf.py * Configurations.rst * FAQ.rst * InputsOutputs.rst * Introduction.rst commit ac4445d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Apr 15 08:59:42 2024 -0400 Bump idna from 3.6 to 3.7 in /doc/UsersGuide (ufs-community#2234) *doc/UserGuide *requirements.txt - updates inda version from 3.6 to 3.7 commit 281b32f Author: Samuel Trahan (NOAA contractor) <[email protected]> Date: Mon Apr 15 08:38:01 2024 -0400 bug fixes: kchunk3d ignored, hailwat uninitialized in dycore, tile_num wrong for nests (ufs-community#2201) * UFSWM - None. * FV3 - Write component will use kchunk3d. Model init sends the right tile number to CCPP. * atmos_cubed_sphere - Initialize the hailwat variable. Pass global_tile index to model. commit 8a5f711 Author: Denise Worthen <[email protected]> Date: Thu Apr 11 13:32:26 2024 -0400 Add PIO namelist control for CICE (ufs-community#2145) Update to CICE-Consortium/CICE aca8357. Adds implementation of namelist PIO options for CICE commit 45c8b2a Author: JONG KIM <[email protected]> Date: Thu Apr 4 19:49:13 2024 -0400 Hotfix/cubed sphere hash fix: HAILCAST diagnostic code (units issue) (ufs-community#2223) cubed_sphere hash update: f060e85 for a bug- fix in the HAILCAST diagnostic code (units issue) commit 26e6db6 Author: Denise Worthen <[email protected]> Date: Wed Apr 3 19:57:08 2024 -0400 Enable cpl_scalars export from ATM and NoahMP for use by CMEPS (ufs-community#2175) * CMEPS - allow additional dimension in cpl_scalars for CSG and regional ATM domains for use in mediator history files * CMEPS - fix mapping mask for lnd->atm * FV3 - add export of cpl_scalars * NOAHMP - add export of cpl_scalars commit 1411b90 Author: Dusan Jovic <[email protected]> Date: Mon Apr 1 18:04:44 2024 -0400 Update module_write_netcdf to avoid hangs in RRFS runs (ufs-community#2193) * UFSWM - Update module_write_netcdf to avoid hangs in RRFS runs * FV3 - Update module_write_netcdf to avoid hangs in RRFS runs commit 87c27b9 Author: Matthew Masarik <[email protected]> Date: Fri Mar 29 15:23:42 2024 -0400 WW3 feature: Langmuir turbulence parameterization (ufs-community#2195) * WW3 - Langmuir turbulence parameterization commit c54e986 Author: Samuel Trahan (NOAA contractor) <[email protected]> Date: Wed Mar 27 16:11:03 2024 -0400 regression test system bug fixes, eliminate MOM6 warnings (ufs-community#2197), add xr_cnvcld flag to FV3 (ufs-community#2185) (ufs-community#2202) * UFSWM - atparse.bash: correctly handle input that doesn't end with an end-of-line character. Fix some bugs in Rocoto support and clean up rt.sh. * FV3 - namelist flag xr_cnvcld to control if suspended grid-mean convective cloud condensate should be included in cloud fraction and optical depth calculation in radiation in the GFS suite * ccpp - physics-level changes to implement new namelist variable * MOM6 - update MOM6 code to eliminate all compiler warnings
Commit Queue Requirements:
Description:
update MOM6 to its main repo. 20240401 commit (see detail at mom-ocean/MOM6#1621)
Commit Message:
update MOM6 to its main repo. 20240401 commit (NCAR-candidate-20240319)
Priority:
Git Tracking
UFSWM:
Sub component Pull Requests:
MOM6 PR: NOAA-EMC/MOM6#132
UFSWM Blocking Dependencies:
Changes
Regression Test Changes (Please commit test_changes.list):
Input data Changes:
Library Changes/Upgrades:
Testing Log: