Skip to content

EMC stochastic candidate 20211028#1538

Merged
marshallward merged 71 commits into
mom-ocean:mainfrom
jiandewang:EMC-stochastic-candidate-20211028
Dec 20, 2021
Merged

EMC stochastic candidate 20211028#1538
marshallward merged 71 commits into
mom-ocean:mainfrom
jiandewang:EMC-stochastic-candidate-20211028

Conversation

@jiandewang
Copy link
Copy Markdown
Collaborator

The stochastic physics feature has been added in MOM6. The following are from Phil Pegion:

The ocean stochastic physics has been re-coded such that there is a wrapper in config_src/external/OCEAN_stochastic_phyiscs that contains the calls to the external stochastic_physics repository. This has been added to support non-UFS applications of MOM6 where the stochastic_physics repository is not part of the build. The init and run procedures are called from src/core/MOM.F90. I have also created a new control structure stochastic_CS, which contains the logical variables, and random patterns which are then passed into src/parameterizations/vertical/MOM_diabadic_driver.F90 and src/parameterizations/vertical/MOM_energetic-PBL.F90.
The writing of the ocean stochastic restarts sit in config_src/nuopc_cap/mom_cap.F90

pjpegion and others added 30 commits May 5, 2020 08:22
update with NOAA-EMC fork
Update ocn_stoch branch with dev/emc
remove conflict with dev/emc
further resolve conflict
merge dev/emc into ocean stochastic branch
put id_sppt_wts, etc back.
Comment thread config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90 Outdated
Comment thread config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90 Outdated
Copy link
Copy Markdown
Collaborator

@alperaltuntas alperaltuntas left a comment

Choose a reason for hiding this comment

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

NCAR tests are passing.

Comment thread config_src/external/stochastic_physics/stochastic_physics.F90
@jiandewang
Copy link
Copy Markdown
Collaborator Author

Phil just added the comments for the arguments in the two subroutines

@jiandewang
Copy link
Copy Markdown
Collaborator Author

are there any further comments/modification requirement for this PR ?

@marshallward
Copy link
Copy Markdown
Collaborator

@jiandewang I think we are OK on GFDL's end. I am doing some final tests against dev/gfdl and will finalize soon (hopefully tomorrow).

@marshallward
Copy link
Copy Markdown
Collaborator

marshallward commented Dec 17, 2021

Everyone who has approved: could you also use the GitHub "approve" button? Merges now require four approvals.

(Ping: @abozec @kshedstrom )

@kshedstrom
Copy link
Copy Markdown
Collaborator

I'm not seeing an approve button:
Screen Shot 2021-12-17 at 9 36 38 AM

@pjpegion
Copy link
Copy Markdown
Contributor

@kshedstrom If you click on the files changed tab, there is a review changes dropdown list on the top right, under that there is an approve button.

@marshallward
Copy link
Copy Markdown
Collaborator

Since we have the approvals in writing, I am going to merge this one myself, overriding the new 4-reviewer protocol.

There are still a few small questions around permissions and how to best secure the codebase, and it's getting too close to the holidays to wait for them to be resolved, and there's no reason for this PR to wait on those problems to be solved.

@pjpegion and @jiandewang Thanks very much for your patience and working through the issues raised by the other contributors.

@marshallward
Copy link
Copy Markdown
Collaborator

I will squash-merge this one, due to the large number of commits.

@marshallward marshallward merged commit 9cb9304 into mom-ocean:main Dec 20, 2021
@jiandewang
Copy link
Copy Markdown
Collaborator Author

@marshallward thank you very much to have the first PR done in the new MOM6 repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants