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

Minor clean-up namelists to match new versions of mpas components #1862

Merged
merged 10 commits into from
Nov 1, 2017
Merged

Minor clean-up namelists to match new versions of mpas components #1862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
11c58db
Minor clean-up namelists to match new versions of mpas components
jonbob Oct 23, 2017
f498146
changes for MPAS online MOC analysis member
vanroekel Oct 23, 2017
6be60b2
Remove unused variables
mark-petersen Oct 23, 2017
e78ab2d
Correct stream close bracket
mark-petersen Oct 23, 2017
db259b5
Update MPAS-O submodule for bug fix
mark-petersen Oct 24, 2017
8d9b3ab
Update MPAS-O submodule for Sal restore tend output
mark-petersen Oct 24, 2017
30f634e
Corrects MOC streams and adds salinity restoring output variable
vanroekel Oct 25, 2017
354197f
Whitespace cleanup in buildnml
vanroekel Oct 25, 2017
4dc979d
Update MPAS-O to nonlocal KPP and OpenMP fix.
mark-petersen Oct 25, 2017
a360d89
Enables MOC AM for mpas and cleans namelist
vanroekel Oct 25, 2017
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: 0 additions & 1 deletion components/mpas-cice/bld/build-namelist-section
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ add_default($nl, 'config_boundary_layer_iteration_number');
add_default($nl, 'config_use_ocean_mixed_layer');
add_default($nl, 'config_min_friction_velocity');
add_default($nl, 'config_ocean_heat_transfer_type');
add_default($nl, 'config_ocean_surface_type');
add_default($nl, 'config_sea_freezing_temperature_type');
add_default($nl, 'config_ocean_surface_type');

Expand Down
1 change: 0 additions & 1 deletion components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,6 @@
<config_use_ocean_mixed_layer>false</config_use_ocean_mixed_layer>
<config_min_friction_velocity>0.0005</config_min_friction_velocity>
<config_ocean_heat_transfer_type>'constant'</config_ocean_heat_transfer_type>
<config_ocean_surface_type>'free'</config_ocean_surface_type>
<config_sea_freezing_temperature_type>'mushy'</config_sea_freezing_temperature_type>
<config_ocean_surface_type>'free'</config_ocean_surface_type>

Expand Down
8 changes: 0 additions & 8 deletions components/mpas-cice/bld/namelist_files/namelist_definition_mpas-cice.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2256,14 +2256,6 @@ Valid values: MISSING POSSIBLE VALUES
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_ocean_surface_type" type="char*1024"
category="ocean" group="ocean">
MISSING DESCRIPTION

Valid values: MISSING POSSIBLE VALUES
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_sea_freezing_temperature_type" type="char*1024"
category="ocean" group="ocean">
MISSING DESCRIPTION
Expand Down
453 changes: 2 additions & 451 deletions components/mpas-o/bld/build-namelist
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions components/mpas-o/bld/build-namelist-group-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,6 @@ my @groups = qw(run_modes
testing
debug
constrain_haney_number
baroclinic_channel
lock_exchange
internal_waves
overflow
global_ocean
cvmix_wswsbf
iso
soma
ziso
sub_ice_shelf_2d
periodic_planar
ecosys_column
sea_mount
isomip
isomip_plus
tracer_forcing_activetracers
tracer_forcing_debugtracers
tracer_forcing_ecosystracers
Expand Down
437 changes: 1 addition & 436 deletions components/mpas-o/bld/build-namelist-section
View file
Open in desktop

Large diffs are not rendered by default.

408 changes: 15 additions & 393 deletions components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
View file
Open in desktop

Large diffs are not rendered by default.

Loading