From 3310d9cc1176798f36dc6d43461c05b07de0ad8f Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Mon, 9 Jan 2017 12:46:57 -0700 Subject: [PATCH 001/459] Add call to remove land locked cells. --- general.config.ocean | 2 +- .../EC120to60/default/config_init1.xml | 2 ++ .../EC120to60/spin_up/config_init1.xml | 2 ++ .../EC60to30/default/config_init1.xml | 2 ++ .../EC60to30/five_cell/config_init1.xml | 2 ++ .../EC60to30/single_cell/config_init1.xml | 2 ++ .../EC60to30/spin_up/config_init1.xml | 2 ++ .../EC60to30/with_land_ice/config_init1.xml | 2 ++ .../QU120/default/config_init1.xml | 2 ++ .../QU120/ecosys_60_layer/config_init1.xml | 2 ++ .../QU120/with_land_ice/config_init1.xml | 2 ++ .../QU240/analysis_test/config_init1.xml | 2 ++ .../RRS15to5/default/config_init1.xml | 2 ++ .../RRS15to5/spin_up/config_init1.xml | 2 ++ .../RRS18to6/default/config_init1.xml | 2 ++ .../RRS18to6/spin_up/config_init1.xml | 2 ++ .../RRS30to10/default/config_init1.xml | 2 ++ .../RRS30to10/spin_up/config_init1.xml | 2 ++ .../RRS30to10/with_land_ice/config_init1.xml | 2 ++ ocean/global_ocean/init_step1.py | 30 +++++++++++++++---- 20 files changed, 61 insertions(+), 7 deletions(-) diff --git a/general.config.ocean b/general.config.ocean index 6a8342cb18..545b199e64 100644 --- a/general.config.ocean +++ b/general.config.ocean @@ -34,7 +34,6 @@ mask_creator = FULL_PATH_TO_MASK_CREATOR metis = FULL_PATH_TO_METIS mesh_generator = FULL_PATH_TO_EXECUTABLE_MESH_GENERATION_SCRIPT - # The paths section describes paths that are used within the ocean core test # cases. [paths] @@ -47,4 +46,5 @@ mesh_generator = FULL_PATH_TO_EXECUTABLE_MESH_GENERATION_SCRIPT mesh_database = FULL_PATH_TO_LOCAL_MESH_DATABASE initial_condition_database = FULL_PATH_TO_LOCAL_INITIAL_CONDITION_DATABASE geometric_features = FULL_PATH_TO_LOCAL_CHECKOUT_OF_GEOMETRIC_FEATURES_DATABASE +mpas_tools = FULL_PATH_TO_MPAS_TOOLS_REPO mesh_scripts = FULL_PATH_TO_LOCAL_CHECKOUT_OF_MESH_GENERATION_SCRIPTS diff --git a/ocean/global_ocean/EC120to60/default/config_init1.xml b/ocean/global_ocean/EC120to60/default/config_init1.xml index d890ae9cf1..7ae5c7d2a2 100644 --- a/ocean/global_ocean/EC120to60/default/config_init1.xml +++ b/ocean/global_ocean/EC120to60/default/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/EC120to60/spin_up/config_init1.xml b/ocean/global_ocean/EC120to60/spin_up/config_init1.xml index d890ae9cf1..7ae5c7d2a2 100644 --- a/ocean/global_ocean/EC120to60/spin_up/config_init1.xml +++ b/ocean/global_ocean/EC120to60/spin_up/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/EC60to30/default/config_init1.xml b/ocean/global_ocean/EC60to30/default/config_init1.xml index 90055b1901..a988580155 100644 --- a/ocean/global_ocean/EC60to30/default/config_init1.xml +++ b/ocean/global_ocean/EC60to30/default/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/EC60to30/five_cell/config_init1.xml b/ocean/global_ocean/EC60to30/five_cell/config_init1.xml index 65d194874b..792e22d77c 100644 --- a/ocean/global_ocean/EC60to30/five_cell/config_init1.xml +++ b/ocean/global_ocean/EC60to30/five_cell/config_init1.xml @@ -10,6 +10,8 @@ + + diff --git a/ocean/global_ocean/EC60to30/single_cell/config_init1.xml b/ocean/global_ocean/EC60to30/single_cell/config_init1.xml index 9bae29babb..01aeb5304c 100644 --- a/ocean/global_ocean/EC60to30/single_cell/config_init1.xml +++ b/ocean/global_ocean/EC60to30/single_cell/config_init1.xml @@ -10,6 +10,8 @@ + + diff --git a/ocean/global_ocean/EC60to30/spin_up/config_init1.xml b/ocean/global_ocean/EC60to30/spin_up/config_init1.xml index 90055b1901..a988580155 100644 --- a/ocean/global_ocean/EC60to30/spin_up/config_init1.xml +++ b/ocean/global_ocean/EC60to30/spin_up/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/EC60to30/with_land_ice/config_init1.xml b/ocean/global_ocean/EC60to30/with_land_ice/config_init1.xml index d3305bd2ac..4f12f479bf 100644 --- a/ocean/global_ocean/EC60to30/with_land_ice/config_init1.xml +++ b/ocean/global_ocean/EC60to30/with_land_ice/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU120/default/config_init1.xml b/ocean/global_ocean/QU120/default/config_init1.xml index 6a01ca32c9..cbf3d623c8 100644 --- a/ocean/global_ocean/QU120/default/config_init1.xml +++ b/ocean/global_ocean/QU120/default/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU120/ecosys_60_layer/config_init1.xml b/ocean/global_ocean/QU120/ecosys_60_layer/config_init1.xml index 6a01ca32c9..cbf3d623c8 100644 --- a/ocean/global_ocean/QU120/ecosys_60_layer/config_init1.xml +++ b/ocean/global_ocean/QU120/ecosys_60_layer/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU120/with_land_ice/config_init1.xml b/ocean/global_ocean/QU120/with_land_ice/config_init1.xml index b5b77a5fc0..0113f3f62f 100644 --- a/ocean/global_ocean/QU120/with_land_ice/config_init1.xml +++ b/ocean/global_ocean/QU120/with_land_ice/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/analysis_test/config_init1.xml b/ocean/global_ocean/QU240/analysis_test/config_init1.xml index 6abb0d971c..671f8668e6 100644 --- a/ocean/global_ocean/QU240/analysis_test/config_init1.xml +++ b/ocean/global_ocean/QU240/analysis_test/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/RRS15to5/default/config_init1.xml b/ocean/global_ocean/RRS15to5/default/config_init1.xml index a309a31431..9913d76298 100644 --- a/ocean/global_ocean/RRS15to5/default/config_init1.xml +++ b/ocean/global_ocean/RRS15to5/default/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/RRS15to5/spin_up/config_init1.xml b/ocean/global_ocean/RRS15to5/spin_up/config_init1.xml index a309a31431..9913d76298 100644 --- a/ocean/global_ocean/RRS15to5/spin_up/config_init1.xml +++ b/ocean/global_ocean/RRS15to5/spin_up/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/RRS18to6/default/config_init1.xml b/ocean/global_ocean/RRS18to6/default/config_init1.xml index e5afb3d42b..1da47e67e3 100644 --- a/ocean/global_ocean/RRS18to6/default/config_init1.xml +++ b/ocean/global_ocean/RRS18to6/default/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/RRS18to6/spin_up/config_init1.xml b/ocean/global_ocean/RRS18to6/spin_up/config_init1.xml index e5afb3d42b..1da47e67e3 100644 --- a/ocean/global_ocean/RRS18to6/spin_up/config_init1.xml +++ b/ocean/global_ocean/RRS18to6/spin_up/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/RRS30to10/default/config_init1.xml b/ocean/global_ocean/RRS30to10/default/config_init1.xml index e890d8d8f6..e9d2018e96 100644 --- a/ocean/global_ocean/RRS30to10/default/config_init1.xml +++ b/ocean/global_ocean/RRS30to10/default/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml b/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml index e890d8d8f6..e9d2018e96 100644 --- a/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml +++ b/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml b/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml index 7afbf36a93..c4524bf4a4 100644 --- a/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml +++ b/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/init_step1.py b/ocean/global_ocean/init_step1.py index 151b711b96..d379b2fb68 100755 --- a/ocean/global_ocean/init_step1.py +++ b/ocean/global_ocean/init_step1.py @@ -7,11 +7,12 @@ 2. combining transects defining cricial passages.* 3. combining points used to seed a flood fill of the global ocean. 4. create masks from land coverage. -5. create masks from transects.* -6. cull cells based on land coverage but with transects present -7. create flood-fill mask based on seeds -8. cull cells based on flood-fill mask -9. create masks from transects on the final culled mesh* +5. add land-locked cells to land coverage mask. +6. create masks from transects.* +7. cull cells based on land coverage but with transects present +8. create flood-fill mask based on seeds +9. cull cells based on flood-fill mask +10. create masks from transects on the final culled mesh* * skipped if flag --with_critical_passages not present Optionally, the -p flag provides the path to the geometric_features @@ -51,7 +52,6 @@ def removeFile(fileName): 'region.geojson'.format(path) removeFile('land_coverage.geojson') - # mask the land coverage to exclude the region below 60S args = ['{}/difference_features.py'.format(path), '-f', landCoverage, @@ -81,6 +81,15 @@ def removeFile(fileName): print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) +# Add land-locked cells to land coverage mask. +args = ['./add_land_locked_cells_to_mask.py', + '-f', 'land_mask.nc', + '-m', 'base_mesh.nc', + '-l', '43.0', + '-n', '10'] +print "running", ' '.join(args) +subprocess.check_call(args, env=os.environ.copy()) + # create seed points for a flood fill of the ocean # use all points in the ocean directory, on the assumption that they are, in # fact, in the ocean @@ -111,6 +120,15 @@ def removeFile(fileName): print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) + # Alter critical passages to be at least two cells wide, to avoid sea ice + # blockage. + args = ['./widen_transect_edge_masks.py', + '-f', 'critical_passages_mask.nc', + '-m', 'base_mesh.nc', + '-l', '43.0'] + print "running", ' '.join(args) + subprocess.check_call(args, env=os.environ.copy()) + # cull the mesh based on the land mask and keeping critical passages open # Run command is: # ./MpasCellCuller.x base_mesh.nc culled_mesh.nc -m land_mask.nc From 30083f007305b54228fbb6e1c904ec9e72b0b8e2 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Wed, 30 May 2018 14:59:15 -0600 Subject: [PATCH 002/459] Add links to all global cases --- ocean/global_ocean/QU240/default/config_init1.xml | 2 ++ ocean/global_ocean/QU240/performance_test/config_init1.xml | 2 ++ ocean/global_ocean/QU240/restart_test/config_init1.xml | 2 ++ ocean/global_ocean/QU240/rk4_blocks_test/config_init1.xml | 2 ++ ocean/global_ocean/QU240/se_blocks_test/config_init1.xml | 2 ++ ocean/global_ocean/QU240/with_land_ice/config_init1.xml | 2 ++ ocean/global_ocean/QU240/with_land_ice_no_iter/config_init1.xml | 2 ++ ocean/global_ocean/QU240/zstar_128_layers/config_init1.xml | 2 ++ ocean/global_ocean/QU480/default/config_init1.xml | 2 ++ 9 files changed, 18 insertions(+) diff --git a/ocean/global_ocean/QU240/default/config_init1.xml b/ocean/global_ocean/QU240/default/config_init1.xml index 6abb0d971c..671f8668e6 100644 --- a/ocean/global_ocean/QU240/default/config_init1.xml +++ b/ocean/global_ocean/QU240/default/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/performance_test/config_init1.xml b/ocean/global_ocean/QU240/performance_test/config_init1.xml index 6abb0d971c..671f8668e6 100644 --- a/ocean/global_ocean/QU240/performance_test/config_init1.xml +++ b/ocean/global_ocean/QU240/performance_test/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/restart_test/config_init1.xml b/ocean/global_ocean/QU240/restart_test/config_init1.xml index 6abb0d971c..671f8668e6 100644 --- a/ocean/global_ocean/QU240/restart_test/config_init1.xml +++ b/ocean/global_ocean/QU240/restart_test/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/rk4_blocks_test/config_init1.xml b/ocean/global_ocean/QU240/rk4_blocks_test/config_init1.xml index 6abb0d971c..671f8668e6 100644 --- a/ocean/global_ocean/QU240/rk4_blocks_test/config_init1.xml +++ b/ocean/global_ocean/QU240/rk4_blocks_test/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/se_blocks_test/config_init1.xml b/ocean/global_ocean/QU240/se_blocks_test/config_init1.xml index 6abb0d971c..671f8668e6 100644 --- a/ocean/global_ocean/QU240/se_blocks_test/config_init1.xml +++ b/ocean/global_ocean/QU240/se_blocks_test/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/with_land_ice/config_init1.xml b/ocean/global_ocean/QU240/with_land_ice/config_init1.xml index 0d432d5b00..bd24874893 100644 --- a/ocean/global_ocean/QU240/with_land_ice/config_init1.xml +++ b/ocean/global_ocean/QU240/with_land_ice/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/with_land_ice_no_iter/config_init1.xml b/ocean/global_ocean/QU240/with_land_ice_no_iter/config_init1.xml index 0d432d5b00..bd24874893 100644 --- a/ocean/global_ocean/QU240/with_land_ice_no_iter/config_init1.xml +++ b/ocean/global_ocean/QU240/with_land_ice_no_iter/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU240/zstar_128_layers/config_init1.xml b/ocean/global_ocean/QU240/zstar_128_layers/config_init1.xml index 6abb0d971c..671f8668e6 100644 --- a/ocean/global_ocean/QU240/zstar_128_layers/config_init1.xml +++ b/ocean/global_ocean/QU240/zstar_128_layers/config_init1.xml @@ -11,6 +11,8 @@ + + diff --git a/ocean/global_ocean/QU480/default/config_init1.xml b/ocean/global_ocean/QU480/default/config_init1.xml index a3f7f18284..b32066e056 100644 --- a/ocean/global_ocean/QU480/default/config_init1.xml +++ b/ocean/global_ocean/QU480/default/config_init1.xml @@ -11,6 +11,8 @@ + + From 47c5eb4e0757b52b58160c9dddecd0d3bbca4551 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Wed, 30 May 2018 22:25:24 -0600 Subject: [PATCH 003/459] Add critical passages to RRS30to10 --- ocean/global_ocean/RRS30to10/default/config_init1.xml | 1 + ocean/global_ocean/RRS30to10/spin_up/config_init1.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/ocean/global_ocean/RRS30to10/default/config_init1.xml b/ocean/global_ocean/RRS30to10/default/config_init1.xml index e9d2018e96..264a35eed3 100644 --- a/ocean/global_ocean/RRS30to10/default/config_init1.xml +++ b/ocean/global_ocean/RRS30to10/default/config_init1.xml @@ -17,6 +17,7 @@ geometric_features + diff --git a/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml b/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml index e9d2018e96..264a35eed3 100644 --- a/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml +++ b/ocean/global_ocean/RRS30to10/spin_up/config_init1.xml @@ -17,6 +17,7 @@ geometric_features + From 05054009d8f9c04f059cf151b8bf59d913745ae3 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Thu, 31 May 2018 07:56:18 -0600 Subject: [PATCH 004/459] Add critical passages to RRS30to10wLI --- ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml b/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml index c4524bf4a4..33efb154e8 100644 --- a/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml +++ b/ocean/global_ocean/RRS30to10/with_land_ice/config_init1.xml @@ -18,6 +18,7 @@ geometric_features + From ec4c66a726fd1651fb6d1408cf3200ffe0155816 Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Sat, 2 Jun 2018 15:44:46 -0600 Subject: [PATCH 005/459] Change "add landlocked cells" script to not overwrite For long init runs like RRS18to6, it's important to have input and output files, rather than overwriting, because the process will often get killed halfway through. Also, change max number sweeps to 20 for RRS18to6. --- ocean/global_ocean/init_step1.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ocean/global_ocean/init_step1.py b/ocean/global_ocean/init_step1.py index d379b2fb68..a89411da76 100755 --- a/ocean/global_ocean/init_step1.py +++ b/ocean/global_ocean/init_step1.py @@ -52,7 +52,7 @@ def removeFile(fileName): 'region.geojson'.format(path) removeFile('land_coverage.geojson') -# mask the land coverage to exclude the region below 60S +# Mask the land coverage to exclude the region below 60S. args = ['{}/difference_features.py'.format(path), '-f', landCoverage, '-m', landCoverageMask, @@ -60,7 +60,7 @@ def removeFile(fileName): print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) -# add the appropriate land coverage below 60S (either all ice or grounded ice) +# Add the appropriate land coverage below 60S (either all ice or grounded ice). if options.with_cavities: antarcticLandCoverage = '{}/bedmap2/region/AntarcticGroundedIceCoverage/' \ 'region.geojson'.format(path) @@ -73,20 +73,21 @@ def removeFile(fileName): print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) -# create the land mask based on the land coverage +# Create the land mask based on the land coverage, i.e. coastline data. # Run command is: # ./MpasMaskCreator.x base_mesh.nc land_mask.nc -f land_coverage.geojson -args = ['./MpasMaskCreator.x', 'base_mesh.nc', 'land_mask.nc', +args = ['./MpasMaskCreator.x', 'base_mesh.nc', 'land_mask_1_from_land_coverage.nc', '-f', 'land_coverage.geojson'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) # Add land-locked cells to land coverage mask. args = ['./add_land_locked_cells_to_mask.py', - '-f', 'land_mask.nc', + '-f', 'land_mask_1_from_land_coverage.nc', + '-o', 'land_mask_final.nc', '-m', 'base_mesh.nc', '-l', '43.0', - '-n', '10'] + '-n', '20'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) @@ -129,21 +130,21 @@ def removeFile(fileName): print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) - # cull the mesh based on the land mask and keeping critical passages open + # Cull the mesh based on the land mask while keeping critical passages open # Run command is: - # ./MpasCellCuller.x base_mesh.nc culled_mesh.nc -m land_mask.nc + # ./MpasCellCuller.x base_mesh.nc culled_mesh.nc -m land_mask_final.nc # -p critical_passages_mask.nc args = ['./MpasCellCuller.x', 'base_mesh.nc', 'culled_mesh.nc', - '-m', 'land_mask.nc', '-p', 'critical_passages_mask.nc'] + '-m', 'land_mask_final.nc', '-p', 'critical_passages_mask.nc'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) else: # cull the mesh based on the land mask # Run command is: - # ./MpasCellCuller.x base_mesh.nc culled_mesh.nc -m land_mask.nc + # ./MpasCellCuller.x base_mesh.nc culled_mesh.nc -m land_mask_final.nc args = ['./MpasCellCuller.x', 'base_mesh.nc', 'culled_mesh.nc', - '-m', 'land_mask.nc'] + '-m', 'land_mask_final.nc'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) From a8eae8cb1652c5159391405f6af76c9cb3eea2dc Mon Sep 17 00:00:00 2001 From: Mark Petersen Date: Mon, 9 Jan 2017 12:46:57 -0700 Subject: [PATCH 006/459] Add mesh generation from jigsaw into Compass. --- general.config.ocean | 25 +- .../QU10/init/config_base_mesh.xml | 21 ++ .../QU10/init/config_culled_mesh.xml | 1 + .../global_ocean/QU10/init/config_driver.xml | 1 + .../global_ocean/QU10/init/config_forward.xml | 39 +++ .../QU10/init/config_initial_state.xml | 1 + .../QU10/init/define_base_mesh.py | 20 ++ .../QU10/spin_up/config_driver.xml | 28 ++ .../QU10/spin_up/config_forward.xml | 51 +++ .../QU10/spin_up/config_spin_up1.xml | 50 +++ .../QU10/spin_up/config_spin_up2.xml | 55 +++ .../QU10/spin_up/config_spin_up3.xml | 54 +++ .../QU10/spin_up/config_spin_up4.xml | 54 +++ ocean/global_ocean/QU10/template_forward.xml | 9 + .../QU120/init/config_base_mesh.xml | 21 ++ .../QU120/init/config_culled_mesh.xml | 1 + .../global_ocean/QU120/init/config_driver.xml | 1 + .../QU120/init/config_forward.xml | 39 +++ .../QU120/init/config_initial_state.xml | 1 + .../QU120/init/define_base_mesh.py | 20 ++ .../QU15/init/config_base_mesh.xml | 21 ++ .../QU15/init/config_culled_mesh.xml | 1 + .../global_ocean/QU15/init/config_driver.xml | 1 + .../global_ocean/QU15/init/config_forward.xml | 39 +++ .../QU15/init/config_initial_state.xml | 1 + .../QU15/init/define_base_mesh.py | 20 ++ .../QU15/spin_up/config_driver.xml | 22 ++ .../QU15/spin_up/config_forward.xml | 51 +++ .../QU15/spin_up/config_spin_up1.xml | 50 +++ .../QU15/spin_up/config_spin_up2.xml | 55 +++ .../QU15/spin_up/config_spin_up3.xml | 54 +++ .../QU15/spin_up/config_spin_up4.xml | 54 +++ ocean/global_ocean/QU15/template_forward.xml | 9 + .../QU240/init/config_base_mesh.xml | 21 ++ .../QU240/init/config_culled_mesh.xml | 1 + .../global_ocean/QU240/init/config_driver.xml | 1 + .../QU240/init/config_forward.xml | 39 +++ .../QU240/init/config_initial_state.xml | 1 + .../QU240/init/define_base_mesh.py | 20 ++ .../QU30/init/config_base_mesh.xml | 21 ++ .../QU30/init/config_culled_mesh.xml | 1 + .../global_ocean/QU30/init/config_driver.xml | 1 + .../global_ocean/QU30/init/config_forward.xml | 39 +++ .../QU30/init/config_initial_state.xml | 1 + .../QU30/init/define_base_mesh.py | 20 ++ .../QU30/spin_up/config_driver.xml | 13 + .../QU30/spin_up/config_forward.xml | 48 +++ .../QU30/spin_up/config_spin_up1.xml | 49 +++ ocean/global_ocean/QU30/template_forward.xml | 11 + .../QU6/init/config_base_mesh.xml | 21 ++ .../QU6/init/config_culled_mesh.xml | 1 + ocean/global_ocean/QU6/init/config_driver.xml | 1 + .../global_ocean/QU6/init/config_forward.xml | 39 +++ .../QU6/init/config_initial_state.xml | 1 + .../global_ocean/QU6/init/define_base_mesh.py | 20 ++ .../QU6/spin_up/config_driver.xml | 22 ++ .../QU6/spin_up/config_forward.xml | 51 +++ .../QU6/spin_up/config_spin_up1.xml | 50 +++ .../QU6/spin_up/config_spin_up2.xml | 54 +++ .../QU6/spin_up/config_spin_up3.xml | 54 +++ .../QU6/spin_up/config_spin_up4.xml | 54 +++ ocean/global_ocean/QU6/template_forward.xml | 11 + .../QU60/init/config_base_mesh.xml | 21 ++ .../QU60/init/config_culled_mesh.xml | 1 + .../global_ocean/QU60/init/config_driver.xml | 1 + .../global_ocean/QU60/init/config_forward.xml | 39 +++ .../QU60/init/config_initial_state.xml | 1 + .../QU60/init/define_base_mesh.py | 20 ++ .../QU60/spin_up/config_driver.xml | 13 + .../QU60/spin_up/config_forward.xml | 48 +++ .../QU60/spin_up/config_spin_up1.xml | 49 +++ ocean/global_ocean/QU60/template_forward.xml | 11 + .../SOQU240to120/init/config_base_mesh.xml | 21 ++ .../SOQU240to120/init/config_culled_mesh.xml | 1 + .../SOQU240to120/init/config_driver.xml | 1 + .../SOQU240to120/init/config_forward.xml | 39 +++ .../init/config_initial_state.xml | 1 + .../SOQU240to120/init/define_base_mesh.py | 34 ++ .../SOQU240to120/spin_up/config_driver.xml | 22 ++ .../SOQU240to120/spin_up/config_forward.xml | 51 +++ .../SOQU240to120/spin_up/config_spin_up1.xml | 50 +++ .../SOQU240to120/spin_up/config_spin_up2.xml | 55 +++ .../SOQU240to120/spin_up/config_spin_up3.xml | 54 +++ .../SOQU240to120/spin_up/config_spin_up4.xml | 54 +++ .../SOQU240to120/template_forward.xml | 11 + .../SOQU60to10/init/config_base_mesh.xml | 21 ++ .../SOQU60to10/init/config_culled_mesh.xml | 1 + .../SOQU60to10/init/config_driver.xml | 1 + .../SOQU60to10/init/config_forward.xml | 39 +++ .../SOQU60to10/init/config_initial_state.xml | 1 + .../SOQU60to10/init/define_base_mesh.py | 34 ++ .../SOQU60to10/spin_up/config_driver.xml | 22 ++ .../SOQU60to10/spin_up/config_forward.xml | 51 +++ .../SOQU60to10/spin_up/config_spin_up1.xml | 50 +++ .../SOQU60to10/spin_up/config_spin_up2.xml | 55 +++ .../SOQU60to10/spin_up/config_spin_up3.xml | 54 +++ .../SOQU60to10/spin_up/config_spin_up4.xml | 54 +++ .../SOQU60to10/template_forward.xml | 11 + .../SOQU60to15/init/config_base_mesh.xml | 21 ++ .../SOQU60to15/init/config_culled_mesh.xml | 1 + .../SOQU60to15/init/config_driver.xml | 1 + .../SOQU60to15/init/config_forward.xml | 39 +++ .../SOQU60to15/init/config_initial_state.xml | 1 + .../SOQU60to15/init/define_base_mesh.py | 34 ++ .../SOQU60to15/spin_up/config_driver.xml | 22 ++ .../SOQU60to15/spin_up/config_forward.xml | 51 +++ .../SOQU60to15/spin_up/config_spin_up1.xml | 50 +++ .../SOQU60to15/spin_up/config_spin_up2.xml | 55 +++ .../SOQU60to15/spin_up/config_spin_up3.xml | 54 +++ .../SOQU60to15/spin_up/config_spin_up4.xml | 54 +++ .../SOQU60to15/template_forward.xml | 9 + .../SOQU60to30/init/config_base_mesh.xml | 21 ++ .../SOQU60to30/init/config_culled_mesh.xml | 1 + .../SOQU60to30/init/config_driver.xml | 1 + .../SOQU60to30/init/config_forward.xml | 39 +++ .../SOQU60to30/init/config_initial_state.xml | 1 + .../SOQU60to30/init/define_base_mesh.py | 34 ++ .../SOQU60to30/spin_up/config_driver.xml | 13 + .../SOQU60to30/spin_up/config_forward.xml | 48 +++ .../SOQU60to30/spin_up/config_spin_up1.xml | 49 +++ .../SOQU60to30/template_forward.xml | 11 + .../SOQU60to6/init/config_base_mesh.xml | 21 ++ .../SOQU60to6/init/config_culled_mesh.xml | 1 + .../SOQU60to6/init/config_driver.xml | 1 + .../SOQU60to6/init/config_forward.xml | 39 +++ .../SOQU60to6/init/config_initial_state.xml | 1 + .../SOQU60to6/init/define_base_mesh.py | 34 ++ .../SOQU60to6/spin_up/config_driver.xml | 22 ++ .../SOQU60to6/spin_up/config_forward.xml | 51 +++ .../SOQU60to6/spin_up/config_spin_up1.xml | 50 +++ .../SOQU60to6/spin_up/config_spin_up2.xml | 54 +++ .../SOQU60to6/spin_up/config_spin_up3.xml | 54 +++ .../SOQU60to6/spin_up/config_spin_up4.xml | 54 +++ .../SOQU60to6/template_forward.xml | 11 + .../config_files/config_culled_mesh.xml | 20 ++ .../config_files/config_driver.xml | 19 ++ .../config_files/config_initial_state.xml | 59 ++++ ocean/jigsaw_to_MPAS/build_mesh.py | 76 +++++ .../Arctic60to9_Atl10deg.m | 21 ++ .../Arctic60to9_Atl45deg.m | 21 ++ .../EC60to30.m | 13 + .../QU240.m | 12 + .../test_mesh.m | 54 +++ ocean/jigsaw_to_MPAS/inject_bathymetry.py | 33 ++ ocean/jigsaw_to_MPAS/inject_meshDensity.py | 46 +++ ocean/jigsaw_to_MPAS/jigsaw_driver.m | 46 +++ ocean/jigsaw_to_MPAS/mesh_definition_tools.py | 313 ++++++++++++++++++ .../latitude_1D_grids/EC_CellWidthVsLat.m | 72 ++++ .../latitude_1D_grids/RRS_CellWidthVsLat.m | 29 ++ .../latitude_1D_grids/mergeCellWidthVsLat.m | 46 +++ .../spherical_tools/AtlanticPacificGrid.m | 52 +++ .../spherical_tools/circleOnGrid.m | 31 ++ .../spherical_tools/lldistkm.m | 59 ++++ ocean/jigsaw_to_MPAS/mpas_to_triangle.py | 81 +++++ ocean/jigsaw_to_MPAS/open_msh.py | 88 +++++ .../triangle_jigsaw_to_netcdf.py | 281 ++++++++++++++++ 156 files changed, 4990 insertions(+), 13 deletions(-) create mode 100644 ocean/global_ocean/QU10/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/QU10/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/QU10/init/config_driver.xml create mode 100644 ocean/global_ocean/QU10/init/config_forward.xml create mode 120000 ocean/global_ocean/QU10/init/config_initial_state.xml create mode 100755 ocean/global_ocean/QU10/init/define_base_mesh.py create mode 100644 ocean/global_ocean/QU10/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/QU10/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/QU10/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/QU10/spin_up/config_spin_up2.xml create mode 100644 ocean/global_ocean/QU10/spin_up/config_spin_up3.xml create mode 100644 ocean/global_ocean/QU10/spin_up/config_spin_up4.xml create mode 100644 ocean/global_ocean/QU10/template_forward.xml create mode 100644 ocean/global_ocean/QU120/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/QU120/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/QU120/init/config_driver.xml create mode 100644 ocean/global_ocean/QU120/init/config_forward.xml create mode 120000 ocean/global_ocean/QU120/init/config_initial_state.xml create mode 100755 ocean/global_ocean/QU120/init/define_base_mesh.py create mode 100644 ocean/global_ocean/QU15/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/QU15/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/QU15/init/config_driver.xml create mode 100644 ocean/global_ocean/QU15/init/config_forward.xml create mode 120000 ocean/global_ocean/QU15/init/config_initial_state.xml create mode 100755 ocean/global_ocean/QU15/init/define_base_mesh.py create mode 100644 ocean/global_ocean/QU15/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/QU15/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/QU15/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/QU15/spin_up/config_spin_up2.xml create mode 100644 ocean/global_ocean/QU15/spin_up/config_spin_up3.xml create mode 100644 ocean/global_ocean/QU15/spin_up/config_spin_up4.xml create mode 100644 ocean/global_ocean/QU15/template_forward.xml create mode 100644 ocean/global_ocean/QU240/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/QU240/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/QU240/init/config_driver.xml create mode 100644 ocean/global_ocean/QU240/init/config_forward.xml create mode 120000 ocean/global_ocean/QU240/init/config_initial_state.xml create mode 100755 ocean/global_ocean/QU240/init/define_base_mesh.py create mode 100644 ocean/global_ocean/QU30/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/QU30/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/QU30/init/config_driver.xml create mode 100644 ocean/global_ocean/QU30/init/config_forward.xml create mode 120000 ocean/global_ocean/QU30/init/config_initial_state.xml create mode 100755 ocean/global_ocean/QU30/init/define_base_mesh.py create mode 100644 ocean/global_ocean/QU30/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/QU30/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/QU30/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/QU30/template_forward.xml create mode 100644 ocean/global_ocean/QU6/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/QU6/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/QU6/init/config_driver.xml create mode 100644 ocean/global_ocean/QU6/init/config_forward.xml create mode 120000 ocean/global_ocean/QU6/init/config_initial_state.xml create mode 100755 ocean/global_ocean/QU6/init/define_base_mesh.py create mode 100644 ocean/global_ocean/QU6/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/QU6/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/QU6/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/QU6/spin_up/config_spin_up2.xml create mode 100644 ocean/global_ocean/QU6/spin_up/config_spin_up3.xml create mode 100644 ocean/global_ocean/QU6/spin_up/config_spin_up4.xml create mode 100644 ocean/global_ocean/QU6/template_forward.xml create mode 100644 ocean/global_ocean/QU60/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/QU60/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/QU60/init/config_driver.xml create mode 100644 ocean/global_ocean/QU60/init/config_forward.xml create mode 120000 ocean/global_ocean/QU60/init/config_initial_state.xml create mode 100755 ocean/global_ocean/QU60/init/define_base_mesh.py create mode 100644 ocean/global_ocean/QU60/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/QU60/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/QU60/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/QU60/template_forward.xml create mode 100644 ocean/global_ocean/SOQU240to120/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/SOQU240to120/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/SOQU240to120/init/config_driver.xml create mode 100644 ocean/global_ocean/SOQU240to120/init/config_forward.xml create mode 120000 ocean/global_ocean/SOQU240to120/init/config_initial_state.xml create mode 100755 ocean/global_ocean/SOQU240to120/init/define_base_mesh.py create mode 100644 ocean/global_ocean/SOQU240to120/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/SOQU240to120/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/SOQU240to120/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/SOQU240to120/spin_up/config_spin_up2.xml create mode 100644 ocean/global_ocean/SOQU240to120/spin_up/config_spin_up3.xml create mode 100644 ocean/global_ocean/SOQU240to120/spin_up/config_spin_up4.xml create mode 100644 ocean/global_ocean/SOQU240to120/template_forward.xml create mode 100644 ocean/global_ocean/SOQU60to10/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to10/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to10/init/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to10/init/config_forward.xml create mode 120000 ocean/global_ocean/SOQU60to10/init/config_initial_state.xml create mode 100755 ocean/global_ocean/SOQU60to10/init/define_base_mesh.py create mode 100644 ocean/global_ocean/SOQU60to10/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to10/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/SOQU60to10/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/SOQU60to10/spin_up/config_spin_up2.xml create mode 100644 ocean/global_ocean/SOQU60to10/spin_up/config_spin_up3.xml create mode 100644 ocean/global_ocean/SOQU60to10/spin_up/config_spin_up4.xml create mode 100644 ocean/global_ocean/SOQU60to10/template_forward.xml create mode 100644 ocean/global_ocean/SOQU60to15/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to15/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to15/init/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to15/init/config_forward.xml create mode 120000 ocean/global_ocean/SOQU60to15/init/config_initial_state.xml create mode 100755 ocean/global_ocean/SOQU60to15/init/define_base_mesh.py create mode 100644 ocean/global_ocean/SOQU60to15/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to15/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/SOQU60to15/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/SOQU60to15/spin_up/config_spin_up2.xml create mode 100644 ocean/global_ocean/SOQU60to15/spin_up/config_spin_up3.xml create mode 100644 ocean/global_ocean/SOQU60to15/spin_up/config_spin_up4.xml create mode 100644 ocean/global_ocean/SOQU60to15/template_forward.xml create mode 100644 ocean/global_ocean/SOQU60to30/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to30/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to30/init/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to30/init/config_forward.xml create mode 120000 ocean/global_ocean/SOQU60to30/init/config_initial_state.xml create mode 100755 ocean/global_ocean/SOQU60to30/init/define_base_mesh.py create mode 100644 ocean/global_ocean/SOQU60to30/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to30/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/SOQU60to30/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/SOQU60to30/template_forward.xml create mode 100644 ocean/global_ocean/SOQU60to6/init/config_base_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to6/init/config_culled_mesh.xml create mode 120000 ocean/global_ocean/SOQU60to6/init/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to6/init/config_forward.xml create mode 120000 ocean/global_ocean/SOQU60to6/init/config_initial_state.xml create mode 100755 ocean/global_ocean/SOQU60to6/init/define_base_mesh.py create mode 100644 ocean/global_ocean/SOQU60to6/spin_up/config_driver.xml create mode 100644 ocean/global_ocean/SOQU60to6/spin_up/config_forward.xml create mode 100644 ocean/global_ocean/SOQU60to6/spin_up/config_spin_up1.xml create mode 100644 ocean/global_ocean/SOQU60to6/spin_up/config_spin_up2.xml create mode 100644 ocean/global_ocean/SOQU60to6/spin_up/config_spin_up3.xml create mode 100644 ocean/global_ocean/SOQU60to6/spin_up/config_spin_up4.xml create mode 100644 ocean/global_ocean/SOQU60to6/template_forward.xml create mode 100644 ocean/global_ocean/config_files/config_culled_mesh.xml create mode 100644 ocean/global_ocean/config_files/config_driver.xml create mode 100644 ocean/global_ocean/config_files/config_initial_state.xml create mode 100755 ocean/jigsaw_to_MPAS/build_mesh.py create mode 100644 ocean/jigsaw_to_MPAS/define_mesh_to_be_moved_and_deleted/Arctic60to9_Atl10deg.m create mode 100644 ocean/jigsaw_to_MPAS/define_mesh_to_be_moved_and_deleted/Arctic60to9_Atl45deg.m create mode 100644 ocean/jigsaw_to_MPAS/define_mesh_to_be_moved_and_deleted/EC60to30.m create mode 100644 ocean/jigsaw_to_MPAS/define_mesh_to_be_moved_and_deleted/QU240.m create mode 100644 ocean/jigsaw_to_MPAS/define_mesh_to_be_moved_and_deleted/test_mesh.m create mode 100755 ocean/jigsaw_to_MPAS/inject_bathymetry.py create mode 100755 ocean/jigsaw_to_MPAS/inject_meshDensity.py create mode 100755 ocean/jigsaw_to_MPAS/jigsaw_driver.m create mode 100755 ocean/jigsaw_to_MPAS/mesh_definition_tools.py create mode 100644 ocean/jigsaw_to_MPAS/mesh_definition_tools_to_be_moved_and_deleted/latitude_1D_grids/EC_CellWidthVsLat.m create mode 100644 ocean/jigsaw_to_MPAS/mesh_definition_tools_to_be_moved_and_deleted/latitude_1D_grids/RRS_CellWidthVsLat.m create mode 100644 ocean/jigsaw_to_MPAS/mesh_definition_tools_to_be_moved_and_deleted/latitude_1D_grids/mergeCellWidthVsLat.m create mode 100644 ocean/jigsaw_to_MPAS/mesh_definition_tools_to_be_moved_and_deleted/spherical_tools/AtlanticPacificGrid.m create mode 100644 ocean/jigsaw_to_MPAS/mesh_definition_tools_to_be_moved_and_deleted/spherical_tools/circleOnGrid.m create mode 100644 ocean/jigsaw_to_MPAS/mesh_definition_tools_to_be_moved_and_deleted/spherical_tools/lldistkm.m create mode 100755 ocean/jigsaw_to_MPAS/mpas_to_triangle.py create mode 100755 ocean/jigsaw_to_MPAS/open_msh.py create mode 100755 ocean/jigsaw_to_MPAS/triangle_jigsaw_to_netcdf.py diff --git a/general.config.ocean b/general.config.ocean index 545b199e64..f73a521739 100644 --- a/general.config.ocean +++ b/general.config.ocean @@ -9,29 +9,27 @@ # init namelists in the default_inputs directory after a successful build of # the ocean model. [namelists] -forward = FULL_PATH_TO_FORWARD_TEMPLATE_NAMELIST -init = FULL_PATH_TO_INIT_TEMPLATE_NAMELIST - +forward = FULL_PATH_TO_MPAS_MODEL_REPO/namelist.ocean.forward +init = FULL_PATH_TO_MPAS_MODEL_REPO/namelist.ocean.init # The streams section defines paths to template streams files that will be used # to generate specific streams files. Typically these will point to the forward and # init streams files in the default_inputs directory after a successful build of # the ocean model. [streams] -forward = FULL_PATH_TO_FORWARD_TEMPLATE_STREAMS -init = FULL_PATH_TO_INIT_TEMPLATE_STREAMS - +forward = FULL_PATH_TO_MPAS_MODEL_REPO/streams.ocean.forward +init = FULL_PATH_TO_MPAS_MODEL_REPO/streams.ocean.init # The executables section defines paths to required executables. These # executables are provided for use by specific test cases. # Full paths should be provided in order to access the executables from # anywhere on the machine. [executables] -model = FULL_PATH_TO_MODEL -mesh_converter = FULL_PATH_TO_MESH_CONVERTER -cell_culler = FULL_PATH_TO_CELL_CULLER -mask_creator = FULL_PATH_TO_MASK_CREATOR +model = FULL_PATH_TO_MPAS_MODEL_REPO/ocean_model metis = FULL_PATH_TO_METIS +mesh_converter = FULL_PATH_TO_MPAS_TOOLS_REPO/mesh_tools/mesh_conversion_tools/mpas_mesh_converter.x +cell_culler = FULL_PATH_TO_MPAS_TOOLS_REPO/mesh_tools/mesh_conversion_tools/mpas_mesh_culler.x +mask_creator = FULL_PATH_TO_MPAS_TOOLS_REPO/mesh_tools/mesh_conversion_tools/mpas_mesh_creator.x mesh_generator = FULL_PATH_TO_EXECUTABLE_MESH_GENERATION_SCRIPT # The paths section describes paths that are used within the ocean core test @@ -43,8 +41,9 @@ mesh_generator = FULL_PATH_TO_EXECUTABLE_MESH_GENERATION_SCRIPT # the same directory, or different directory. Additionally, if they are empty # some test cases might download data into them, which will then be reused if # the test case is run again later. +mpas_model = FULL_PATH_TO_MPAS_MODEL_REPO +mpas_tools = FULL_PATH_TO_MPAS_TOOLS_REPO +geometric_features = FULL_PATH_TO_LOCAL_CHECKOUT_OF_GEOMETRIC_FEATURES_REPO +jigsaw-geo-matlab = FULL_PATH_TO_JIGSAW_REPO mesh_database = FULL_PATH_TO_LOCAL_MESH_DATABASE initial_condition_database = FULL_PATH_TO_LOCAL_INITIAL_CONDITION_DATABASE -geometric_features = FULL_PATH_TO_LOCAL_CHECKOUT_OF_GEOMETRIC_FEATURES_DATABASE -mpas_tools = FULL_PATH_TO_MPAS_TOOLS_REPO -mesh_scripts = FULL_PATH_TO_LOCAL_CHECKOUT_OF_MESH_GENERATION_SCRIPTS diff --git a/ocean/global_ocean/QU10/init/config_base_mesh.xml b/ocean/global_ocean/QU10/init/config_base_mesh.xml new file mode 100644 index 0000000000..da4a4cbd31 --- /dev/null +++ b/ocean/global_ocean/QU10/init/config_base_mesh.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ocean/global_ocean/QU10/init/config_culled_mesh.xml b/ocean/global_ocean/QU10/init/config_culled_mesh.xml new file mode 120000 index 0000000000..9c49ba6246 --- /dev/null +++ b/ocean/global_ocean/QU10/init/config_culled_mesh.xml @@ -0,0 +1 @@ +../../config_files/config_culled_mesh.xml \ No newline at end of file diff --git a/ocean/global_ocean/QU10/init/config_driver.xml b/ocean/global_ocean/QU10/init/config_driver.xml new file mode 120000 index 0000000000..541fb6e756 --- /dev/null +++ b/ocean/global_ocean/QU10/init/config_driver.xml @@ -0,0 +1 @@ +../../config_files/config_driver.xml \ No newline at end of file diff --git a/ocean/global_ocean/QU10/init/config_forward.xml b/ocean/global_ocean/QU10/init/config_forward.xml new file mode 100644 index 0000000000..105330a762 --- /dev/null +++ b/ocean/global_ocean/QU10/init/config_forward.xml @@ -0,0 +1,39 @@ + + + + + + + + + +