Skip to content

Change three init mode namelist options #55

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

Merged
merged 3 commits into from
Mar 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion MPAS-Model/ocean/develop
Submodule develop updated 32 files
+22 −0 src/core_ocean/Registry.xml
+1 −1 src/core_ocean/mode_analysis/mpas_ocn_analysis_mode.F
+1 −7 src/core_ocean/mode_forward/mpas_ocn_forward_mode.F
+57 −43 src/core_ocean/mode_forward/mpas_ocn_time_integration_split.F
+12 −10 src/core_ocean/mode_init/Registry.xml
+12 −5 src/core_ocean/mode_init/mpas_ocn_init_global_ocean.F
+11 −5 src/core_ocean/mode_init/mpas_ocn_init_isomip.F
+12 −5 src/core_ocean/mode_init/mpas_ocn_init_isomip_plus.F
+7 −2 src/core_ocean/mode_init/mpas_ocn_init_ssh_and_landIcePressure.F
+26 −8 src/core_ocean/mode_init/mpas_ocn_init_sub_ice_shelf_2D.F
+20 −10 src/core_ocean/mode_init/mpas_ocn_init_tidal_boundary.F
+292 −70 src/core_ocean/mode_init/mpas_ocn_init_vertical_grids.F
+0 −1 src/core_ocean/ocean.cmake
+0 −3 src/core_ocean/shared/Makefile
+48 −44 src/core_ocean/shared/mpas_ocn_diagnostics.F
+4 −3 src/core_ocean/shared/mpas_ocn_forcing.F
+98 −18 src/core_ocean/shared/mpas_ocn_init_routines.F
+35 −0 src/core_ocean/shared/mpas_ocn_mesh.F
+0 −292 src/core_ocean/shared/mpas_ocn_sea_ice.F
+21 −15 src/core_ocean/shared/mpas_ocn_thick_ale.F
+3 −2 src/core_ocean/shared/mpas_ocn_thick_hadv.F
+3 −2 src/core_ocean/shared/mpas_ocn_thick_surface_flux.F
+3 −2 src/core_ocean/shared/mpas_ocn_thick_vadv.F
+6 −1 src/core_ocean/shared/mpas_ocn_tracer_advection.F
+66 −51 src/core_ocean/shared/mpas_ocn_tracer_advection_mono.F
+2 −2 src/core_ocean/shared/mpas_ocn_vel_forcing_surface_stress.F
+10 −10 src/core_ocean/shared/mpas_ocn_vel_hadv_coriolis.F
+4 −4 src/core_ocean/shared/mpas_ocn_vel_hmix_del2.F
+45 −39 src/core_ocean/shared/mpas_ocn_vel_pressure_grad.F
+10 −9 src/core_ocean/shared/mpas_ocn_vel_vadv.F
+36 −26 src/core_ocean/shared/mpas_ocn_vmix.F
+43 −28 src/core_ocean/shared/mpas_ocn_vmix_cvmix.F
2 changes: 1 addition & 1 deletion ocean/drying_slope/init_idealized_transect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<option name="config_tidal_boundary_left_value">0.0</option>
<option name="config_tidal_boundary_right_value">8.0e3</option>
<option name="config_tidal_forcing_monochromatic_baseline">3.0</option>
<option name="config_alter_ICs_for_pbcs">.true.</option>
<option name="config_alter_ICs_for_pcs">.true.</option>
<option name="config_thickness_flux_type">'centered'</option>
</namelist>
</template>
2 changes: 1 addition & 1 deletion ocean/global_ocean/template_init_with_land_ice.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<namelist>
<option name="config_use_debugTracers">.true.</option>
<option name="config_land_ice_flux_mode">'standalone'</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
<option name="config_global_ocean_topography_file">'topography.nc'</option>
<option name="config_global_ocean_topography_nlat_dimname">'lat'</option>
Expand Down
4 changes: 2 additions & 2 deletions ocean/global_ocean/template_initial_state.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<option name="config_expand_sphere">.true.</option>
<option name="config_realistic_coriolis_parameter">.true.</option>

