Skip to content

Remove scratch allocates and config. Part 1: analysis members#539

Merged
mark-petersen merged 6 commits intoMPAS-Dev:ocean/developfrom
mark-petersen:ocean/remove_scratch_allocate_1_analysis_members
Jul 14, 2020
Merged

Remove scratch allocates and config. Part 1: analysis members#539
mark-petersen merged 6 commits intoMPAS-Dev:ocean/developfrom
mark-petersen:ocean/remove_scratch_allocate_1_analysis_members

Conversation

@mark-petersen
Copy link
Contributor

Part 1 of #457.

@mark-petersen
Copy link
Contributor Author

Passes nightly regression suite on grizzly with gnu and intel, optimized and debug.

@mattdturner, the first commit 2fda23a is exactly your changes. There were a few corrections for the Lagrangian particles, which I put in a second commit. You can review by inspection, since I tested. This will be the first performance PR to be merged, but E3SM repo is closed right now, and we wait for that.

Copy link
Collaborator

@mattdturner mattdturner left a comment

Choose a reason for hiding this comment

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

Approved by visual inspection and @mark-petersen testing.

Comment on lines +345 to +384
Copy link
Collaborator

Choose a reason for hiding this comment

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

The allocatable statements might actually need to be module-level instead of subroutine-level. This is a non-issue once #513 is merged, but having the global !$omp parallel implementation could cause the subroutine-level allocatable definitions to result in segfaults if running on multiple threads.

@mark-petersen mark-petersen force-pushed the ocean/remove_scratch_allocate_1_analysis_members branch from dc30637 to 536249a Compare May 9, 2020 04:16
@mark-petersen
Copy link
Contributor Author

rebased, tested.

@mattdturner mattdturner force-pushed the ocean/remove_scratch_allocate_1_analysis_members branch from ee9fd56 to a60f268 Compare June 17, 2020 17:14
@mattdturner
Copy link
Collaborator

mattdturner commented Jun 17, 2020

I just rebased this PR. It passed all tests in the nightly regression suite w/ Intel on Cori, except the Periodic Planar tests (state validation failed). The periodic planar tests also failed for ocean/develop for me.

@mark-petersen
Copy link
Contributor Author

On grizzly, passes nightly regression suite with gnu, intel17, intel19 with PIO2. Tested both debug and optimized. BFB with previous on all tests.

@mark-petersen mark-petersen force-pushed the ocean/remove_scratch_allocate_1_analysis_members branch from d3ecb61 to 13342d3 Compare July 14, 2020 16:36
@mark-petersen mark-petersen merged commit f0865d7 into MPAS-Dev:ocean/develop Jul 14, 2020
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Jul 22, 2020
…is' into next (PR #3717)

Update mpas-source: remove scratch allocates, analysis and init

This PR brings in a new mpas-source submodule with changes only to the
ocean core. Those changes represent two MPAS-Ocean PRs with similar
improvements but to two different parts of the model:
* Remove scratch allocates and config. Part 1: analysis members
  (MPAS-Dev/MPAS-Model#539)
* Remove scratch allocates and config. Part 2: Init mode
  (MPAS-Dev/MPAS-Model#553)
These are each part of MPAS-Dev/MPAS-Model#457, which replaces scratch allocates
throughout the model. We felt it was safer to convert the model in smaller
pieces.

[BFB]
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Jul 23, 2020
…is' (PR #3717)

Update mpas-source: remove scratch allocates, analysis and init

This PR brings in a new mpas-source submodule with changes only to the
ocean core. Those changes represent two MPAS-Ocean PRs with similar
improvements but to two different parts of the model:
* Remove scratch allocates and config. Part 1: analysis members
  (MPAS-Dev/MPAS-Model#539)
* Remove scratch allocates and config. Part 2: Init mode
  (MPAS-Dev/MPAS-Model#553)
These are each part of MPAS-Dev/MPAS-Model#457, which replaces scratch allocates
throughout the model. We felt it was safer to convert the model in smaller
pieces.

[BFB]
mark-petersen added a commit to mark-petersen/MPAS-Model that referenced this pull request Jan 11, 2021
…rs' into ocean/develop

Remove scratch allocates and config. Part 1: analysis members MPAS-Dev#539

Part 1 of MPAS-Dev#457.
@mark-petersen mark-petersen deleted the ocean/remove_scratch_allocate_1_analysis_members branch March 3, 2021 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants