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.

Sign up for GitHub

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

Jump to bottom

Update mpas-source: GM/Redi and surface buoyancy fixes #3825

Merged
merged 2 commits into from
Sep 15, 2020
Merged

Update mpas-source: GM/Redi and surface buoyancy fixes #3825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
457e040
Update mpas-source: GM/Redi and surface buoyancy fixes
mark-petersen Sep 11, 2020
74dca88
Update to E3SM scrpts corresponding to mpas-ocean Registry changes
jonbob Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions components/mpas-ocean/bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ add_default($nl, 'config_Rayleigh_bottom_damping_coeff');
#########################

add_default($nl, 'config_use_cvmix');
add_default($nl, 'config_cvmix_use_kpp_buoyancyForcing_fix');
add_default($nl, 'config_cvmix_prandtl_number');
add_default($nl, 'config_use_cvmix_background');
add_default($nl, 'config_cvmix_background_diffusion');
Expand Down
1 change: 1 addition & 0 deletions components/mpas-ocean/bld/build-namelist-section
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ add_default($nl, 'config_Rayleigh_bottom_damping_coeff');
#########################

add_default($nl, 'config_use_cvmix');
add_default($nl, 'config_cvmix_use_kpp_buoyancyForcing_fix');
add_default($nl, 'config_cvmix_prandtl_number');
add_default($nl, 'config_use_cvmix_background');
add_default($nl, 'config_cvmix_background_diffusion');
Expand Down
1 change: 1 addition & 0 deletions components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@

<!-- cvmix -->
<config_use_cvmix>.true.</config_use_cvmix>
<config_cvmix_use_kpp_buoyancyForcing_fix>.true.</config_cvmix_use_kpp_buoyancyForcing_fix>
<config_cvmix_prandtl_number>1.0</config_cvmix_prandtl_number>
<config_use_cvmix_background>.true.</config_use_cvmix_background>
<config_cvmix_background_diffusion>0.0</config_cvmix_background_diffusion>
Expand Down
8 changes: 8 additions & 0 deletions components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,14 @@ Valid values: True or False
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_cvmix_use_kpp_buoyancyForcing_fix" type="logical"
category="cvmix" group="cvmix">
If true CVMix KPP buoyancy forcing fix for sea ice is enabled

Valid values: True or False
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_cvmix_prandtl_number" type="real"
category="cvmix" group="cvmix">
Prandtl number to be used within the CVMix parameterization suite
Expand Down
2 changes: 1 addition & 1 deletion components/mpas-source
Open in desktop
Submodule mpas-source updated 3 files
+4 −2 src/core_ocean/Registry.xml
+13 −5 src/core_ocean/shared/mpas_ocn_diagnostics.F
+105 −112 src/core_ocean/shared/mpas_ocn_gm.F