<option name="config_alter_ICs_for_pbcs">.true.</option>
<option name="config_pbc_alteration_type">'partial_cell'</option>
<option name="config_alter_ICs_for_pcs">.true.</option>
<option name="config_pc_alteration_type">'partial_cell'</option>

<option name="config_use_activeTracers_surface_restoring">.true.</option>
<option name="config_use_bulk_wind_stress">.true.</option>
Expand Down
2 changes: 1 addition & 1 deletion ocean/isomip/template_init.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<option name="config_ocean_run_mode">'init'</option>
<option name="config_land_ice_flux_mode">'standalone'</option>
<option name="config_eos_type">'jm'</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
2 changes: 1 addition & 1 deletion ocean/isomip_plus/template_init.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<option name="config_eos_linear_Tref">-1.0</option>
<option name="config_eos_linear_Sref">34.2</option>
<option name="config_eos_linear_densityref">1027.51</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
<option name="config_isomip_plus_min_column_thickness">10.0</option>
<option name="config_isomip_plus_topography_file">'input_geometry_processed.nc'</option>
Expand Down
2 changes: 1 addition & 1 deletion ocean/scripts/LIGHTparticles/user_nl_mpaso
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
! *** EXCEPT FOR ***
! 1. DO NOT CHANGE config_start_time, config_run_duration, config_stop_time,
! config_do_restart, config_Restart_timestamp_filename, config_calendar_type,
! config_set_restingThickness_to_IC, config_alter_ICs_for_pbcs
! config_set_restingThickness_to_IC, config_alter_ICs_for_pcs
! 2. To preview the namelists, invoke $CASEROOT preview-namelists and look at
! $CASEROOT/CaseDocs/mpaso_in
!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<namelist name="namelist.ocean" mode="init">
<template file="template_init.xml" path_base="script_resolution_dir"/>
<option name="config_write_cull_cell_mask">.true.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<namelist name="namelist.ocean" mode="init">
<template file="template_init.xml" path_base="script_resolution_dir"/>
<option name="config_write_cull_cell_mask">.false.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<namelist name="namelist.ocean" mode="init">
<template file="template_init.xml" path_base="script_resolution_dir"/>
<option name="config_write_cull_cell_mask">.true.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<namelist name="namelist.ocean" mode="init">
<template file="template_init.xml" path_base="script_resolution_dir"/>
<option name="config_write_cull_cell_mask">.false.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
2 changes: 1 addition & 1 deletion ocean/sub_ice_shelf_2D/5km/restart_test/config_init1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<namelist name="namelist.ocean" mode="init">
<template file="template_init.xml" path_base="script_resolution_dir"/>
<option name="config_write_cull_cell_mask">.true.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
2 changes: 1 addition & 1 deletion ocean/sub_ice_shelf_2D/5km/restart_test/config_init2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<template file="template_init.xml" path_base="script_resolution_dir"/>
<option name="config_sub_ice_shelf_2D_temperature">-3.0</option>
<option name="config_write_cull_cell_mask">.false.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
2 changes: 1 addition & 1 deletion ocean/sub_ice_shelf_2D/5km/with_frazil/config_init1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<namelist name="namelist.ocean" mode="init">
<template file="template_init.xml" path_base="script_resolution_dir"/>
<option name="config_write_cull_cell_mask">.true.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down
2 changes: 1 addition & 1 deletion ocean/sub_ice_shelf_2D/5km/with_frazil/config_init2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<option name="config_sub_ice_shelf_2D_vert_levels">100</option>
<option name="config_sub_ice_shelf_2D_temperature">-3.0</option>
<option name="config_write_cull_cell_mask">.false.</option>
<option name="config_use_rx1_constraint">.true.</option>
<option name="config_init_vertical_grid_type">'haney-number'</option>
<option name="config_rx1_max">5.0</option>
</namelist>

Expand Down