Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

update MOM6 to GFDL 20210308 main branch commit #458

Merged

Conversation

jiandewang
Copy link
Collaborator

@jiandewang jiandewang commented Mar 9, 2021

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

Testing

  • run ufs-weather-model with updated MOM6 and modified "mom6_files.cmake" on hera, orion, gaea and dell-P3
  • hera.intel
  • hera.gnu (auto-rt)
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel (auto-rt)
  • jet.intel
  • wcoss_cray
  • wcoss_dell_p3 (manual)

Dependencies

…rom framework directory to infra directory

(2) modify CMakeLists.txt to reflect the directories being changed where *.h files are stored
@jiandewang
Copy link
Collaborator Author

jiandewang commented Mar 9, 2021

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

@binli2337 binli2337 self-requested a review March 9, 2021 13:51
@BrianCurtis-NOAA BrianCurtis-NOAA added enhancement New feature or request Triaged and removed enhancement New feature or request labels Mar 9, 2021
@junwang-noaa junwang-noaa added the Waiting for Reviews The PR is waiting for reviews from associated component PR's. label Mar 12, 2021
Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Collaborator Author

@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
Copy link
Collaborator

@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
Copy link
Collaborator Author

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

@climbfuji
Copy link
Collaborator

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

@jiandewang
Copy link
Collaborator Author

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

thanks.

@jiandewang
Copy link
Collaborator Author

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

@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Mar 12, 2021

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

@climbfuji
Copy link
Collaborator

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
Copy link
Collaborator

DeniseWorthen commented Mar 12, 2021

@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
Copy link
Collaborator

junwang-noaa commented Mar 12, 2021 via email

@jiandewang
Copy link
Collaborator Author

@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
Copy link
Collaborator

DeniseWorthen commented Mar 12, 2021

@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
Copy link
Collaborator

junwang-noaa commented Mar 12, 2021 via email

@jiandewang
Copy link
Collaborator Author

jiandewang commented Mar 12, 2021

@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
Copy link
Collaborator Author

jiandewang commented Mar 12, 2021

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
Copy link
Collaborator Author

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

@DeniseWorthen
Copy link
Collaborator

@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
Copy link
Collaborator Author

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

.gitmodules Outdated Show resolved Hide resolved
@junwang-noaa junwang-noaa merged commit d16a5a0 into ufs-community:develop Mar 14, 2021
AnningCheng-NOAA added a commit to AnningCheng-NOAA/ufs-weather-model that referenced this pull request Mar 16, 2021
* 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)
@jiandewang 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
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
## 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No Baseline Change No Baseline Change Waiting for Reviews The PR is waiting for reviews from associated component PR's.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update MOM6 to GFDL's 20210308 commit
8 participants