diff --git a/test_cases/ocean/ocean/baroclinic_channel/10km/decomp_test/config_init1.xml b/test_cases/ocean/ocean/baroclinic_channel/10km/decomp_test/config_init1.xml index aefd192a95..e9a9ce1c9c 100644 --- a/test_cases/ocean/ocean/baroclinic_channel/10km/decomp_test/config_init1.xml +++ b/test_cases/ocean/ocean/baroclinic_channel/10km/decomp_test/config_init1.xml @@ -50,14 +50,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/baroclinic_channel/10km/default/config_init1.xml b/test_cases/ocean/ocean/baroclinic_channel/10km/default/config_init1.xml index aefd192a95..e9a9ce1c9c 100644 --- a/test_cases/ocean/ocean/baroclinic_channel/10km/default/config_init1.xml +++ b/test_cases/ocean/ocean/baroclinic_channel/10km/default/config_init1.xml @@ -50,14 +50,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/baroclinic_channel/10km/restart_test/config_init1.xml b/test_cases/ocean/ocean/baroclinic_channel/10km/restart_test/config_init1.xml index aefd192a95..e9a9ce1c9c 100644 --- a/test_cases/ocean/ocean/baroclinic_channel/10km/restart_test/config_init1.xml +++ b/test_cases/ocean/ocean/baroclinic_channel/10km/restart_test/config_init1.xml @@ -50,14 +50,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/baroclinic_channel/10km/threads_test/config_init1.xml b/test_cases/ocean/ocean/baroclinic_channel/10km/threads_test/config_init1.xml index aefd192a95..e9a9ce1c9c 100644 --- a/test_cases/ocean/ocean/baroclinic_channel/10km/threads_test/config_init1.xml +++ b/test_cases/ocean/ocean/baroclinic_channel/10km/threads_test/config_init1.xml @@ -50,14 +50,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/global_ocean/EC_60to30km/default/config_init1.xml b/test_cases/ocean/ocean/global_ocean/EC_60to30km/default/config_init1.xml index 90055b1901..0e7a85cefe 100644 --- a/test_cases/ocean/ocean/global_ocean/EC_60to30km/default/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/EC_60to30km/default/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/EC_60to30km/spin_up/config_init1.xml b/test_cases/ocean/ocean/global_ocean/EC_60to30km/spin_up/config_init1.xml index 90055b1901..0e7a85cefe 100644 --- a/test_cases/ocean/ocean/global_ocean/EC_60to30km/spin_up/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/EC_60to30km/spin_up/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/EC_60to30km/with_land_ice/config_init1.xml b/test_cases/ocean/ocean/global_ocean/EC_60to30km/with_land_ice/config_init1.xml index d3305bd2ac..f9d12f2348 100644 --- a/test_cases/ocean/ocean/global_ocean/EC_60to30km/with_land_ice/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/EC_60to30km/with_land_ice/config_init1.xml @@ -15,8 +15,8 @@ geometric_features - - + --with_cavities + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_120km/default/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_120km/default/config_init1.xml index 6a01ca32c9..3a6e1d727c 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_120km/default/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_120km/default/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_120km/ecosys_60_layer/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_120km/ecosys_60_layer/config_init1.xml index 6a01ca32c9..3a6e1d727c 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_120km/ecosys_60_layer/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_120km/ecosys_60_layer/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_120km/with_land_ice/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_120km/with_land_ice/config_init1.xml index b5b77a5fc0..b742fd9ffa 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_120km/with_land_ice/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_120km/with_land_ice/config_init1.xml @@ -15,8 +15,8 @@ geometric_features - - + --with_cavities + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/analysis_test/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/analysis_test/config_init1.xml index 6abb0d971c..d350fff741 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/analysis_test/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/analysis_test/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/default/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/default/config_init1.xml index 6abb0d971c..d350fff741 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/default/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/default/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/performance_test/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/performance_test/config_init1.xml index 6abb0d971c..d350fff741 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/performance_test/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/performance_test/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/restart_test/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/restart_test/config_init1.xml index 6abb0d971c..d350fff741 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/restart_test/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/restart_test/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/rk4_blocks_test/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/rk4_blocks_test/config_init1.xml index 6abb0d971c..d350fff741 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/rk4_blocks_test/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/rk4_blocks_test/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/se_blocks_test/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/se_blocks_test/config_init1.xml index 6abb0d971c..d350fff741 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/se_blocks_test/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/se_blocks_test/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice/config_init1.xml index 0d432d5b00..136fd273a2 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice/config_init1.xml @@ -15,8 +15,8 @@ geometric_features - - + --with_cavities + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice_no_iter/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice_no_iter/config_init1.xml index 0d432d5b00..136fd273a2 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice_no_iter/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/with_land_ice_no_iter/config_init1.xml @@ -15,8 +15,8 @@ geometric_features - - + --with_cavities + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_240km/zstar_128_layers/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_240km/zstar_128_layers/config_init1.xml index 6abb0d971c..d350fff741 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_240km/zstar_128_layers/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_240km/zstar_128_layers/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/QU_480km/default/config_init1.xml b/test_cases/ocean/ocean/global_ocean/QU_480km/default/config_init1.xml index a3f7f18284..79e15581e9 100644 --- a/test_cases/ocean/ocean/global_ocean/QU_480km/default/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/QU_480km/default/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_critical_passages diff --git a/test_cases/ocean/ocean/global_ocean/RRS_30to10km/with_land_ice/config_init1.xml b/test_cases/ocean/ocean/global_ocean/RRS_30to10km/with_land_ice/config_init1.xml index 7afbf36a93..6a7d5bc676 100644 --- a/test_cases/ocean/ocean/global_ocean/RRS_30to10km/with_land_ice/config_init1.xml +++ b/test_cases/ocean/ocean/global_ocean/RRS_30to10km/with_land_ice/config_init1.xml @@ -15,7 +15,7 @@ geometric_features - + --with_cavities diff --git a/test_cases/ocean/ocean/global_ocean/init_step1.py b/test_cases/ocean/ocean/global_ocean/init_step1.py index 3f33079d67..3750def177 100755 --- a/test_cases/ocean/ocean/global_ocean/init_step1.py +++ b/test_cases/ocean/ocean/global_ocean/init_step1.py @@ -65,8 +65,8 @@ # create the land mask based on the land coverage # Run command is: -# ./MpasMaskCreator.x base_mesh.nc land_mask.nc -f land_coverage.geojson -subprocess.check_call(['./MpasMaskCreator.x', 'base_mesh.nc', 'land_mask.nc', +# ./MpasMaskCreator.x -i base_mesh.nc -o land_mask.nc -f land_coverage.geojson +subprocess.check_call(['./MpasMaskCreator.x', '-i', 'base_mesh.nc', '-o', 'land_mask.nc', '-f', 'land_coverage.geojson'], env=os.environ.copy()) # create seed points for a flood fill of the ocean @@ -91,8 +91,8 @@ # create masks from the transects # Run command is: - # ./MpasMaskCreator.x base_mesh.nc critical_passages_mask.nc -f critical_passages.geojson - args = ['./MpasMaskCreator.x', 'base_mesh.nc', 'critical_passages_mask.nc', + # ./MpasMaskCreator.x -i base_mesh.nc -o critical_passages_mask.nc -f critical_passages.geojson + args = ['./MpasMaskCreator.x', '-i', 'base_mesh.nc', '-o', 'critical_passages_mask.nc', '-f', 'critical_passages.geojson'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) @@ -100,8 +100,8 @@ # 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 -p critical_passages_mask.nc - args = ['./MpasCellCuller.x', 'base_mesh.nc', 'culled_mesh.nc', + # ./MpasCellCuller.x -i base_mesh.nc -o culled_mesh.nc -m land_mask.nc -p critical_passages_mask.nc + args = ['./MpasCellCuller.x', '-i', 'base_mesh.nc', '-o', 'culled_mesh.nc', '-m', 'land_mask.nc', '-p', 'critical_passages_mask.nc'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) @@ -109,16 +109,16 @@ # cull the mesh based on the land mask # Run command is: - # ./MpasCellCuller.x base_mesh.nc culled_mesh.nc -m land_mask.nc - args = ['./MpasCellCuller.x', 'base_mesh.nc', 'culled_mesh.nc', + # ./MpasCellCuller.x -i base_mesh.nc -o culled_mesh.nc -m land_mask.nc + args = ['./MpasCellCuller.x', '-i', 'base_mesh.nc', '-o', 'culled_mesh.nc', '-m', 'land_mask.nc'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) # create a mask for the flood fill seed points # Run command is: -# ./MpasMaskCreator.x culled_mesh.nc seed_mask.nc -s seed_points.geojson -args = ['./MpasMaskCreator.x', 'culled_mesh.nc', 'seed_mask.nc', +# ./MpasMaskCreator.x -i culled_mesh.nc -o seed_mask.nc -s seed_points.geojson +args = ['./MpasMaskCreator.x', '-i', 'culled_mesh.nc', '-o', 'seed_mask.nc', '-s', 'seed_points.geojson'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) @@ -126,9 +126,9 @@ # cull the mesh a second time using a flood fill from the seed points # Run command is: -# ./MpasCellCuller.x culled_mesh.nc culled_mesh_final.nc -i seed_mask.nc -args = ['./MpasCellCuller.x', 'culled_mesh.nc', 'culled_mesh_final.nc', - '-i', 'seed_mask.nc'] +# ./MpasCellCuller.x -i culled_mesh.nc -o culled_mesh_final.nc -v seed_mask.nc +args = ['./MpasCellCuller.x', '-i', 'culled_mesh.nc', '-o', 'culled_mesh_final.nc', + '-v', 'seed_mask.nc'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) @@ -136,9 +136,9 @@ if options.with_critical_passages: # make a new version of the critical passages mask on the culled mesh # Run command is: - # ./MpasMaskCreator.x culled_mesh_final.nc critical_passages_mask_final.nc -f critical_passages.geojson - args = ['./MpasMaskCreator.x', 'culled_mesh_final.nc', - 'critical_passages_mask_final.nc', + # ./MpasMaskCreator.x -i culled_mesh_final.nc -o critical_passages_mask_final.nc -f critical_passages.geojson + args = ['./MpasMaskCreator.x', '-i', 'culled_mesh_final.nc', + '-o', 'critical_passages_mask_final.nc', '-f', 'critical_passages.geojson'] print "running", ' '.join(args) subprocess.check_call(args, env=os.environ.copy()) diff --git a/test_cases/ocean/ocean/isomip/10km/expt1.01/config_init1.xml b/test_cases/ocean/ocean/isomip/10km/expt1.01/config_init1.xml index f7ad6828b8..be1a0f5162 100644 --- a/test_cases/ocean/ocean/isomip/10km/expt1.01/config_init1.xml +++ b/test_cases/ocean/ocean/isomip/10km/expt1.01/config_init1.xml @@ -24,8 +24,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc @@ -34,7 +34,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/isomip/10km/expt2.01/config_init1.xml b/test_cases/ocean/ocean/isomip/10km/expt2.01/config_init1.xml index dffafb8a99..64088189e8 100644 --- a/test_cases/ocean/ocean/isomip/10km/expt2.01/config_init1.xml +++ b/test_cases/ocean/ocean/isomip/10km/expt2.01/config_init1.xml @@ -29,8 +29,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc @@ -39,7 +39,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/isomip_plus/2km/Ocean0/config_init1.xml b/test_cases/ocean/ocean/isomip_plus/2km/Ocean0/config_init1.xml index 03c203fdf5..5467673909 100644 --- a/test_cases/ocean/ocean/isomip_plus/2km/Ocean0/config_init1.xml +++ b/test_cases/ocean/ocean/isomip_plus/2km/Ocean0/config_init1.xml @@ -39,8 +39,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc 4 @@ -49,7 +49,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/isomip_plus/2km/Ocean1/config_init1.xml b/test_cases/ocean/ocean/isomip_plus/2km/Ocean1/config_init1.xml index e98a1cfb45..b74bbcf14c 100644 --- a/test_cases/ocean/ocean/isomip_plus/2km/Ocean1/config_init1.xml +++ b/test_cases/ocean/ocean/isomip_plus/2km/Ocean1/config_init1.xml @@ -39,8 +39,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc 16 @@ -49,7 +49,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/isomip_plus/2km/Ocean2/config_init1.xml b/test_cases/ocean/ocean/isomip_plus/2km/Ocean2/config_init1.xml index b79994b350..04d933222b 100644 --- a/test_cases/ocean/ocean/isomip_plus/2km/Ocean2/config_init1.xml +++ b/test_cases/ocean/ocean/isomip_plus/2km/Ocean2/config_init1.xml @@ -41,8 +41,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc 16 @@ -51,7 +51,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/isomip_plus/5km/Ocean0/config_init1.xml b/test_cases/ocean/ocean/isomip_plus/5km/Ocean0/config_init1.xml index 1d857e9620..0cea40ce35 100644 --- a/test_cases/ocean/ocean/isomip_plus/5km/Ocean0/config_init1.xml +++ b/test_cases/ocean/ocean/isomip_plus/5km/Ocean0/config_init1.xml @@ -39,8 +39,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc 4 @@ -49,7 +49,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/isomip_plus/5km/Ocean1/config_init1.xml b/test_cases/ocean/ocean/isomip_plus/5km/Ocean1/config_init1.xml index 5853bfa4d8..12cffcdbdd 100644 --- a/test_cases/ocean/ocean/isomip_plus/5km/Ocean1/config_init1.xml +++ b/test_cases/ocean/ocean/isomip_plus/5km/Ocean1/config_init1.xml @@ -39,8 +39,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc 4 @@ -49,7 +49,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/isomip_plus/5km/Ocean2/config_init1.xml b/test_cases/ocean/ocean/isomip_plus/5km/Ocean2/config_init1.xml index 2ceb62e2a8..271987465b 100644 --- a/test_cases/ocean/ocean/isomip_plus/5km/Ocean2/config_init1.xml +++ b/test_cases/ocean/ocean/isomip_plus/5km/Ocean2/config_init1.xml @@ -41,8 +41,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc 4 @@ -51,7 +51,7 @@ - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/lock_exchange/0.5km/default/config_init1.xml b/test_cases/ocean/ocean/lock_exchange/0.5km/default/config_init1.xml index 0e4ba8e4e1..cb051d73cb 100644 --- a/test_cases/ocean/ocean/lock_exchange/0.5km/default/config_init1.xml +++ b/test_cases/ocean/ocean/lock_exchange/0.5km/default/config_init1.xml @@ -50,14 +50,14 @@ v - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/lock_exchange/16km/default/config_init1.xml b/test_cases/ocean/ocean/lock_exchange/16km/default/config_init1.xml index 3a8a4efa2a..b25f9fb934 100644 --- a/test_cases/ocean/ocean/lock_exchange/16km/default/config_init1.xml +++ b/test_cases/ocean/ocean/lock_exchange/16km/default/config_init1.xml @@ -50,14 +50,14 @@ v - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/overflow/10km/default/config_init1.xml b/test_cases/ocean/ocean/overflow/10km/default/config_init1.xml index b1accdd39a..3372048d06 100644 --- a/test_cases/ocean/ocean/overflow/10km/default/config_init1.xml +++ b/test_cases/ocean/ocean/overflow/10km/default/config_init1.xml @@ -51,14 +51,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/periodic_planar/20km/default/config_init1.xml b/test_cases/ocean/ocean/periodic_planar/20km/default/config_init1.xml index 06edb28e47..dfcd54e1d7 100644 --- a/test_cases/ocean/ocean/periodic_planar/20km/default/config_init1.xml +++ b/test_cases/ocean/ocean/periodic_planar/20km/default/config_init1.xml @@ -51,14 +51,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/periodic_planar/20km/region_reset_test/config_init1.xml b/test_cases/ocean/ocean/periodic_planar/20km/region_reset_test/config_init1.xml index 06edb28e47..dfcd54e1d7 100644 --- a/test_cases/ocean/ocean/periodic_planar/20km/region_reset_test/config_init1.xml +++ b/test_cases/ocean/ocean/periodic_planar/20km/region_reset_test/config_init1.xml @@ -51,14 +51,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/periodic_planar/20km/time_reset_test/config_init1.xml b/test_cases/ocean/ocean/periodic_planar/20km/time_reset_test/config_init1.xml index d8debdf5c1..f968bdd8d0 100644 --- a/test_cases/ocean/ocean/periodic_planar/20km/time_reset_test/config_init1.xml +++ b/test_cases/ocean/ocean/periodic_planar/20km/time_reset_test/config_init1.xml @@ -51,14 +51,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/sea_mount/6.7km/default/config_init1.xml b/test_cases/ocean/ocean/sea_mount/6.7km/default/config_init1.xml index 6191b84866..816d68c89e 100644 --- a/test_cases/ocean/ocean/sea_mount/6.7km/default/config_init1.xml +++ b/test_cases/ocean/ocean/sea_mount/6.7km/default/config_init1.xml @@ -50,14 +50,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/single_column_model/planar/cvmix_test/config_init.xml b/test_cases/ocean/ocean/single_column_model/planar/cvmix_test/config_init.xml index ab9f3233ba..124be27fb1 100644 --- a/test_cases/ocean/ocean/single_column_model/planar/cvmix_test/config_init.xml +++ b/test_cases/ocean/ocean/single_column_model/planar/cvmix_test/config_init.xml @@ -106,8 +106,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc diff --git a/test_cases/ocean/ocean/single_column_model/sphere/cvmix_test/config_init.xml b/test_cases/ocean/ocean/single_column_model/sphere/cvmix_test/config_init.xml index 6ed9c9b8e5..cedb41071e 100644 --- a/test_cases/ocean/ocean/single_column_model/sphere/cvmix_test/config_init.xml +++ b/test_cases/ocean/ocean/single_column_model/sphere/cvmix_test/config_init.xml @@ -107,8 +107,8 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc diff --git a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_init/config_init1.xml b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_init/config_init1.xml index 95b91944a1..608744bf63 100644 --- a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_init/config_init1.xml +++ b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_init/config_init1.xml @@ -24,14 +24,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_iterative_init/config_init1.xml b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_iterative_init/config_init1.xml index 816bb6a13b..369fb725d2 100644 --- a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_iterative_init/config_init1.xml +++ b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/Haney_number_iterative_init/config_init1.xml @@ -25,14 +25,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/default/config_init1.xml b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/default/config_init1.xml index 57e69c4d7d..c9a913d481 100644 --- a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/default/config_init1.xml +++ b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/default/config_init1.xml @@ -22,14 +22,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/iterative_init/config_init1.xml b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/iterative_init/config_init1.xml index 161900193b..645bd45c0f 100644 --- a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/iterative_init/config_init1.xml +++ b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/iterative_init/config_init1.xml @@ -23,14 +23,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/restart_test/config_init1.xml b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/restart_test/config_init1.xml index 57e69c4d7d..c9a913d481 100644 --- a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/restart_test/config_init1.xml +++ b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/restart_test/config_init1.xml @@ -22,14 +22,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/with_frazil/config_init1.xml b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/with_frazil/config_init1.xml index 57e69c4d7d..c9a913d481 100644 --- a/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/with_frazil/config_init1.xml +++ b/test_cases/ocean/ocean/sub_ice_shelf_2D/5km/with_frazil/config_init1.xml @@ -22,14 +22,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/ziso/10km/default/config_forward.xml b/test_cases/ocean/ocean/ziso/10km/default/config_forward.xml index 47007d389b..93a3304fcb 100644 --- a/test_cases/ocean/ocean/ziso/10km/default/config_forward.xml +++ b/test_cases/ocean/ocean/ziso/10km/default/config_forward.xml @@ -43,7 +43,7 @@ make_particle_resets.py - mesh.nc + mesh.nc particles.nc graph.info.part.4 11 diff --git a/test_cases/ocean/ocean/ziso/10km/default/config_init1.xml b/test_cases/ocean/ocean/ziso/10km/default/config_init1.xml index 2b6de8a3db..303534e1b8 100644 --- a/test_cases/ocean/ocean/ziso/10km/default/config_init1.xml +++ b/test_cases/ocean/ocean/ziso/10km/default/config_init1.xml @@ -57,14 +57,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/ziso/2.5km/default/config_forward.xml b/test_cases/ocean/ocean/ziso/2.5km/default/config_forward.xml index 5e618fee62..357a5aae98 100644 --- a/test_cases/ocean/ocean/ziso/2.5km/default/config_forward.xml +++ b/test_cases/ocean/ocean/ziso/2.5km/default/config_forward.xml @@ -43,7 +43,7 @@ make_particle_resets.py - mesh.nc + mesh.nc particles.nc graph.info.part.4 11 diff --git a/test_cases/ocean/ocean/ziso/2.5km/default/config_init1.xml b/test_cases/ocean/ocean/ziso/2.5km/default/config_init1.xml index 936b70ce05..cc06a280eb 100644 --- a/test_cases/ocean/ocean/ziso/2.5km/default/config_init1.xml +++ b/test_cases/ocean/ocean/ziso/2.5km/default/config_init1.xml @@ -57,14 +57,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/ziso/20km/default/config_forward.xml b/test_cases/ocean/ocean/ziso/20km/default/config_forward.xml index d12ca1188e..d5f16f4853 100644 --- a/test_cases/ocean/ocean/ziso/20km/default/config_forward.xml +++ b/test_cases/ocean/ocean/ziso/20km/default/config_forward.xml @@ -48,7 +48,7 @@ make_particle_resets.py - mesh.nc + mesh.nc particles.nc graph.info.part.4 11 diff --git a/test_cases/ocean/ocean/ziso/20km/default/config_init1.xml b/test_cases/ocean/ocean/ziso/20km/default/config_init1.xml index 2e60f0cd36..4150d03381 100644 --- a/test_cases/ocean/ocean/ziso/20km/default/config_init1.xml +++ b/test_cases/ocean/ocean/ziso/20km/default/config_init1.xml @@ -57,14 +57,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/ziso/20km/with_frazil/config_init1.xml b/test_cases/ocean/ocean/ziso/20km/with_frazil/config_init1.xml index ecb0464958..93e2ddf094 100644 --- a/test_cases/ocean/ocean/ziso/20km/with_frazil/config_init1.xml +++ b/test_cases/ocean/ocean/ziso/20km/with_frazil/config_init1.xml @@ -58,14 +58,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc diff --git a/test_cases/ocean/ocean/ziso/5km/default/config_forward.xml b/test_cases/ocean/ocean/ziso/5km/default/config_forward.xml index 3b72d9ff63..6d47f4e06d 100644 --- a/test_cases/ocean/ocean/ziso/5km/default/config_forward.xml +++ b/test_cases/ocean/ocean/ziso/5km/default/config_forward.xml @@ -43,7 +43,7 @@ make_particle_resets.py - mesh.nc + mesh.nc particles.nc graph.info.part.4 11 diff --git a/test_cases/ocean/ocean/ziso/5km/default/config_init1.xml b/test_cases/ocean/ocean/ziso/5km/default/config_init1.xml index a8be98ff16..e4024b621c 100644 --- a/test_cases/ocean/ocean/ziso/5km/default/config_init1.xml +++ b/test_cases/ocean/ocean/ziso/5km/default/config_init1.xml @@ -57,14 +57,14 @@ - base_mesh.nc - mesh.nc + base_mesh.nc + mesh.nc - ocean.nc + ocean.nc