update MOM6 to GFDL 20210308 main branch commit #458

jiandewang · 2021-03-09T05:07:15Z

Description

GFDL updated their main branch on 20210308 which is their step 2 of FMS2 related code and structure changes (see detail at https://github.com/NOAA-GFDL/MOM6/pull/1342). No answer changes is expected. "mom6_files.cmake" and "CMakeLists.txt" need modification to reflect the directory structure changes in MOM6

Issue(s) addressed

Closes update MOM6 to GFDL's 20210308 commit #457
MOM6 issue 60 (update MOM6 to GFDL 20210308 commit NOAA-EMC/MOM6#60)

Testing

Dependencies

MOM6 PR 60 (update MOM6 to GFDL 20210308 commit NOAA-EMC/MOM6#60)

…rom framework directory to infra directory (2) modify CMakeLists.txt to reflect the directories being changed where *.h files are stored

jiandewang · 2021-03-09T05:14:02Z

the changes in MOM6 directories are:
(1) rename config_src/nuopc_driver to config_src/drivers/nuopc_cap
(2) rename config_src/solo_driver to config_src/driver/solo_driver
(3) extract all infra.F90 files from src/framework to src/config_src/infra/FMS1
(4) rename config_src/dynamic to config_src/memory/dynamic_nonsymmetric

…OM6-20210308

climbfuji

Obviously I don't know anything about the changes in MOM6 itself, but the ufs-weather-model changes look fine. Approved pending successful regression testing and update of the submodule pointer/.gitmodules.

jiandewang · 2021-03-12T03:21:48Z

@DomHeinzeller there is no any code content change in MOM for this PR, but there are some directories structure changes:
(1) rename config_src/nuopc_driver to config_src/drivers/nuopc_cap
(2) rename config_src/solo_driver to config_src/driver/solo_driver
(3) extract all infra.F90 files from src/framework to src/config_src/infra/FMS1
(4) rename config_src/dynamic to config_src/memory/dynamic_nonsymmetric

So the only stuff being touched in this PR are two MOM6 cmake files

climbfuji · 2021-03-12T03:29:00Z

@DomHeinzeller there is no any code content change in MOM for this PR, but there are some directories structure changes:
(1) rename config_src/nuopc_driver to config_src/drivers/nuopc_cap
(2) rename config_src/solo_driver to config_src/driver/solo_driver
(3) extract all infra.F90 files from src/framework to src/config_src/infra/FMS1
(4) rename config_src/dynamic to config_src/memory/dynamic_nonsymmetric

So the only stuff being touched in this PR are two MOM6 cmake files

Thanks for the information!

jiandewang · 2021-03-12T03:38:37Z

@dom: can you trigged the run on GAEA ? I have already launched on hera, orion, dell-p3 and cray

climbfuji · 2021-03-12T03:41:41Z

Let's try auto-rt ... I'll add the label.

jiandewang · 2021-03-12T03:42:59Z

Let's try auto-rt ... I'll add the label.

thanks.

jiandewang · 2021-03-12T04:22:33Z

hera and orion are fully saturated at this moment, let's hope all jobs can be done tomorrow morning.

DeniseWorthen · 2021-03-12T13:00:01Z

@BrianCurtis-NOAA Is there a reason the auto-rt label hasn't been added to the other platforms (jet, cheyenne) ?

climbfuji · 2021-03-12T13:11:58Z

Let's try auto-rt ... I'll add the label.

thanks.

The automatic regression tests passed on gaea, log has been committed to your PR. You will need to pull those updated into your local branch if you are planning to commit more regression test logs manually.

DeniseWorthen · 2021-03-12T13:39:09Z

@BrianCurtis-NOAA I don't understand what you posted about jet.

But I realize now that the new baseline from inlinepost first needs to be created on cheyenne before we can run against that. @DomHeinzeller do you want me to do that or have you started it already?

junwang-noaa · 2021-03-12T18:34:54Z

@DeniseWorthen I do not see the code changes themselves would change the compile time. But I do see the fluctuation of compile time from previous tests: ***@***.*** FV3_RT]$ grep -i "elapsed=" rt_92944/*/err | more rt_92944/compile_1/err:+ elapsed=993 ***@***.*** FV3_RT]$ grep -i "elapsed=" rt_244824/*/err | more rt_244824/compile_1/err:+ elapsed=520 ***@***.*** rt_295210]$ grep -i "elapsed=" */err | more compile_1/err:+ elapsed=1285

…

On Fri, Mar 12, 2021 at 1:23 PM jiandewang ***@***.***> wrote: @junwang-noaa <https://github.com/junwang-noaa> Would there have been anything in the inline post PR that created longer compile times? It seems odd. I just had 3 failed compiling on cray — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#458 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AI7D6TKGLEE4AKDRTOEVA3DTDJE2BANCNFSM4Y2Y3RKA> .

jiandewang · 2021-03-12T20:46:40Z

@junwang-noaa I tried twice on cray but all had compiling time out, 1st try had 5 cases, 2nd try had 3. How do I increase the compiling CPU time ?

DeniseWorthen · 2021-03-12T21:20:26Z

@jiandewang I had compile time failures for the cheyenne intel jobs also (26). I will try the auto-rt tonight and see if it is just a cheyenne congestion issue.

junwang-noaa · 2021-03-12T21:39:44Z

@jaindewang. I suspect the cmake changes in your PR further may slow down the compilation, where is your RT run directory on cray? You can change the line 384 in ufs-weather-model/tests/rt_utils.sh BUILD_WALLTIME="00:30:00" to: BUILD_WALLTIME="01:00:00"

…

On Fri, Mar 12, 2021 at 3:47 PM jiandewang ***@***.***> wrote: @junwang-noaa <https://github.com/junwang-noaa> I tried twice on cray but all had compiling time out, 1st try had 5 cases, 2nd try had 3. How do I increase the compiling CPU time ? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#458 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AI7D6TN7F54GUIV6MJHXRZ3TDJVTFANCNFSM4Y2Y3RKA> .

jiandewang · 2021-03-12T21:50:36Z

@jaindewang. I suspect the cmake changes in your PR further may slow down the compilation, where is your RT run directory on cray? You can change the line 384 in ufs-weather-model/tests/rt_utils.sh BUILD_WALLTIME="00:30:00" to: BUILD_WALLTIME="01:00:00"
…
On Fri, Mar 12, 2021 at 3:47 PM jiandewang @.***> wrote: @junwang-noaa https://github.com/junwang-noaa I tried twice on cray but all had compiling time out, 1st try had 5 cases, 2nd try had 3. How do I increase the compiling CPU time ? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#458 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AI7D6TN7F54GUIV6MJHXRZ3TDJVTFANCNFSM4Y2Y3RKA .

@junwang-noaa see one example on cray /gpfs/hps3/stmp/Jiande.Wang/FV3_RT/rt_13574/compile_3
The changing in cmake only involves some directories name changes. Note on cray we only compile those fv3 only jobs.

jiandewang · 2021-03-12T21:52:48Z

I am more incline to think this is related to system. For example I just show you that compile_3 had time out issue, but it finished in my 3rd try. In my previous 2 tries, the timed out cases are different.
My 3rd try on cray finished OK.

jiandewang · 2021-03-13T14:32:40Z

all RT passed and log files being committed, ready for review

DeniseWorthen · 2021-03-13T14:35:48Z

@jiandewang The MOM6 PR is approved, so go ahead and merge that and then revert the gitmodules in this PR. This PR is approved, so we can merge after that.

jiandewang · 2021-03-13T14:47:38Z

MOM6 is merged, ufs-weather-model is pointing to dev/emc now. Thanks for everybody's work

.gitmodules

* upstream/develop: Updatetemplate; Fix model slowness when using threading; Update WW3 for porting and threading issues (ufs-community#383) update MOM6 to GFDL 20210308 main branch commit (ufs-community#458) Regional inlinepost (ufs-community#364) correct benchmark diag_tables for coupled model configurations; move bm_ic directory out of inputdata directory; use aws ec2 for CI test; auto-rt fixes (ufs-community#426)

@jaymes-kenyon

## DESCRIPTION OF CHANGES: * Rename GSD_RAP13km grid to RRFS_NA_13km. * In ush/set_predef_grid_params.sh: * Change parameters of the (newly renamed) RRFS_NA_13km grid to make its write-component grid be completely within the native grid. * For the (newly renamed) RRFS_NA_13km grid, automate calculation of WRTCMP_dlon and WRTCMP_dlat from ESGgrid_DELX and ESGgrid_DELY, respectively. * NCL scripts: * Make modifications to make scripts more general and have the find_wrtcmp_grid_params.ncl script work for a write-component grid of type "rotated_latlon". * Remove unused code in NCL scripts. * Fix up comments. ## TESTS CONDUCTED: Ran the (renamed) WE2E test grid_RRFS_NA_13km on Hera. Was successful. ## CONTRIBUTORS (optional): This grid was also tested by @jaymes-kenyon on Jet.

jiandewang added 2 commits March 8, 2021 16:23

pointing MOM6 to update-to-GFDL-20210308 branch

35c7063

(1) modify mom6_files.cmake to reflect the 12 files being moved out f…

73f5956

…rom framework directory to infra directory (2) modify CMakeLists.txt to reflect the directories being changed where *.h files are stored

binli2337 self-requested a review March 9, 2021 13:51

BrianCurtis-NOAA added enhancement New feature or request Triaged and removed enhancement New feature or request labels Mar 9, 2021

jiandewang mentioned this pull request Mar 10, 2021

Feature/update to gfdl 20210308 NOAA-EMC/MOM6#61

Merged

Merge remote-tracking branch 'upstream/develop' into feature/update-M…

8b8606e

…OM6-20210308

junwang-noaa added the No Baseline Change No Baseline Change label Mar 11, 2021

junwang-noaa requested review from DusanJovic-NOAA and DeniseWorthen March 11, 2021 23:53

Merge remote-tracking branch 'upstream/develop' into feature/update-M…

9d8586b

…OM6-20210308

junwang-noaa added the Waiting for Reviews The PR is waiting for reviews from associated component PR's. label Mar 12, 2021

junwang-noaa requested a review from climbfuji March 12, 2021 02:10

climbfuji approved these changes Mar 12, 2021

View reviewed changes

climbfuji added the gaea-intel-RT label Mar 12, 2021

BrianCurtis-NOAA removed the gaea-intel-RT label Mar 12, 2021

jiandewang and others added 2 commits March 11, 2021 23:30

upload RegressionTests_wcoss_dell_p3.log

e984ea7

PASSED: gaea.intel. Log file uploaded. skip-ci

46bbdd7

DusanJovic-NOAA approved these changes Mar 12, 2021

View reviewed changes

PASSED: jet.intel. Log file uploaded. skip-ci

ea51417

BrianCurtis-NOAA added jet-intel-RT and removed jet-intel-RT labels Mar 12, 2021

upload RegressionTests_cheyenne.gnu.log

fafda11

jiandewang and others added 2 commits March 12, 2021 17:44

upload RegressionTests_wcoss_cray.log

b58daf9

PASSED: jet.intel. Log file uploaded. skip-ci

a21dcd0

DeniseWorthen added the cheyenne-intel-RT label Mar 13, 2021

BrianCurtis-NOAA added orion-intel-RT and removed orion-intel-RT labels Mar 13, 2021

PASSED: orion.intel. Log file uploaded. skip-ci

1fd83ef

DeniseWorthen removed the cheyenne-intel-RT label Mar 13, 2021

DeniseWorthen approved these changes Mar 13, 2021

View reviewed changes

upload RegressionTests_cheyenne.intel.log

53d0a0c

switch MOM6 to NOAA-EMC dev/emc repository

3ea245c

DusanJovic-NOAA reviewed Mar 13, 2021

View reviewed changes

.gitmodules Outdated Show resolved Hide resolved

remove whitespace in MOM6 submodule module

691beff

junwang-noaa merged commit d16a5a0 into ufs-community:develop Mar 14, 2021

jiandewang deleted the feature/update-MOM6-20210308 branch February 28, 2023 04:03

pjpegion pushed a commit to NOAA-PSL/ufs-weather-model that referenced this pull request Apr 4, 2023

4DIAU bug when iau_filter_increments=T (ufs-community#458)

e19a77c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update MOM6 to GFDL 20210308 main branch commit #458

update MOM6 to GFDL 20210308 main branch commit #458

jiandewang commented Mar 9, 2021 •

edited by DeniseWorthen

Loading

jiandewang commented Mar 9, 2021 •

edited

Loading

climbfuji left a comment

jiandewang commented Mar 12, 2021

climbfuji commented Mar 12, 2021

jiandewang commented Mar 12, 2021

climbfuji commented Mar 12, 2021

jiandewang commented Mar 12, 2021

jiandewang commented Mar 12, 2021

DeniseWorthen commented Mar 12, 2021 •

edited

Loading

climbfuji commented Mar 12, 2021

DeniseWorthen commented Mar 12, 2021 •

edited by BrianCurtis-NOAA

Loading

junwang-noaa commented Mar 12, 2021 via email

jiandewang commented Mar 12, 2021

DeniseWorthen commented Mar 12, 2021 •

edited

Loading

junwang-noaa commented Mar 12, 2021 via email

jiandewang commented Mar 12, 2021 •

edited

Loading

jiandewang commented Mar 12, 2021 •

edited

Loading

jiandewang commented Mar 13, 2021

DeniseWorthen commented Mar 13, 2021

jiandewang commented Mar 13, 2021

update MOM6 to GFDL 20210308 main branch commit #458

update MOM6 to GFDL 20210308 main branch commit #458

Conversation

jiandewang commented Mar 9, 2021 • edited by DeniseWorthen Loading

jiandewang commented Mar 9, 2021 • edited Loading

climbfuji left a comment

Choose a reason for hiding this comment

jiandewang commented Mar 12, 2021

climbfuji commented Mar 12, 2021

jiandewang commented Mar 12, 2021

climbfuji commented Mar 12, 2021

jiandewang commented Mar 12, 2021

jiandewang commented Mar 12, 2021

DeniseWorthen commented Mar 12, 2021 • edited Loading

climbfuji commented Mar 12, 2021

DeniseWorthen commented Mar 12, 2021 • edited by BrianCurtis-NOAA Loading

junwang-noaa commented Mar 12, 2021 via email

jiandewang commented Mar 12, 2021

DeniseWorthen commented Mar 12, 2021 • edited Loading

junwang-noaa commented Mar 12, 2021 via email

jiandewang commented Mar 12, 2021 • edited Loading

jiandewang commented Mar 12, 2021 • edited Loading

jiandewang commented Mar 13, 2021

DeniseWorthen commented Mar 13, 2021

jiandewang commented Mar 13, 2021

jiandewang commented Mar 9, 2021 •

edited by DeniseWorthen

Loading

jiandewang commented Mar 9, 2021 •

edited

Loading

DeniseWorthen commented Mar 12, 2021 •

edited

Loading

DeniseWorthen commented Mar 12, 2021 •

edited by BrianCurtis-NOAA

Loading

DeniseWorthen commented Mar 12, 2021 •

edited

Loading

jiandewang commented Mar 12, 2021 •

edited

Loading

jiandewang commented Mar 12, 2021 •

edited

Loading