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

Merging main candidate from Dec 20, 2021 #206

Merged
merged 2 commits into from
Feb 7, 2022

Conversation

gustavo-marques
Copy link
Collaborator

Changes are related to the stochastic physics described in mom-ocean#1538.

marshallward and others added 2 commits October 19, 2021 20:21
…10-04

Dev gfdl main candidate 2021 10 04
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

Co-authored-by: pjpegion <Philip.Pegion@noaa.gov>
@codecov-commenter
Copy link

Codecov Report

Merging #206 (9cb9304) into dev/ncar (230b839) will decrease coverage by 14.48%.
The diff coverage is 26.38%.

Impacted file tree graph

@@              Coverage Diff              @@
##           dev/ncar     #206       +/-   ##
=============================================
- Coverage     43.55%   29.07%   -14.49%     
=============================================
  Files           224      239       +15     
  Lines         70526    71738     +1212     
=============================================
- Hits          30720    20855     -9865     
- Misses        39806    50883    +11077     
Impacted Files Coverage Δ
...g_src/drivers/solo_driver/MESO_surface_forcing.F90 0.00% <0.00%> (ø)
...fig_src/drivers/solo_driver/atmos_ocean_fluxes.F90 0.00% <ø> (ø)
...g_src/drivers/solo_driver/user_surface_forcing.F90 0.00% <0.00%> (ø)
...g_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90 0.00% <ø> (ø)
...fig_src/external/GFDL_ocean_BGC/generic_tracer.F90 0.00% <ø> (ø)
...c/external/GFDL_ocean_BGC/generic_tracer_utils.F90 0.00% <ø> (ø)
config_src/external/ODA_hooks/ocean_da_types.F90 0.00% <ø> (ø)
config_src/external/ODA_hooks/write_ocean_obs.F90 0.00% <0.00%> (ø)
...external/stochastic_physics/stochastic_physics.F90 0.00% <0.00%> (ø)
config_src/infra/FMS1/MOM_data_override_infra.F90 0.00% <0.00%> (ø)
... and 275 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c09e199...9cb9304. Read the comment docs.

Copy link
Member

@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.

Both the aux_mom suite and DIMCS tests pass (with fixes from Keith)

@alperaltuntas alperaltuntas merged commit d4b2eeb into NCAR:dev/ncar Feb 7, 2022
alperaltuntas pushed a commit that referenced this pull request Dec 14, 2022
FMS2: open_ASCII_file and open_namelist_file
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.

5 participants