diff --git a/src/core_ocean/mode_init/Registry_global_ocean.xml b/src/core_ocean/mode_init/Registry_global_ocean.xml index 03f4418034..c6422db842 100644 --- a/src/core_ocean/mode_init/Registry_global_ocean.xml +++ b/src/core_ocean/mode_init/Registry_global_ocean.xml @@ -11,15 +11,15 @@ description="Minimum depth where column contains all water-filled cells. The first layer with refBottomDepth greater than this value is included in whole, i.e. no partial bottom cells are used in this layer." possible_values="Any positive real value greater than 0, but typically greater than 10 m." /> - - - diff --git a/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/config_initial_state.xml index 708f1da2f9..5c7c5154d7 120000 --- a/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/config_initial_state.xml +++ b/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/config_initial_state.xml @@ -1 +1 @@ -../../config_files/config_initial_state_60_layers.xml \ No newline at end of file +../../config_files/config_initial_state.xml \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/config_initial_state_60_layers.xml new file mode 120000 index 0000000000..708f1da2f9 --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/config_initial_state_60_layers.xml @@ -0,0 +1 @@ +../../config_files/config_initial_state_60_layers.xml \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/define_vertical_grid.py b/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/define_vertical_grid.py new file mode 120000 index 0000000000..4e1cac8e2b --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/ARM60to10/init/define_vertical_grid.py @@ -0,0 +1 @@ +../../../scripts/vertical_grid/define_vertical_grid_64_layers.py \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/config_initial_state.xml index 708f1da2f9..5c7c5154d7 120000 --- a/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/config_initial_state.xml +++ b/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/config_initial_state.xml @@ -1 +1 @@ -../../config_files/config_initial_state_60_layers.xml \ No newline at end of file +../../config_files/config_initial_state.xml \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/config_initial_state_60_layers.xml new file mode 120000 index 0000000000..708f1da2f9 --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/config_initial_state_60_layers.xml @@ -0,0 +1 @@ +../../config_files/config_initial_state_60_layers.xml \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/define_vertical_grid.py b/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/define_vertical_grid.py new file mode 120000 index 0000000000..4e1cac8e2b --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/ARM60to6/init/define_vertical_grid.py @@ -0,0 +1 @@ +../../../scripts/vertical_grid/define_vertical_grid_64_layers.py \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_initial_state_60_layers.xml new file mode 120000 index 0000000000..708f1da2f9 --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/config_initial_state_60_layers.xml @@ -0,0 +1 @@ +../../config_files/config_initial_state_60_layers.xml \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_vertical_grid.py b/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_vertical_grid.py new file mode 120000 index 0000000000..4e1cac8e2b --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/CUSP12/init/define_vertical_grid.py @@ -0,0 +1 @@ +../../../scripts/vertical_grid/define_vertical_grid_64_layers.py \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP8/init/config_initial_state_60_layers.xml b/testing_and_setup/compass/ocean/global_ocean/CUSP8/init/config_initial_state_60_layers.xml new file mode 120000 index 0000000000..708f1da2f9 --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/CUSP8/init/config_initial_state_60_layers.xml @@ -0,0 +1 @@ +../../config_files/config_initial_state_60_layers.xml \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/CUSP8/init/define_vertical_grid.py b/testing_and_setup/compass/ocean/global_ocean/CUSP8/init/define_vertical_grid.py new file mode 120000 index 0000000000..4e1cac8e2b --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/CUSP8/init/define_vertical_grid.py @@ -0,0 +1 @@ +../../../scripts/vertical_grid/define_vertical_grid_64_layers.py \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/EC60to30/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/EC60to30/init/config_initial_state.xml deleted file mode 100644 index 87c01a0c1c..0000000000 --- a/testing_and_setup/compass/ocean/global_ocean/EC60to30/init/config_initial_state.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -