From f54b4ad4a3a878092cd801f1a8cc9e889b4c787f Mon Sep 17 00:00:00 2001 From: MFraters Date: Fri, 8 Mar 2024 19:10:18 -0500 Subject: [PATCH 1/2] Post v0.6.0 release version bump. --- CHANGELOG.md | 8 ++++++++ VERSION | 2 +- appveyor.yml | 2 +- .../2d_cartesian_subduction_rift.wb | 2 +- .../2d_cartesian_subduction_rift_adiabatic.wb | 2 +- .../2d_cartesian_subduction_rift_sepran_example.wb | 2 +- .../2d_spherical_subduction_rift.wb | 2 +- .../2d_spherical_subduction_rift_adiabatic.wb | 2 +- .../3d_cartesian_curved_subduction.wb | 2 +- .../3d_cartesian_double_subduction.wb | 2 +- cookbooks/3d_cartesian_rift/3d_cartesian_rift.wb | 2 +- .../3d_cartesian_transform_fault.wb | 2 +- .../3d_spherical_subduction/3d_spherical_subduction.wb | 2 +- .../simple_subduction_2d_cartesian.wb | 2 +- .../simple_subduction_2d_chunk.wb | 2 +- doc/doxygen_config.dox | 2 +- doc/generate_decl_schema.wb | 2 +- doc/sphinx/_static/gwb_input_files/BST_02_minimal_box.wb | 2 +- .../_static/gwb_input_files/BST_04_overriding_plate.wb | 2 +- doc/sphinx/_static/gwb_input_files/BST_05_limit_depth.wb | 2 +- .../gwb_input_files/BST_06_oceanic_plate_temperature.wb | 2 +- .../BST_07_subducting_plate_oceanic_part.wb | 2 +- .../BST_08_passive_margin_variable_depth.wb | 2 +- .../_static/gwb_input_files/BST_09_adding_mantle_layer.wb | 2 +- .../BST_10_adding_basic_subducting_plate.wb | 2 +- .../gwb_input_files/BST_11_dip_change_in_segment.wb | 2 +- doc/sphinx/_static/gwb_input_files/BST_12_sections.wb_bak | 2 +- .../BST_12_subducting_plate_temperatures.wb | 2 +- .../BST_13_subducting_slab_adding_a_segment.wb | 2 +- .../BST_14_different_models_in_segments.wb | 2 +- .../BST_15_different_segments_in_sections.wb | 2 +- .../_static/gwb_input_files/BST_16_mass_conserving.wb | 2 +- doc/sphinx/_static/gwb_input_files/BST_17_plume.wb | 2 +- doc/sphinx/_static/gwb_input_files/BST_18_2D_models.wb | 2 +- .../_static/gwb_input_files/BST_19_spherical_models.wb | 2 +- doc/sphinx/conf.py | 4 ++-- .../contributing_to_the_documentation/important_syntax.md | 6 +++--- .../03_optional_coordinate_system.md | 6 +++--- tests/data/continental_plate.wb | 2 +- tests/data/fault_constant_angles_cartesian.wb | 2 +- tests/data/fault_constant_angles_cartesian_2.wb | 2 +- tests/data/fault_constant_angles_cartesian_force_temp.wb | 2 +- tests/data/fault_different_angles_cartesian.wb | 2 +- tests/data/interpolation_monotone_spline_cartesian.wb | 2 +- tests/data/mantle_layer_cartesian.wb | 2 +- tests/data/oceanic_plate_cartesian.wb | 2 +- tests/data/oceanic_plate_spherical.wb | 2 +- tests/data/simple_wb1.json | 2 +- tests/data/simple_wb2.json | 2 +- tests/data/simple_wb3.json | 2 +- tests/data/spherical_depth_method_begin_segment.wb | 2 +- tests/data/spherical_depth_method_starting_point.wb | 2 +- tests/data/subducting_plate_composition_smooth_by_tag.wb | 2 +- .../data/subducting_plate_composition_smooth_filtered.wb | 2 +- tests/data/subducting_plate_constant_angles_cartesian.wb | 2 +- tests/data/subducting_plate_different_angles_cartesian.wb | 2 +- .../data/subducting_plate_different_angles_cartesian_2.wb | 2 +- tests/data/subducting_plate_different_angles_spherical.wb | 2 +- tests/gwb-dat/2d_cartesian_plume_points.wb | 2 +- tests/gwb-dat/app_continental_plate_2d.wb | 2 +- tests/gwb-dat/app_continental_plate_3d.wb | 2 +- tests/gwb-dat/app_continental_plate_cartesian.wb | 2 +- tests/gwb-dat/app_oceanic_plate_cartesian.wb | 2 +- tests/gwb-dat/app_oceanic_plate_constant_age.wb | 2 +- tests/gwb-dat/app_operations_add.wb | 2 +- tests/gwb-dat/app_operations_replace.wb | 2 +- tests/gwb-dat/app_operations_subtract.wb | 2 +- tests/gwb-dat/app_spherical_2d.wb | 2 +- tests/gwb-dat/app_spherical_3d.wb | 2 +- tests/gwb-dat/app_wb1.wb | 2 +- tests/gwb-dat/app_wb2.wb | 2 +- tests/gwb-dat/app_wb3.wb | 2 +- tests/gwb-dat/cartesian_fault_x_and_y_direction.wb | 2 +- tests/gwb-dat/cartesian_multiridge.wb | 2 +- tests/gwb-dat/cartesian_no_ridge_drift.wb | 2 +- tests/gwb-dat/cartesian_slab_linear_adiabat.wb | 2 +- tests/gwb-dat/cartesian_slab_mass_conserving.wb | 2 +- tests/gwb-dat/cartesian_slab_spline_complex.wb | 2 +- tests/gwb-dat/cartesian_slab_x_and_y_direction.wb | 2 +- tests/gwb-dat/cartesian_young_slab_mass_conserving.wb | 2 +- tests/gwb-dat/chunk_slab_mass_conserving.wb | 2 +- tests/gwb-dat/continental_min_max_surface.wb | 2 +- tests/gwb-dat/continental_min_max_surface_spherical.wb | 2 +- tests/gwb-dat/depth_method_slab_begin_at_end_segment.wb | 2 +- tests/gwb-dat/fault_complex_spherical.wb | 2 +- tests/gwb-dat/geodynamic_world_builder_mar.json | 2 +- tests/gwb-dat/half_space_plate_model.wb | 2 +- tests/gwb-dat/half_space_variable_spreading.wb | 2 +- tests/gwb-dat/mantle_layer_min_max_surface.wb | 2 +- tests/gwb-dat/mantle_layer_min_max_surface_spherical.wb | 2 +- .../mass_conserving_slab_temperature_plate_model_old.wb | 2 +- .../mass_conserving_slab_temperature_plate_model_young.wb | 2 +- tests/gwb-dat/mass_conserving_slab_temperature_spline.wb | 2 +- .../mass_conserving_slab_with_variable_spreading.wb | 2 +- tests/gwb-dat/oceanic_min_max_surface.wb | 2 +- tests/gwb-dat/oceanic_min_max_surface_spherical.wb | 2 +- tests/gwb-dat/plate_model_variable_spreading.wb | 2 +- tests/gwb-dat/plume_gaussian.wb | 2 +- tests/gwb-dat/plume_gaussian_spherical.wb | 2 +- .../gwb-dat/random_uniform_texture_all_features_seed1.wb | 2 +- .../random_uniform_texture_all_features_seed1000.wb | 2 +- tests/gwb-dat/slab_complex_spherical.wb | 2 +- tests/gwb-dat/slab_interpolation_180pm_CMS.wb | 2 +- tests/gwb-dat/slab_interpolation_simple_CMS.wb | 2 +- tests/gwb-dat/slab_interpolation_simple_curved_CMS.wb | 2 +- tests/gwb-dat/slab_interpolation_simple_curved_none.wb | 2 +- tests/gwb-dat/slab_interpolation_simple_none.wb | 2 +- tests/gwb-dat/smooth_composition_fault.wb | 2 +- .../gwb-dat/spherical_fault_interpolation_simple_none.wb | 2 +- tests/gwb-dat/spherical_half_space_model_ridge.wb | 2 +- .../spherical_mc_slab_and_half_space_plate_model.wb | 2 +- tests/gwb-dat/spherical_plate_cooling_model_ridge.wb | 2 +- tests/gwb-dat/spherical_ridge_distance_check.wb | 2 +- tests/gwb-dat/spherical_slab_A1.wb | 2 +- tests/gwb-dat/spherical_slab_A2.wb | 2 +- tests/gwb-dat/spherical_slab_interpolation_simple_CMS.wb | 2 +- tests/gwb-dat/spherical_slab_interpolation_simple_none.wb | 2 +- .../gwb-dat/spherical_slab_interpolation_simple_subdiv.wb | 2 +- tests/gwb-dat/spherical_slab_plate_model.wb | 2 +- tests/gwb-dat/spherical_variable_spreading.wb | 2 +- tests/gwb-dat/testing_continent_no_coordinates.wb | 2 +- tests/gwb-dat/testing_fault_no_coordinates.wb | 2 +- tests/gwb-dat/testing_mantle_layer_no_coordinates.wb | 2 +- tests/gwb-dat/testing_oceanic_no_coordinates.wb | 2 +- tests/gwb-dat/testing_subducting_no_coordinates.wb | 2 +- tests/gwb-grid/2d_cartesian_plume.wb | 2 +- tests/gwb-grid/3d_annulus_plume.wb | 2 +- tests/gwb-grid/3d_plume.wb | 2 +- tests/gwb-grid/3d_plume_tip.wb | 2 +- tests/gwb-grid/3d_sphere_plume.wb | 2 +- tests/gwb-grid/3d_spherical_plume.wb | 2 +- tests/gwb-grid/composition_operations.wb | 2 +- tests/gwb-grid/continental_plate_composition_random.wb | 2 +- tests/gwb-grid/fault.wb | 2 +- tests/gwb-grid/fault_edge_limits.wb | 2 +- tests/gwb-grid/spherical_grid_fault.json | 2 +- tests/gwb-grid/subducting_plate_composition_smooth.wb | 2 +- tests/gwb-grid/subducting_plate_manual3.wb | 2 +- 138 files changed, 150 insertions(+), 142 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78373f4ce..bd32343fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ Add new entries a the bottom of the current list in the subheading. Item format: This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] +### Added + +### Changed + +### Fixed + + ## [0.6.0] ### Added - Implemented the framework that will allow the mass conserving temperature model to account for the the movement of a spreading center through time. \[Daniel Douglas; Haoyuan Li; 2024-02-29; [#654](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/654)\] diff --git a/VERSION b/VERSION index a918a2aa1..bc83570d8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.0 +1.0.0-pre diff --git a/appveyor.yml b/appveyor.yml index b8e6f785c..6e1562d0b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '0.6.0.{build}' +version: '1.0.0-pre.{build}' image: Visual Studio 2015 diff --git a/cookbooks/2d_cartesian_subduction_rift/2d_cartesian_subduction_rift.wb b/cookbooks/2d_cartesian_subduction_rift/2d_cartesian_subduction_rift.wb index 62373f679..12c13df85 100644 --- a/cookbooks/2d_cartesian_subduction_rift/2d_cartesian_subduction_rift.wb +++ b/cookbooks/2d_cartesian_subduction_rift/2d_cartesian_subduction_rift.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,0],[100,0]], "features": [ diff --git a/cookbooks/2d_cartesian_subduction_rift_adiabatic/2d_cartesian_subduction_rift_adiabatic.wb b/cookbooks/2d_cartesian_subduction_rift_adiabatic/2d_cartesian_subduction_rift_adiabatic.wb index 71376c298..5a6d23455 100644 --- a/cookbooks/2d_cartesian_subduction_rift_adiabatic/2d_cartesian_subduction_rift_adiabatic.wb +++ b/cookbooks/2d_cartesian_subduction_rift_adiabatic/2d_cartesian_subduction_rift_adiabatic.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,0],[100,0]], "features": [ diff --git a/cookbooks/2d_cartesian_subduction_rift_sepran_example/2d_cartesian_subduction_rift_sepran_example.wb b/cookbooks/2d_cartesian_subduction_rift_sepran_example/2d_cartesian_subduction_rift_sepran_example.wb index c1eb834ad..6183d9560 100644 --- a/cookbooks/2d_cartesian_subduction_rift_sepran_example/2d_cartesian_subduction_rift_sepran_example.wb +++ b/cookbooks/2d_cartesian_subduction_rift_sepran_example/2d_cartesian_subduction_rift_sepran_example.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,0],[100,0]], "features": [ diff --git a/cookbooks/2d_spherical_subduction_rift/2d_spherical_subduction_rift.wb b/cookbooks/2d_spherical_subduction_rift/2d_spherical_subduction_rift.wb index a61def8d2..4ce3a2f58 100644 --- a/cookbooks/2d_spherical_subduction_rift/2d_spherical_subduction_rift.wb +++ b/cookbooks/2d_spherical_subduction_rift/2d_spherical_subduction_rift.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin segment"}, "cross section":[[0,0],[10,0]], "features": diff --git a/cookbooks/2d_spherical_subduction_rift_adiabatic/2d_spherical_subduction_rift_adiabatic.wb b/cookbooks/2d_spherical_subduction_rift_adiabatic/2d_spherical_subduction_rift_adiabatic.wb index 3790c7847..4b0aa534b 100644 --- a/cookbooks/2d_spherical_subduction_rift_adiabatic/2d_spherical_subduction_rift_adiabatic.wb +++ b/cookbooks/2d_spherical_subduction_rift_adiabatic/2d_spherical_subduction_rift_adiabatic.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin segment"}, "cross section":[[0,0],[10,0]], "features": diff --git a/cookbooks/3d_cartesian_curved_subduction/3d_cartesian_curved_subduction.wb b/cookbooks/3d_cartesian_curved_subduction/3d_cartesian_curved_subduction.wb index ba2ebeaff..21ab48905 100644 --- a/cookbooks/3d_cartesian_curved_subduction/3d_cartesian_curved_subduction.wb +++ b/cookbooks/3d_cartesian_curved_subduction/3d_cartesian_curved_subduction.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "potential mantle temperature":1500, "thermal expansion coefficient":2.0e-5, "maximum distance between coordinates":100000, diff --git a/cookbooks/3d_cartesian_double_subduction/3d_cartesian_double_subduction.wb b/cookbooks/3d_cartesian_double_subduction/3d_cartesian_double_subduction.wb index 1c510a310..e9564b546 100644 --- a/cookbooks/3d_cartesian_double_subduction/3d_cartesian_double_subduction.wb +++ b/cookbooks/3d_cartesian_double_subduction/3d_cartesian_double_subduction.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/cookbooks/3d_cartesian_rift/3d_cartesian_rift.wb b/cookbooks/3d_cartesian_rift/3d_cartesian_rift.wb index 88d50d4a6..439ad79be 100644 --- a/cookbooks/3d_cartesian_rift/3d_cartesian_rift.wb +++ b/cookbooks/3d_cartesian_rift/3d_cartesian_rift.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "features": [ {"model":"oceanic plate", "name":"oceanic plate A", "coordinates":[[-1e3,-1e3],[2001e3,-1e3],[2001e3,1000e3],[-1e3,1000e3]], diff --git a/cookbooks/3d_cartesian_transform_fault/3d_cartesian_transform_fault.wb b/cookbooks/3d_cartesian_transform_fault/3d_cartesian_transform_fault.wb index 2bbe9eaa6..2c78070af 100644 --- a/cookbooks/3d_cartesian_transform_fault/3d_cartesian_transform_fault.wb +++ b/cookbooks/3d_cartesian_transform_fault/3d_cartesian_transform_fault.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "surface temperature":273.15, "potential mantle temperature":1573.15, "thermal expansion coefficient":0, diff --git a/cookbooks/3d_spherical_subduction/3d_spherical_subduction.wb b/cookbooks/3d_spherical_subduction/3d_spherical_subduction.wb index 854da8b9b..59cd0e3a0 100644 --- a/cookbooks/3d_spherical_subduction/3d_spherical_subduction.wb +++ b/cookbooks/3d_spherical_subduction/3d_spherical_subduction.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin segment"}, "cross section":[[0,0],[10,0]], "maximum distance between coordinates":0.01, diff --git a/cookbooks/simple_subduction_2d_cartesian/simple_subduction_2d_cartesian.wb b/cookbooks/simple_subduction_2d_cartesian/simple_subduction_2d_cartesian.wb index 874184343..92b9c584d 100644 --- a/cookbooks/simple_subduction_2d_cartesian/simple_subduction_2d_cartesian.wb +++ b/cookbooks/simple_subduction_2d_cartesian/simple_subduction_2d_cartesian.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[0,0],[8000e3,0]], "surface temperature":273, "potential mantle temperature":1573, diff --git a/cookbooks/simple_subduction_2d_chunk/simple_subduction_2d_chunk.wb b/cookbooks/simple_subduction_2d_chunk/simple_subduction_2d_chunk.wb index 613fe017e..874e83982 100644 --- a/cookbooks/simple_subduction_2d_chunk/simple_subduction_2d_chunk.wb +++ b/cookbooks/simple_subduction_2d_chunk/simple_subduction_2d_chunk.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment", "radius":6371000.0}, diff --git a/doc/doxygen_config.dox b/doc/doxygen_config.dox index 45627a3e4..c473e6006 100644 --- a/doc/doxygen_config.dox +++ b/doc/doxygen_config.dox @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "World Builder" -PROJECT_NUMBER = 0.6.0 +PROJECT_NUMBER = 1.0.0-pre PROJECT_BRIEF = "A geodynamic initial conditions generator" PROJECT_LOGO = OUTPUT_DIRECTORY = doc/doxygen/ diff --git a/doc/generate_decl_schema.wb b/doc/generate_decl_schema.wb index e5d14986a..02b5b3dc9 100644 --- a/doc/generate_decl_schema.wb +++ b/doc/generate_decl_schema.wb @@ -1,4 +1,4 @@ { - "version": "0.6", + "version": "1.0", "features": [] } \ No newline at end of file diff --git a/doc/sphinx/_static/gwb_input_files/BST_02_minimal_box.wb b/doc/sphinx/_static/gwb_input_files/BST_02_minimal_box.wb index 54c8d660d..aa676e0e6 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_02_minimal_box.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_02_minimal_box.wb @@ -1,4 +1,4 @@ { - "version": "0.6", + "version": "1.0", "features":[] } \ No newline at end of file diff --git a/doc/sphinx/_static/gwb_input_files/BST_04_overriding_plate.wb b/doc/sphinx/_static/gwb_input_files/BST_04_overriding_plate.wb index 47ec2d89d..5b4bd355c 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_04_overriding_plate.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_04_overriding_plate.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_05_limit_depth.wb b/doc/sphinx/_static/gwb_input_files/BST_05_limit_depth.wb index 6d3f60706..e6dc8a0b1 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_05_limit_depth.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_05_limit_depth.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_06_oceanic_plate_temperature.wb b/doc/sphinx/_static/gwb_input_files/BST_06_oceanic_plate_temperature.wb index 4e6fee738..e13e09b0b 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_06_oceanic_plate_temperature.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_06_oceanic_plate_temperature.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_07_subducting_plate_oceanic_part.wb b/doc/sphinx/_static/gwb_input_files/BST_07_subducting_plate_oceanic_part.wb index 2df3d4a1a..54f2341b4 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_07_subducting_plate_oceanic_part.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_07_subducting_plate_oceanic_part.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_08_passive_margin_variable_depth.wb b/doc/sphinx/_static/gwb_input_files/BST_08_passive_margin_variable_depth.wb index 4e6d2e8de..ec3dd046d 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_08_passive_margin_variable_depth.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_08_passive_margin_variable_depth.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_09_adding_mantle_layer.wb b/doc/sphinx/_static/gwb_input_files/BST_09_adding_mantle_layer.wb index 6bf1ce26f..570c64d9b 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_09_adding_mantle_layer.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_09_adding_mantle_layer.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_10_adding_basic_subducting_plate.wb b/doc/sphinx/_static/gwb_input_files/BST_10_adding_basic_subducting_plate.wb index 860d997eb..f342daef0 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_10_adding_basic_subducting_plate.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_10_adding_basic_subducting_plate.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_11_dip_change_in_segment.wb b/doc/sphinx/_static/gwb_input_files/BST_11_dip_change_in_segment.wb index 0c0857974..37a62e05f 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_11_dip_change_in_segment.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_11_dip_change_in_segment.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_12_sections.wb_bak b/doc/sphinx/_static/gwb_input_files/BST_12_sections.wb_bak index cd96d17d5..a279a3e3b 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_12_sections.wb_bak +++ b/doc/sphinx/_static/gwb_input_files/BST_12_sections.wb_bak @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[0,200e3],[100e3,200e3]], "features": diff --git a/doc/sphinx/_static/gwb_input_files/BST_12_subducting_plate_temperatures.wb b/doc/sphinx/_static/gwb_input_files/BST_12_subducting_plate_temperatures.wb index f297205e8..c491adcab 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_12_subducting_plate_temperatures.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_12_subducting_plate_temperatures.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_13_subducting_slab_adding_a_segment.wb b/doc/sphinx/_static/gwb_input_files/BST_13_subducting_slab_adding_a_segment.wb index dddc12533..fcdcaa909 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_13_subducting_slab_adding_a_segment.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_13_subducting_slab_adding_a_segment.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_14_different_models_in_segments.wb b/doc/sphinx/_static/gwb_input_files/BST_14_different_models_in_segments.wb index 7f3c08b78..5ce990791 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_14_different_models_in_segments.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_14_different_models_in_segments.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_15_different_segments_in_sections.wb b/doc/sphinx/_static/gwb_input_files/BST_15_different_segments_in_sections.wb index c2814e8e9..82c35de72 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_15_different_segments_in_sections.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_15_different_segments_in_sections.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_16_mass_conserving.wb b/doc/sphinx/_static/gwb_input_files/BST_16_mass_conserving.wb index 7924d7dc1..09378bd49 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_16_mass_conserving.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_16_mass_conserving.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_17_plume.wb b/doc/sphinx/_static/gwb_input_files/BST_17_plume.wb index e93a268f1..2dec759c8 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_17_plume.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_17_plume.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features": [ diff --git a/doc/sphinx/_static/gwb_input_files/BST_18_2D_models.wb b/doc/sphinx/_static/gwb_input_files/BST_18_2D_models.wb index 32010cccd..4022334ef 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_18_2D_models.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_18_2D_models.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[0,450e3],[10e3,450e3]], "features": diff --git a/doc/sphinx/_static/gwb_input_files/BST_19_spherical_models.wb b/doc/sphinx/_static/gwb_input_files/BST_19_spherical_models.wb index 3b50d9995..58a7111c7 100644 --- a/doc/sphinx/_static/gwb_input_files/BST_19_spherical_models.wb +++ b/doc/sphinx/_static/gwb_input_files/BST_19_spherical_models.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin segment"}, "cross section":[[0,0.5],[1,-0.5]], "features": diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 885a3b495..17bcb759f 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -20,8 +20,8 @@ project = 'Geodynamic World Builder' copyright = '2024, The authors of the Geodynamic World Builder' # The full version, including alpha/beta/rc tags -release = '0.6.0' -html_title = "Manual GWB 0.6.0" +release = '1.0.0-pre' +html_title = "Manual GWB 1.0.0-pre" # -- General configuration --------------------------------------------------- diff --git a/doc/sphinx/developer_manual/contributing_to_the_documentation/important_syntax.md b/doc/sphinx/developer_manual/contributing_to_the_documentation/important_syntax.md index ce87083c1..d5a146d06 100644 --- a/doc/sphinx/developer_manual/contributing_to_the_documentation/important_syntax.md +++ b/doc/sphinx/developer_manual/contributing_to_the_documentation/important_syntax.md @@ -189,7 +189,7 @@ Creating code blocks is similar to making notes or todos. Instead of `{note}` yo :lineno-start: 1 :emphasize-lines: 3,4 { - "version":0.6.0, + "version":1.0, "coordinate system": {"model":"cartesian"}, } ::: @@ -201,7 +201,7 @@ The lines starting with a colon (:) specify certain parameters which can be set, :lineno-start: 1 :emphasize-lines: 3,4 { - "version":0.6.0, + "version":1.0, "coordinate system": {"model":"cartesian"}, "Features":[] } @@ -215,7 +215,7 @@ If you need to wrap a code block in a code block, you just use more : on the out :lineno-start: 1 :emphasize-lines: 3,4 { - "version":0.6.0, + "version":1.0, "coordinate system": {"model":"cartesian"}, } ::: diff --git a/doc/sphinx/user_manual/basic_starter_tutorial/03_optional_coordinate_system.md b/doc/sphinx/user_manual/basic_starter_tutorial/03_optional_coordinate_system.md index 285759dfd..9d54c58a1 100644 --- a/doc/sphinx/user_manual/basic_starter_tutorial/03_optional_coordinate_system.md +++ b/doc/sphinx/user_manual/basic_starter_tutorial/03_optional_coordinate_system.md @@ -54,7 +54,7 @@ Our previous minimal example looks like this: lineno-start: 1 --- { - "version": "0.6", + "version": "1.0", "features":[ ] } ``` @@ -66,7 +66,7 @@ We can be more explicit and add one line setting it to the default value. Howeve lineno-start: 1 --- { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "features":[ ] } @@ -80,7 +80,7 @@ If you want to have a spherical model, please see {ref}`part:user_manual:chap:co lineno-start: 1 --- { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin segment"}, "features":[ ] } diff --git a/tests/data/continental_plate.wb b/tests/data/continental_plate.wb index c7e095532..3d519acda 100644 --- a/tests/data/continental_plate.wb +++ b/tests/data/continental_plate.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/fault_constant_angles_cartesian.wb b/tests/data/fault_constant_angles_cartesian.wb index 275bfd549..8654738b1 100644 --- a/tests/data/fault_constant_angles_cartesian.wb +++ b/tests/data/fault_constant_angles_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/fault_constant_angles_cartesian_2.wb b/tests/data/fault_constant_angles_cartesian_2.wb index 04b1f4a8e..8875bbc62 100644 --- a/tests/data/fault_constant_angles_cartesian_2.wb +++ b/tests/data/fault_constant_angles_cartesian_2.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[750e3,500e3],[500e3,0e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/fault_constant_angles_cartesian_force_temp.wb b/tests/data/fault_constant_angles_cartesian_force_temp.wb index c991f528a..caa9af697 100644 --- a/tests/data/fault_constant_angles_cartesian_force_temp.wb +++ b/tests/data/fault_constant_angles_cartesian_force_temp.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/fault_different_angles_cartesian.wb b/tests/data/fault_different_angles_cartesian.wb index aba4a432d..d070d75c7 100644 --- a/tests/data/fault_different_angles_cartesian.wb +++ b/tests/data/fault_different_angles_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/interpolation_monotone_spline_cartesian.wb b/tests/data/interpolation_monotone_spline_cartesian.wb index ba5c46594..69f52a3e7 100644 --- a/tests/data/interpolation_monotone_spline_cartesian.wb +++ b/tests/data/interpolation_monotone_spline_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/mantle_layer_cartesian.wb b/tests/data/mantle_layer_cartesian.wb index 9313f4610..114d7b64f 100644 --- a/tests/data/mantle_layer_cartesian.wb +++ b/tests/data/mantle_layer_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/oceanic_plate_cartesian.wb b/tests/data/oceanic_plate_cartesian.wb index 388c1c2da..dd26b8509 100644 --- a/tests/data/oceanic_plate_cartesian.wb +++ b/tests/data/oceanic_plate_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[0,0],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/oceanic_plate_spherical.wb b/tests/data/oceanic_plate_spherical.wb index 9d834ea1a..b67030584 100644 --- a/tests/data/oceanic_plate_spherical.wb +++ b/tests/data/oceanic_plate_spherical.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"spherical", "depth method":"starting point"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/data/simple_wb1.json b/tests/data/simple_wb1.json index 921c31a2a..64eb63430 100644 --- a/tests/data/simple_wb1.json +++ b/tests/data/simple_wb1.json @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[100e3,100e3],[400e3,500e3]], diff --git a/tests/data/simple_wb2.json b/tests/data/simple_wb2.json index 8dcdf8b31..f072d0048 100644 --- a/tests/data/simple_wb2.json +++ b/tests/data/simple_wb2.json @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "features": [ diff --git a/tests/data/simple_wb3.json b/tests/data/simple_wb3.json index 8b8387703..361ed39d3 100644 --- a/tests/data/simple_wb3.json +++ b/tests/data/simple_wb3.json @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "surface rotation point": ["165e3","166e3"], "surface rotation angle": "0", diff --git a/tests/data/spherical_depth_method_begin_segment.wb b/tests/data/spherical_depth_method_begin_segment.wb index 17d0b51a0..b86180945 100644 --- a/tests/data/spherical_depth_method_begin_segment.wb +++ b/tests/data/spherical_depth_method_begin_segment.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"spherical", "depth method":"begin segment"}, diff --git a/tests/data/spherical_depth_method_starting_point.wb b/tests/data/spherical_depth_method_starting_point.wb index c0b5e66a8..8a41bd076 100644 --- a/tests/data/spherical_depth_method_starting_point.wb +++ b/tests/data/spherical_depth_method_starting_point.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"spherical", "depth method":"starting point"}, diff --git a/tests/data/subducting_plate_composition_smooth_by_tag.wb b/tests/data/subducting_plate_composition_smooth_by_tag.wb index 49ca6082e..5e4b952b9 100644 --- a/tests/data/subducting_plate_composition_smooth_by_tag.wb +++ b/tests/data/subducting_plate_composition_smooth_by_tag.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "features": diff --git a/tests/data/subducting_plate_composition_smooth_filtered.wb b/tests/data/subducting_plate_composition_smooth_filtered.wb index 49ca6082e..5e4b952b9 100644 --- a/tests/data/subducting_plate_composition_smooth_filtered.wb +++ b/tests/data/subducting_plate_composition_smooth_filtered.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "features": diff --git a/tests/data/subducting_plate_constant_angles_cartesian.wb b/tests/data/subducting_plate_constant_angles_cartesian.wb index 87c4d187d..7c5431c55 100644 --- a/tests/data/subducting_plate_constant_angles_cartesian.wb +++ b/tests/data/subducting_plate_constant_angles_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,100e3]], "coordinate system":{"model":"cartesian"}, diff --git a/tests/data/subducting_plate_different_angles_cartesian.wb b/tests/data/subducting_plate_different_angles_cartesian.wb index ba2f98aec..544127f19 100644 --- a/tests/data/subducting_plate_different_angles_cartesian.wb +++ b/tests/data/subducting_plate_different_angles_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, diff --git a/tests/data/subducting_plate_different_angles_cartesian_2.wb b/tests/data/subducting_plate_different_angles_cartesian_2.wb index 820d1cd94..108b9e354 100644 --- a/tests/data/subducting_plate_different_angles_cartesian_2.wb +++ b/tests/data/subducting_plate_different_angles_cartesian_2.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, diff --git a/tests/data/subducting_plate_different_angles_spherical.wb b/tests/data/subducting_plate_different_angles_spherical.wb index a3842da88..d5ce54e6f 100644 --- a/tests/data/subducting_plate_different_angles_spherical.wb +++ b/tests/data/subducting_plate_different_angles_spherical.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"spherical", "depth method":"starting point"}, diff --git a/tests/gwb-dat/2d_cartesian_plume_points.wb b/tests/gwb-dat/2d_cartesian_plume_points.wb index a3f4e1c45..50b22a4d4 100644 --- a/tests/gwb-dat/2d_cartesian_plume_points.wb +++ b/tests/gwb-dat/2d_cartesian_plume_points.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,0],[100,0]], "features": [ diff --git a/tests/gwb-dat/app_continental_plate_2d.wb b/tests/gwb-dat/app_continental_plate_2d.wb index fbaa65fa0..39aed2add 100644 --- a/tests/gwb-dat/app_continental_plate_2d.wb +++ b/tests/gwb-dat/app_continental_plate_2d.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/gwb-dat/app_continental_plate_3d.wb b/tests/gwb-dat/app_continental_plate_3d.wb index 176b1424b..6763a852b 100644 --- a/tests/gwb-dat/app_continental_plate_3d.wb +++ b/tests/gwb-dat/app_continental_plate_3d.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/gwb-dat/app_continental_plate_cartesian.wb b/tests/gwb-dat/app_continental_plate_cartesian.wb index 177c11ae5..a02c7593d 100644 --- a/tests/gwb-dat/app_continental_plate_cartesian.wb +++ b/tests/gwb-dat/app_continental_plate_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/gwb-dat/app_oceanic_plate_cartesian.wb b/tests/gwb-dat/app_oceanic_plate_cartesian.wb index 2fd3a6240..b9c37f2d9 100644 --- a/tests/gwb-dat/app_oceanic_plate_cartesian.wb +++ b/tests/gwb-dat/app_oceanic_plate_cartesian.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[100e3,100e3],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/gwb-dat/app_oceanic_plate_constant_age.wb b/tests/gwb-dat/app_oceanic_plate_constant_age.wb index 9e35d9db3..2891cbac6 100644 --- a/tests/gwb-dat/app_oceanic_plate_constant_age.wb +++ b/tests/gwb-dat/app_oceanic_plate_constant_age.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[1000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/app_operations_add.wb b/tests/gwb-dat/app_operations_add.wb index bfd65c8bf..af93a935c 100644 --- a/tests/gwb-dat/app_operations_add.wb +++ b/tests/gwb-dat/app_operations_add.wb @@ -1,6 +1,6 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/app_operations_replace.wb b/tests/gwb-dat/app_operations_replace.wb index 383b96eb0..adacbe92c 100644 --- a/tests/gwb-dat/app_operations_replace.wb +++ b/tests/gwb-dat/app_operations_replace.wb @@ -1,6 +1,6 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/app_operations_subtract.wb b/tests/gwb-dat/app_operations_subtract.wb index 26ad58b81..0a92aead7 100644 --- a/tests/gwb-dat/app_operations_subtract.wb +++ b/tests/gwb-dat/app_operations_subtract.wb @@ -1,6 +1,6 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/app_spherical_2d.wb b/tests/gwb-dat/app_spherical_2d.wb index de3a0d555..6e41a36f0 100644 --- a/tests/gwb-dat/app_spherical_2d.wb +++ b/tests/gwb-dat/app_spherical_2d.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,500e3]], diff --git a/tests/gwb-dat/app_spherical_3d.wb b/tests/gwb-dat/app_spherical_3d.wb index de3a0d555..6e41a36f0 100644 --- a/tests/gwb-dat/app_spherical_3d.wb +++ b/tests/gwb-dat/app_spherical_3d.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section": [[100e3,100e3],[400e3,500e3]], diff --git a/tests/gwb-dat/app_wb1.wb b/tests/gwb-dat/app_wb1.wb index ae20fef6e..65f85e9b7 100644 --- a/tests/gwb-dat/app_wb1.wb +++ b/tests/gwb-dat/app_wb1.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/app_wb2.wb b/tests/gwb-dat/app_wb2.wb index b0b380799..f7989b3ef 100644 --- a/tests/gwb-dat/app_wb2.wb +++ b/tests/gwb-dat/app_wb2.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "features": [ {"model":"continental plate", "name":"Caribbean", "max depth":250e3, "coordinates":[[-1e3,500e3],[500e3,500e3],[500e3,1000e3],[-1e3,1000e3]], diff --git a/tests/gwb-dat/app_wb3.wb b/tests/gwb-dat/app_wb3.wb index b0b380799..f7989b3ef 100644 --- a/tests/gwb-dat/app_wb3.wb +++ b/tests/gwb-dat/app_wb3.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "features": [ {"model":"continental plate", "name":"Caribbean", "max depth":250e3, "coordinates":[[-1e3,500e3],[500e3,500e3],[500e3,1000e3],[-1e3,1000e3]], diff --git a/tests/gwb-dat/cartesian_fault_x_and_y_direction.wb b/tests/gwb-dat/cartesian_fault_x_and_y_direction.wb index 6af3b6efc..a1c162ce1 100644 --- a/tests/gwb-dat/cartesian_fault_x_and_y_direction.wb +++ b/tests/gwb-dat/cartesian_fault_x_and_y_direction.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "interpolation":"continuous monotone spline", "features": [ diff --git a/tests/gwb-dat/cartesian_multiridge.wb b/tests/gwb-dat/cartesian_multiridge.wb index cf9b98258..12eac5a22 100644 --- a/tests/gwb-dat/cartesian_multiridge.wb +++ b/tests/gwb-dat/cartesian_multiridge.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "cross section": [[0,0],[400e3,500e3]], "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, diff --git a/tests/gwb-dat/cartesian_no_ridge_drift.wb b/tests/gwb-dat/cartesian_no_ridge_drift.wb index 8bc20540c..6ece95a13 100644 --- a/tests/gwb-dat/cartesian_no_ridge_drift.wb +++ b/tests/gwb-dat/cartesian_no_ridge_drift.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[10000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/cartesian_slab_linear_adiabat.wb b/tests/gwb-dat/cartesian_slab_linear_adiabat.wb index 8ae69fe29..c0fc93fba 100644 --- a/tests/gwb-dat/cartesian_slab_linear_adiabat.wb +++ b/tests/gwb-dat/cartesian_slab_linear_adiabat.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[1000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/cartesian_slab_mass_conserving.wb b/tests/gwb-dat/cartesian_slab_mass_conserving.wb index c1cc7e56b..bcec24df3 100644 --- a/tests/gwb-dat/cartesian_slab_mass_conserving.wb +++ b/tests/gwb-dat/cartesian_slab_mass_conserving.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[0,0],[1000e3,0]],"surface temperature":273, "force surface temperature":true, "potential mantle temperature":1623, "thermal expansion coefficient":3.1e-5, diff --git a/tests/gwb-dat/cartesian_slab_spline_complex.wb b/tests/gwb-dat/cartesian_slab_spline_complex.wb index 98382b3e0..cc43be20a 100644 --- a/tests/gwb-dat/cartesian_slab_spline_complex.wb +++ b/tests/gwb-dat/cartesian_slab_spline_complex.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,50e3],[50e3,0]], "features": [ diff --git a/tests/gwb-dat/cartesian_slab_x_and_y_direction.wb b/tests/gwb-dat/cartesian_slab_x_and_y_direction.wb index f87247d55..c67e518d2 100644 --- a/tests/gwb-dat/cartesian_slab_x_and_y_direction.wb +++ b/tests/gwb-dat/cartesian_slab_x_and_y_direction.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "interpolation":"continuous monotone spline", "features": [ diff --git a/tests/gwb-dat/cartesian_young_slab_mass_conserving.wb b/tests/gwb-dat/cartesian_young_slab_mass_conserving.wb index ad3ef4402..b8fb3355c 100644 --- a/tests/gwb-dat/cartesian_young_slab_mass_conserving.wb +++ b/tests/gwb-dat/cartesian_young_slab_mass_conserving.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[0,0],[1000e3,0]],"surface temperature":273, "force surface temperature":true, "potential mantle temperature":1623, "thermal expansion coefficient":3.1e-5, diff --git a/tests/gwb-dat/chunk_slab_mass_conserving.wb b/tests/gwb-dat/chunk_slab_mass_conserving.wb index 880cb3c53..a4a64cf87 100644 --- a/tests/gwb-dat/chunk_slab_mass_conserving.wb +++ b/tests/gwb-dat/chunk_slab_mass_conserving.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment", "radius":6371000.0}, "cross section":[[0,0],[45,0]],"surface temperature":273, "force surface temperature":true, "potential mantle temperature":1673, "thermal expansion coefficient":3.1e-5, diff --git a/tests/gwb-dat/continental_min_max_surface.wb b/tests/gwb-dat/continental_min_max_surface.wb index 9d005767a..6e7cbe00b 100644 --- a/tests/gwb-dat/continental_min_max_surface.wb +++ b/tests/gwb-dat/continental_min_max_surface.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "features":[ { diff --git a/tests/gwb-dat/continental_min_max_surface_spherical.wb b/tests/gwb-dat/continental_min_max_surface_spherical.wb index a88363ec1..c0c1da345 100644 --- a/tests/gwb-dat/continental_min_max_surface_spherical.wb +++ b/tests/gwb-dat/continental_min_max_surface_spherical.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment"}, "features":[ { diff --git a/tests/gwb-dat/depth_method_slab_begin_at_end_segment.wb b/tests/gwb-dat/depth_method_slab_begin_at_end_segment.wb index 159f958d7..0b0144757 100644 --- a/tests/gwb-dat/depth_method_slab_begin_at_end_segment.wb +++ b/tests/gwb-dat/depth_method_slab_begin_at_end_segment.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"begin at end segment"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[45,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/fault_complex_spherical.wb b/tests/gwb-dat/fault_complex_spherical.wb index 52614be34..b175d2341 100644 --- a/tests/gwb-dat/fault_complex_spherical.wb +++ b/tests/gwb-dat/fault_complex_spherical.wb @@ -1,4 +1,4 @@ -{"version": "0.6", "interpolation": "continuous monotone spline", "coordinate system": {"model": "spherical", "depth method": "starting point"}, "features": [{"model": "fault", "name": "fault_2", "coordinates": [[144.8, 41.0], [143.0, 42.0], [142.2, 43.0], [142.0, 44.0], [142.0, 46.0], [142.2, 48.0], [142.5, 50.0], [142.5, 52.5], [142.5, 55.0], [147.0, 61.9], [146.2, 63.3], [146.1, 63.9], [142.1, 66.2], [140.0, 67.7], [126.2, 70.2], [122.8, 75.5], [126.7, 78.2], [122.0, 80.7], [98.5, 85.0], [43.0, 86.5], [7.5, 84.9], [0.0, 84.1], [-4.5, 83.4], [-6.0, 82.1], [-3.5, 80.9], [-2.0, 80.38], [4.25, 79.6], [3.0, 79.04], [7.0, 78.45], [7.6, 77.9], [7.4, 76.75], [7.2, 76.55], [7.3, 75.6], [8.4, 74.8], [8.4, 74.6], [8.7, 74.35], [8.8, 73.95], [8.25, 73.55], [7.8, 73.4], [6.8, 73.25], [4.4, 72.8], [1.1, 72.2], [-4.699999999999989, 71.4], [-6.5, 70.92], [-12.0, 71.7], [-13.199999999999989, 70.92], [-13.800000000000011, 70.97], [-14.699999999999989, 70.55], [-15.399999999999977, 70.0], [-16.5, 68.9], [-17.30000000000001, 68.98], [-18.100000000000023, 68.4], [-18.5, 67.7], [-19.5, 66.7], [-16.5, 66.4], [-17.0, 66.0], [-17.0, 65.0], [-19.0, 63.7], [-22.5, 64.1], [-24.600000000000023, 63.0], [-27.0, 61.6], [-29.5, 60.0], [-34.0, 57.0], [-35.30000000000001, 55.2], [-35.19999999999999, 53.0], [-35.0, 52.7], [-31.80000000000001, 52.6], [-31.80000000000001, 52.2], [-30.0, 52.1], [-30.0, 51.2], [-29.0, 49.8], [-27.5, 47.8], [-27.399999999999977, 46.5], [-28.0, 45.0], [-28.19999999999999, 44.5], [-28.5, 43.8], [-29.0, 43.3], [-29.30000000000001, 42.9], [-29.30000000000001, 42.7], [-29.30000000000001, 42.3], [-29.30000000000001, 41.7], [-29.69999999999999, 40.0], [-29.75, 39.45]], "dip point": [0, 1], "min depth": -1000.0, "max depth": 300000.0, "segments": [{"length": 300000.0, "thickness": [100000.0], "angle": [90, 90]}], "composition models": [{"model": "uniform", "compositions": [0], "max distance fault center": 50000.0}]}, +{"version": "1.0", "interpolation": "continuous monotone spline", "coordinate system": {"model": "spherical", "depth method": "starting point"}, "features": [{"model": "fault", "name": "fault_2", "coordinates": [[144.8, 41.0], [143.0, 42.0], [142.2, 43.0], [142.0, 44.0], [142.0, 46.0], [142.2, 48.0], [142.5, 50.0], [142.5, 52.5], [142.5, 55.0], [147.0, 61.9], [146.2, 63.3], [146.1, 63.9], [142.1, 66.2], [140.0, 67.7], [126.2, 70.2], [122.8, 75.5], [126.7, 78.2], [122.0, 80.7], [98.5, 85.0], [43.0, 86.5], [7.5, 84.9], [0.0, 84.1], [-4.5, 83.4], [-6.0, 82.1], [-3.5, 80.9], [-2.0, 80.38], [4.25, 79.6], [3.0, 79.04], [7.0, 78.45], [7.6, 77.9], [7.4, 76.75], [7.2, 76.55], [7.3, 75.6], [8.4, 74.8], [8.4, 74.6], [8.7, 74.35], [8.8, 73.95], [8.25, 73.55], [7.8, 73.4], [6.8, 73.25], [4.4, 72.8], [1.1, 72.2], [-4.699999999999989, 71.4], [-6.5, 70.92], [-12.0, 71.7], [-13.199999999999989, 70.92], [-13.800000000000011, 70.97], [-14.699999999999989, 70.55], [-15.399999999999977, 70.0], [-16.5, 68.9], [-17.30000000000001, 68.98], [-18.100000000000023, 68.4], [-18.5, 67.7], [-19.5, 66.7], [-16.5, 66.4], [-17.0, 66.0], [-17.0, 65.0], [-19.0, 63.7], [-22.5, 64.1], [-24.600000000000023, 63.0], [-27.0, 61.6], [-29.5, 60.0], [-34.0, 57.0], [-35.30000000000001, 55.2], [-35.19999999999999, 53.0], [-35.0, 52.7], [-31.80000000000001, 52.6], [-31.80000000000001, 52.2], [-30.0, 52.1], [-30.0, 51.2], [-29.0, 49.8], [-27.5, 47.8], [-27.399999999999977, 46.5], [-28.0, 45.0], [-28.19999999999999, 44.5], [-28.5, 43.8], [-29.0, 43.3], [-29.30000000000001, 42.9], [-29.30000000000001, 42.7], [-29.30000000000001, 42.3], [-29.30000000000001, 41.7], [-29.69999999999999, 40.0], [-29.75, 39.45]], "dip point": [0, 1], "min depth": -1000.0, "max depth": 300000.0, "segments": [{"length": 300000.0, "thickness": [100000.0], "angle": [90, 90]}], "composition models": [{"model": "uniform", "compositions": [0], "max distance fault center": 50000.0}]}, {"model": "fault", "name": "fault_3", "coordinates": [[-29.75, 39.45], [-29.100000000000023, 39.3], [-28.100000000000023, 39.0], [-27.399999999999977, 38.8], [-26.80000000000001, 38.4], [-26.19999999999999, 38.1], [-25.399999999999977, 37.7], [-24.69999999999999, 37.3], [-24.100000000000023, 36.82], [-23.19999999999999, 36.97], [-21.5, 37.07], [-21.30000000000001, 37.1], [-20.899999999999977, 37.14], [-20.5, 37.13], [-20.19999999999999, 37.12], [-18.0, 37.8], [-16.0, 37.8], [-14.0, 37.0], [-10.0, 36.0], [-6.0, 36.0], [1.4, 36.2], [6.8, 36.4], [14.2, 38.5], [15.1, 38.5], [16.6, 38.3], [17.3, 38.9], [18.2, 39.7], [18.9, 40.2], [19.4, 39.9], [19.7, 39.1], [20.0, 38.2], [20.5, 37.3], [20.9, 36.5], [21.6, 35.8], [22.2, 35.2], [23.0, 34.7], [23.7, 34.4], [24.6, 34.2], [25.7, 34.3], [26.7, 34.4], [27.4, 34.5], [28.2, 34.8], [29.2, 35.2], [29.8, 35.7], [30.3, 35.8], [30.9, 35.4], [31.4, 34.9], [32.3, 34.3], [32.9, 34.2], [34.0, 34.6], [34.5, 35.0], [35.2, 35.6], [35.6, 35.9]], "dip point": [0, 1], "min depth": -1000.0, "max depth": 300000.0, "segments": [{"length": 300000.0, "thickness": [100000.0], "angle": [90, 90]}], "composition models": [{"model": "uniform", "compositions": [0], "max distance fault center": 50000.0}]}, {"model": "fault", "name": "fault_4", "coordinates": [[-29.75, 39.45], [-29.94999999999999, 39.45], [-30.30000000000001, 38.4], [-30.649999999999977, 38.3], [-30.80000000000001, 38.0], [-31.149999999999977, 37.9], [-32.0, 37.5], [-33.19999999999999, 36.8], [-33.69999999999999, 36.5], [-34.10000000000002, 36.0], [-35.0, 35.0], [-36.39999999999998, 35.3], [-37.80000000000001, 33.5], [-39.30000000000001, 33.8], [-40.5, 31.9], [-41.69999999999999, 30.9], [-41.89999999999998, 30.5], [-42.0, 30.0], [-42.69999999999999, 30.1], [-43.14999999999998, 28.75], [-43.75, 28.75], [-44.19999999999999, 27.5], [-44.5, 26.9], [-44.80000000000001, 26.2], [-45.0, 25.7], [-45.39999999999998, 25.2], [-46.10000000000002, 24.5], [-46.30000000000001, 24.2], [-46.30000000000001, 23.9], [-46.30000000000001, 23.9], [-44.89999999999998, 23.7], [-45.0, 23.0], [-45.0, 22.8], [-45.5, 22.0], [-45.60000000000002, 21.3], [-45.69999999999999, 20.3]], "dip point": [0, 1], "min depth": -1000.0, "max depth": 300000.0, "segments": [{"length": 300000.0, "thickness": [100000.0], "angle": [90, 90]}], "composition models": [{"model": "uniform", "compositions": [0], "max distance fault center": 50000.0}]}, {"model": "fault", "name": "fault_5", "coordinates": [[-45.7, 20.3], [-59.39999999999998, 16.3], [-59.80000000000001, 16.9], [-60.30000000000001, 17.4], [-61, 18.0]], "dip point": [0, 1], "min depth": -1000.0, "max depth": 300000.0, "segments": [{"length": 300000.0, "thickness": [100000.0], "angle": [90, 90]}], "composition models": [{"model": "uniform", "compositions": [0], "max distance fault center": 50000.0}]}, diff --git a/tests/gwb-dat/geodynamic_world_builder_mar.json b/tests/gwb-dat/geodynamic_world_builder_mar.json index 90d51ff3e..9674df9a9 100644 --- a/tests/gwb-dat/geodynamic_world_builder_mar.json +++ b/tests/gwb-dat/geodynamic_world_builder_mar.json @@ -1 +1 @@ -{"version": "0.6", "coordinate system": {"model": "spherical", "depth method": "starting point"}, "features": [{"model": "fault", "name": "fault_1", "coordinates": [[-24.612, -1.103], [-24.603095, -1.101906], [-24.59419, -1.100811], [-24.585285, -1.099717], [-24.57638, -1.098622], [-24.567475, -1.097528], [-24.55857, -1.096433], [-24.549665, -1.095338], [-24.540761, -1.094244], [-24.531856, -1.093149], [-24.522951, -1.092055], [-24.514046, -1.09096], [-24.505141, -1.089865], [-24.496236, -1.08877], [-24.487331, -1.087676], [-24.478426, -1.086581], [-24.469521, -1.085486], [-24.460617, -1.084391], [-24.451712, -1.083296], [-24.442807, -1.082201], [-24.433902, -1.081106], [-24.424997, -1.080012], [-24.416092, -1.078917], [-24.407188, -1.077822], [-24.398283, -1.076726], [-24.389378, -1.075631], [-24.380473, -1.074536], [-24.371568, -1.073441], [-24.362664, -1.072346], [-24.353759, -1.071251], [-24.344854, -1.070156], [-24.335949, -1.069061], [-24.327044, -1.067965], [-24.31814, -1.06687], [-24.309235, -1.065775], [-24.30033, -1.064679], [-24.291426, -1.063584], [-24.282521, -1.062489], [-24.273616, -1.061393], [-24.264711, -1.060298], [-24.255807, -1.059202], [-24.246902, -1.058107], [-24.237997, -1.057011], [-24.229093, -1.055916], [-24.220188, -1.05482], [-24.211283, -1.053725], [-24.202378, -1.052629], [-24.193474, -1.051534], [-24.184569, -1.050438], [-24.175665, -1.049342], [-24.16676, -1.048246], [-24.157855, -1.047151], [-24.148951, -1.046055], [-24.140046, -1.044959], [-24.131141, -1.043863], [-24.122237, -1.042768], [-24.113332, -1.041672], [-24.104428, -1.040576], [-24.095523, -1.03948], [-24.086618, -1.038384], [-24.077714, -1.037288], [-24.068809, -1.036192], [-24.059905, -1.035096], [-24.051, -1.034]], "dip point": [0.9698279114934465, 0.24379052911928262], "min depth": -100.0, "max depth": 20000.0, "segments": [{"length": 20000.0, "thickness": [100000.0], "angle": [90.0, 90.0]}], "composition models": [{"model": "smooth", "compositions": [0], "side distance fault center": 500000.0}]}, {"model": "fault", "name": "fault_2", "coordinates": [[-24.051, -1.034], [-24.042095, -1.03289], [-24.03319, -1.031779], [-24.024285, -1.030669], [-24.01538, -1.029558], [-24.006475, -1.028448], [-23.99757, -1.027338], [-23.988665, -1.026227], [-23.979761, -1.025117], [-23.970856, -1.024006], [-23.961951, -1.022895], [-23.953046, -1.021785], [-23.944141, -1.020674], [-23.935236, -1.019564], [-23.926331, -1.018453], [-23.917426, -1.017342], [-23.908522, -1.016231], [-23.899617, -1.015121], [-23.890712, -1.01401], [-23.881807, -1.012899], [-23.872902, -1.011788], [-23.863997, -1.010677], [-23.855093, -1.009567], [-23.846188, -1.008456], [-23.837283, -1.007345], [-23.828378, -1.006234], [-23.819473, -1.005123], [-23.810569, -1.004012], [-23.801664, -1.002901], [-23.792759, -1.00179], [-23.783854, -1.000679], [-23.774949, -0.999568], [-23.766045, -0.998456], [-23.75714, -0.997345], [-23.748235, -0.996234], [-23.73933, -0.995123], [-23.730426, -0.994012], [-23.721521, -0.992901], [-23.712616, -0.991789], [-23.703711, -0.990678], [-23.694807, -0.989567], [-23.685902, -0.988455], [-23.676997, -0.987344], [-23.668093, -0.986233], [-23.659188, -0.985121], [-23.650283, -0.98401], [-23.641379, -0.982898], [-23.632474, -0.981787], [-23.623569, -0.980675], [-23.614665, -0.979564], [-23.60576, -0.978452], [-23.596855, -0.977341], [-23.587951, -0.976229], [-23.579046, -0.975117], [-23.570141, -0.974006], [-23.561237, -0.972894], [-23.552332, -0.971782], [-23.543428, -0.970671], [-23.534523, -0.969559], [-23.525618, -0.968447], [-23.516714, -0.967335], [-23.507809, -0.966224], [-23.498905, -0.965112], [-23.49, -0.964]], "dip point": [0.9752552113408824, 0.22108204981963328], "min depth": -100.0, "max depth": 20000.0, "segments": [{"length": 20000.0, "thickness": [100000.0], "angle": [90.0, 90.0]}], "composition models": [{"model": "smooth", "compositions": [0], "side distance fault center": 500000.0}]}, {"model": "fault", "name": "fault_3", "coordinates": [[-23.49, -0.964], [-23.48119, -0.962667], [-23.472381, -0.961335], [-23.463571, -0.960002], [-23.454761, -0.958669], [-23.445951, -0.957337], [-23.437142, -0.956004], [-23.428332, -0.954671], [-23.419522, -0.953338], [-23.410713, -0.952005], [-23.401903, -0.950673], [-23.393093, -0.94934], [-23.384284, -0.948007], [-23.375474, -0.946674], [-23.366664, -0.945341], [-23.357855, -0.944008], [-23.349045, -0.942675], [-23.340236, -0.941342], [-23.331426, -0.940009], [-23.322616, -0.938676], [-23.313807, -0.937343], [-23.304997, -0.93601], [-23.296188, -0.934677], [-23.287378, -0.933343], [-23.278568, -0.93201], [-23.269759, -0.930677], [-23.260949, -0.929344], [-23.25214, -0.928011], [-23.24333, -0.926677], [-23.234521, -0.925344], [-23.225711, -0.924011], [-23.216902, -0.922678], [-23.208092, -0.921344], [-23.199282, -0.920011], [-23.190473, -0.918677], [-23.181663, -0.917344], [-23.172854, -0.916011], [-23.164044, -0.914677], [-23.155235, -0.913344], [-23.146426, -0.91201], [-23.137616, -0.910677], [-23.128807, -0.909343], [-23.119997, -0.90801], [-23.111188, -0.906676], [-23.102378, -0.905342], [-23.093569, -0.904009], [-23.084759, -0.902675], [-23.07595, -0.901342], [-23.067141, -0.900008], [-23.058331, -0.898674], [-23.049522, -0.89734], [-23.040712, -0.896007], [-23.031903, -0.894673], [-23.023094, -0.893339], [-23.014284, -0.892005], [-23.005475, -0.890671], [-22.996665, -0.889338], [-22.987856, -0.888004], [-22.979047, -0.88667], [-22.970237, -0.885336], [-22.961428, -0.884002], [-22.952619, -0.882668], [-22.943809, -0.881334], [-22.935, -0.88]], "dip point": [0.9708605070210597, 0.23964531271612796], "min depth": -100.0, "max depth": 20000.0, "segments": [{"length": 20000.0, "thickness": [100000.0], "angle": [90.0, 90.0]}], "composition models": [{"model": "smooth", "compositions": [0], "side distance fault center": 500000.0}]}]} +{"version": "1.0", "coordinate system": {"model": "spherical", "depth method": "starting point"}, "features": [{"model": "fault", "name": "fault_1", "coordinates": [[-24.612, -1.103], [-24.603095, -1.101906], [-24.59419, -1.100811], [-24.585285, -1.099717], [-24.57638, -1.098622], [-24.567475, -1.097528], [-24.55857, -1.096433], [-24.549665, -1.095338], [-24.540761, -1.094244], [-24.531856, -1.093149], [-24.522951, -1.092055], [-24.514046, -1.09096], [-24.505141, -1.089865], [-24.496236, -1.08877], [-24.487331, -1.087676], [-24.478426, -1.086581], [-24.469521, -1.085486], [-24.460617, -1.084391], [-24.451712, -1.083296], [-24.442807, -1.082201], [-24.433902, -1.081106], [-24.424997, -1.080012], [-24.416092, -1.078917], [-24.407188, -1.077822], [-24.398283, -1.076726], [-24.389378, -1.075631], [-24.380473, -1.074536], [-24.371568, -1.073441], [-24.362664, -1.072346], [-24.353759, -1.071251], [-24.344854, -1.070156], [-24.335949, -1.069061], [-24.327044, -1.067965], [-24.31814, -1.06687], [-24.309235, -1.065775], [-24.30033, -1.064679], [-24.291426, -1.063584], [-24.282521, -1.062489], [-24.273616, -1.061393], [-24.264711, -1.060298], [-24.255807, -1.059202], [-24.246902, -1.058107], [-24.237997, -1.057011], [-24.229093, -1.055916], [-24.220188, -1.05482], [-24.211283, -1.053725], [-24.202378, -1.052629], [-24.193474, -1.051534], [-24.184569, -1.050438], [-24.175665, -1.049342], [-24.16676, -1.048246], [-24.157855, -1.047151], [-24.148951, -1.046055], [-24.140046, -1.044959], [-24.131141, -1.043863], [-24.122237, -1.042768], [-24.113332, -1.041672], [-24.104428, -1.040576], [-24.095523, -1.03948], [-24.086618, -1.038384], [-24.077714, -1.037288], [-24.068809, -1.036192], [-24.059905, -1.035096], [-24.051, -1.034]], "dip point": [0.9698279114934465, 0.24379052911928262], "min depth": -100.0, "max depth": 20000.0, "segments": [{"length": 20000.0, "thickness": [100000.0], "angle": [90.0, 90.0]}], "composition models": [{"model": "smooth", "compositions": [0], "side distance fault center": 500000.0}]}, {"model": "fault", "name": "fault_2", "coordinates": [[-24.051, -1.034], [-24.042095, -1.03289], [-24.03319, -1.031779], [-24.024285, -1.030669], [-24.01538, -1.029558], [-24.006475, -1.028448], [-23.99757, -1.027338], [-23.988665, -1.026227], [-23.979761, -1.025117], [-23.970856, -1.024006], [-23.961951, -1.022895], [-23.953046, -1.021785], [-23.944141, -1.020674], [-23.935236, -1.019564], [-23.926331, -1.018453], [-23.917426, -1.017342], [-23.908522, -1.016231], [-23.899617, -1.015121], [-23.890712, -1.01401], [-23.881807, -1.012899], [-23.872902, -1.011788], [-23.863997, -1.010677], [-23.855093, -1.009567], [-23.846188, -1.008456], [-23.837283, -1.007345], [-23.828378, -1.006234], [-23.819473, -1.005123], [-23.810569, -1.004012], [-23.801664, -1.002901], [-23.792759, -1.00179], [-23.783854, -1.000679], [-23.774949, -0.999568], [-23.766045, -0.998456], [-23.75714, -0.997345], [-23.748235, -0.996234], [-23.73933, -0.995123], [-23.730426, -0.994012], [-23.721521, -0.992901], [-23.712616, -0.991789], [-23.703711, -0.990678], [-23.694807, -0.989567], [-23.685902, -0.988455], [-23.676997, -0.987344], [-23.668093, -0.986233], [-23.659188, -0.985121], [-23.650283, -0.98401], [-23.641379, -0.982898], [-23.632474, -0.981787], [-23.623569, -0.980675], [-23.614665, -0.979564], [-23.60576, -0.978452], [-23.596855, -0.977341], [-23.587951, -0.976229], [-23.579046, -0.975117], [-23.570141, -0.974006], [-23.561237, -0.972894], [-23.552332, -0.971782], [-23.543428, -0.970671], [-23.534523, -0.969559], [-23.525618, -0.968447], [-23.516714, -0.967335], [-23.507809, -0.966224], [-23.498905, -0.965112], [-23.49, -0.964]], "dip point": [0.9752552113408824, 0.22108204981963328], "min depth": -100.0, "max depth": 20000.0, "segments": [{"length": 20000.0, "thickness": [100000.0], "angle": [90.0, 90.0]}], "composition models": [{"model": "smooth", "compositions": [0], "side distance fault center": 500000.0}]}, {"model": "fault", "name": "fault_3", "coordinates": [[-23.49, -0.964], [-23.48119, -0.962667], [-23.472381, -0.961335], [-23.463571, -0.960002], [-23.454761, -0.958669], [-23.445951, -0.957337], [-23.437142, -0.956004], [-23.428332, -0.954671], [-23.419522, -0.953338], [-23.410713, -0.952005], [-23.401903, -0.950673], [-23.393093, -0.94934], [-23.384284, -0.948007], [-23.375474, -0.946674], [-23.366664, -0.945341], [-23.357855, -0.944008], [-23.349045, -0.942675], [-23.340236, -0.941342], [-23.331426, -0.940009], [-23.322616, -0.938676], [-23.313807, -0.937343], [-23.304997, -0.93601], [-23.296188, -0.934677], [-23.287378, -0.933343], [-23.278568, -0.93201], [-23.269759, -0.930677], [-23.260949, -0.929344], [-23.25214, -0.928011], [-23.24333, -0.926677], [-23.234521, -0.925344], [-23.225711, -0.924011], [-23.216902, -0.922678], [-23.208092, -0.921344], [-23.199282, -0.920011], [-23.190473, -0.918677], [-23.181663, -0.917344], [-23.172854, -0.916011], [-23.164044, -0.914677], [-23.155235, -0.913344], [-23.146426, -0.91201], [-23.137616, -0.910677], [-23.128807, -0.909343], [-23.119997, -0.90801], [-23.111188, -0.906676], [-23.102378, -0.905342], [-23.093569, -0.904009], [-23.084759, -0.902675], [-23.07595, -0.901342], [-23.067141, -0.900008], [-23.058331, -0.898674], [-23.049522, -0.89734], [-23.040712, -0.896007], [-23.031903, -0.894673], [-23.023094, -0.893339], [-23.014284, -0.892005], [-23.005475, -0.890671], [-22.996665, -0.889338], [-22.987856, -0.888004], [-22.979047, -0.88667], [-22.970237, -0.885336], [-22.961428, -0.884002], [-22.952619, -0.882668], [-22.943809, -0.881334], [-22.935, -0.88]], "dip point": [0.9708605070210597, 0.23964531271612796], "min depth": -100.0, "max depth": 20000.0, "segments": [{"length": 20000.0, "thickness": [100000.0], "angle": [90.0, 90.0]}], "composition models": [{"model": "smooth", "compositions": [0], "side distance fault center": 500000.0}]}]} diff --git a/tests/gwb-dat/half_space_plate_model.wb b/tests/gwb-dat/half_space_plate_model.wb index a44c2d8c7..7413ae237 100644 --- a/tests/gwb-dat/half_space_plate_model.wb +++ b/tests/gwb-dat/half_space_plate_model.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[1000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/half_space_variable_spreading.wb b/tests/gwb-dat/half_space_variable_spreading.wb index 88e7706b3..86eb00332 100644 --- a/tests/gwb-dat/half_space_variable_spreading.wb +++ b/tests/gwb-dat/half_space_variable_spreading.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/mantle_layer_min_max_surface.wb b/tests/gwb-dat/mantle_layer_min_max_surface.wb index 68285ba89..118b5a82b 100644 --- a/tests/gwb-dat/mantle_layer_min_max_surface.wb +++ b/tests/gwb-dat/mantle_layer_min_max_surface.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "features":[ diff --git a/tests/gwb-dat/mantle_layer_min_max_surface_spherical.wb b/tests/gwb-dat/mantle_layer_min_max_surface_spherical.wb index 28e6ea938..bceeabc93 100644 --- a/tests/gwb-dat/mantle_layer_min_max_surface_spherical.wb +++ b/tests/gwb-dat/mantle_layer_min_max_surface_spherical.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment"}, "gravity model":{"model":"uniform", "magnitude":10}, "features":[ diff --git a/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_old.wb b/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_old.wb index 38e826083..d31fa5774 100644 --- a/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_old.wb +++ b/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_old.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[10000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_young.wb b/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_young.wb index cc3b53e47..7bbfddbf4 100644 --- a/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_young.wb +++ b/tests/gwb-dat/mass_conserving_slab_temperature_plate_model_young.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[10000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/mass_conserving_slab_temperature_spline.wb b/tests/gwb-dat/mass_conserving_slab_temperature_spline.wb index b5eb71088..00780777c 100644 --- a/tests/gwb-dat/mass_conserving_slab_temperature_spline.wb +++ b/tests/gwb-dat/mass_conserving_slab_temperature_spline.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[10000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb index 970e2e9a1..2608d7edb 100644 --- a/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb +++ b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[10000e3,0]],"surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/oceanic_min_max_surface.wb b/tests/gwb-dat/oceanic_min_max_surface.wb index 153f40ad6..cf092788d 100644 --- a/tests/gwb-dat/oceanic_min_max_surface.wb +++ b/tests/gwb-dat/oceanic_min_max_surface.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "features":[ diff --git a/tests/gwb-dat/oceanic_min_max_surface_spherical.wb b/tests/gwb-dat/oceanic_min_max_surface_spherical.wb index 33c451f5e..25aeae315 100644 --- a/tests/gwb-dat/oceanic_min_max_surface_spherical.wb +++ b/tests/gwb-dat/oceanic_min_max_surface_spherical.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment"}, "gravity model":{"model":"uniform", "magnitude":10}, "features":[ diff --git a/tests/gwb-dat/plate_model_variable_spreading.wb b/tests/gwb-dat/plate_model_variable_spreading.wb index 3d994e44b..830efb70e 100644 --- a/tests/gwb-dat/plate_model_variable_spreading.wb +++ b/tests/gwb-dat/plate_model_variable_spreading.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "gravity model":{"model":"uniform", "magnitude":10}, "surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/plume_gaussian.wb b/tests/gwb-dat/plume_gaussian.wb index 6c74bc87e..1c42877aa 100644 --- a/tests/gwb-dat/plume_gaussian.wb +++ b/tests/gwb-dat/plume_gaussian.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "surface temperature":273.15, "potential mantle temperature":1573.15, "features": diff --git a/tests/gwb-dat/plume_gaussian_spherical.wb b/tests/gwb-dat/plume_gaussian_spherical.wb index a57c814a4..3db7e624a 100644 --- a/tests/gwb-dat/plume_gaussian_spherical.wb +++ b/tests/gwb-dat/plume_gaussian_spherical.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"starting point"}, "maximum distance between coordinates":0.01, "thermal expansion coefficient":0.0, diff --git a/tests/gwb-dat/random_uniform_texture_all_features_seed1.wb b/tests/gwb-dat/random_uniform_texture_all_features_seed1.wb index 63e3fa94a..76d0b5a69 100644 --- a/tests/gwb-dat/random_uniform_texture_all_features_seed1.wb +++ b/tests/gwb-dat/random_uniform_texture_all_features_seed1.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "random number seed":1, "features": diff --git a/tests/gwb-dat/random_uniform_texture_all_features_seed1000.wb b/tests/gwb-dat/random_uniform_texture_all_features_seed1000.wb index 9372d2ea5..3a2cebd39 100644 --- a/tests/gwb-dat/random_uniform_texture_all_features_seed1000.wb +++ b/tests/gwb-dat/random_uniform_texture_all_features_seed1000.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"cartesian"}, "random number seed":1000, "features": diff --git a/tests/gwb-dat/slab_complex_spherical.wb b/tests/gwb-dat/slab_complex_spherical.wb index 49cf69cea..d8df77734 100644 --- a/tests/gwb-dat/slab_complex_spherical.wb +++ b/tests/gwb-dat/slab_complex_spherical.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment"}, "cross section":[[0,0],[10,0]], "features": diff --git a/tests/gwb-dat/slab_interpolation_180pm_CMS.wb b/tests/gwb-dat/slab_interpolation_180pm_CMS.wb index c7ae9ddc7..3b642267f 100644 --- a/tests/gwb-dat/slab_interpolation_180pm_CMS.wb +++ b/tests/gwb-dat/slab_interpolation_180pm_CMS.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"begin segment"}, "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,0],[10,0]], diff --git a/tests/gwb-dat/slab_interpolation_simple_CMS.wb b/tests/gwb-dat/slab_interpolation_simple_CMS.wb index 5522cdfd1..7df3d6580 100644 --- a/tests/gwb-dat/slab_interpolation_simple_CMS.wb +++ b/tests/gwb-dat/slab_interpolation_simple_CMS.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "interpolation":"continuous monotone spline", diff --git a/tests/gwb-dat/slab_interpolation_simple_curved_CMS.wb b/tests/gwb-dat/slab_interpolation_simple_curved_CMS.wb index 36ebef7f8..590802d15 100644 --- a/tests/gwb-dat/slab_interpolation_simple_curved_CMS.wb +++ b/tests/gwb-dat/slab_interpolation_simple_curved_CMS.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,50e3],[50e3,0]], "interpolation":"continuous monotone spline", "features": diff --git a/tests/gwb-dat/slab_interpolation_simple_curved_none.wb b/tests/gwb-dat/slab_interpolation_simple_curved_none.wb index 2c58e6b75..09dfdd057 100644 --- a/tests/gwb-dat/slab_interpolation_simple_curved_none.wb +++ b/tests/gwb-dat/slab_interpolation_simple_curved_none.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,50e3],[50e3,0]], "features": [ diff --git a/tests/gwb-dat/slab_interpolation_simple_none.wb b/tests/gwb-dat/slab_interpolation_simple_none.wb index b5d0ef15e..8002a1121 100644 --- a/tests/gwb-dat/slab_interpolation_simple_none.wb +++ b/tests/gwb-dat/slab_interpolation_simple_none.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,50e3],[50e3,0]], "features": [ diff --git a/tests/gwb-dat/smooth_composition_fault.wb b/tests/gwb-dat/smooth_composition_fault.wb index 3db416f1e..1649c1a03 100644 --- a/tests/gwb-dat/smooth_composition_fault.wb +++ b/tests/gwb-dat/smooth_composition_fault.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system": {"model": "spherical", "depth method": "starting point"}, "features": [ diff --git a/tests/gwb-dat/spherical_fault_interpolation_simple_none.wb b/tests/gwb-dat/spherical_fault_interpolation_simple_none.wb index 7dcf1bb94..4d21799ef 100644 --- a/tests/gwb-dat/spherical_fault_interpolation_simple_none.wb +++ b/tests/gwb-dat/spherical_fault_interpolation_simple_none.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "features": [ diff --git a/tests/gwb-dat/spherical_half_space_model_ridge.wb b/tests/gwb-dat/spherical_half_space_model_ridge.wb index e79e7ca6e..c014da9df 100644 --- a/tests/gwb-dat/spherical_half_space_model_ridge.wb +++ b/tests/gwb-dat/spherical_half_space_model_ridge.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment"}, "features": [ diff --git a/tests/gwb-dat/spherical_mc_slab_and_half_space_plate_model.wb b/tests/gwb-dat/spherical_mc_slab_and_half_space_plate_model.wb index 76ae2b827..e8fac73ee 100644 --- a/tests/gwb-dat/spherical_mc_slab_and_half_space_plate_model.wb +++ b/tests/gwb-dat/spherical_mc_slab_and_half_space_plate_model.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"begin at end segment", "radius":665e3}, "cross section":[[0,0],[45,0]],"surface temperature":273, "force surface temperature":true, "potential mantle temperature":1673, "thermal expansion coefficient":3.1e-5, diff --git a/tests/gwb-dat/spherical_plate_cooling_model_ridge.wb b/tests/gwb-dat/spherical_plate_cooling_model_ridge.wb index a9de7e1e7..4965470d2 100644 --- a/tests/gwb-dat/spherical_plate_cooling_model_ridge.wb +++ b/tests/gwb-dat/spherical_plate_cooling_model_ridge.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "coordinate system":{"model":"spherical", "depth method":"begin at end segment"}, "features": [ diff --git a/tests/gwb-dat/spherical_ridge_distance_check.wb b/tests/gwb-dat/spherical_ridge_distance_check.wb index b2a75f137..a325e7e6c 100644 --- a/tests/gwb-dat/spherical_ridge_distance_check.wb +++ b/tests/gwb-dat/spherical_ridge_distance_check.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"starting point"}, "gravity model":{"model":"uniform", "magnitude":10}, "surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/spherical_slab_A1.wb b/tests/gwb-dat/spherical_slab_A1.wb index 8fddae646..345d2cb6a 100644 --- a/tests/gwb-dat/spherical_slab_A1.wb +++ b/tests/gwb-dat/spherical_slab_A1.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "features": [ diff --git a/tests/gwb-dat/spherical_slab_A2.wb b/tests/gwb-dat/spherical_slab_A2.wb index 8fddae646..345d2cb6a 100644 --- a/tests/gwb-dat/spherical_slab_A2.wb +++ b/tests/gwb-dat/spherical_slab_A2.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "features": [ diff --git a/tests/gwb-dat/spherical_slab_interpolation_simple_CMS.wb b/tests/gwb-dat/spherical_slab_interpolation_simple_CMS.wb index dbf986fd4..5bd1f3f45 100644 --- a/tests/gwb-dat/spherical_slab_interpolation_simple_CMS.wb +++ b/tests/gwb-dat/spherical_slab_interpolation_simple_CMS.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "interpolation":"continuous monotone spline", "features": diff --git a/tests/gwb-dat/spherical_slab_interpolation_simple_none.wb b/tests/gwb-dat/spherical_slab_interpolation_simple_none.wb index 8fddae646..345d2cb6a 100644 --- a/tests/gwb-dat/spherical_slab_interpolation_simple_none.wb +++ b/tests/gwb-dat/spherical_slab_interpolation_simple_none.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "features": [ diff --git a/tests/gwb-dat/spherical_slab_interpolation_simple_subdiv.wb b/tests/gwb-dat/spherical_slab_interpolation_simple_subdiv.wb index c568f9be4..d2e7f8e34 100644 --- a/tests/gwb-dat/spherical_slab_interpolation_simple_subdiv.wb +++ b/tests/gwb-dat/spherical_slab_interpolation_simple_subdiv.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"starting point"}, "gravity model":{"model":"uniform", "magnitude":10}, "interpolation":"continuous monotone spline", diff --git a/tests/gwb-dat/spherical_slab_plate_model.wb b/tests/gwb-dat/spherical_slab_plate_model.wb index 1a9af19e3..9964ffffa 100644 --- a/tests/gwb-dat/spherical_slab_plate_model.wb +++ b/tests/gwb-dat/spherical_slab_plate_model.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical","depth method":"begin at end segment", "radius":665e3}, "cross section":[[0,0],[45,0]],"surface temperature":273, "force surface temperature":true, "potential mantle temperature":1673, "thermal expansion coefficient":3.1e-5, diff --git a/tests/gwb-dat/spherical_variable_spreading.wb b/tests/gwb-dat/spherical_variable_spreading.wb index 04969e073..8e0939326 100644 --- a/tests/gwb-dat/spherical_variable_spreading.wb +++ b/tests/gwb-dat/spherical_variable_spreading.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"starting point"}, "gravity model":{"model":"uniform", "magnitude":10}, "surface temperature":273, "force surface temperature":true, diff --git a/tests/gwb-dat/testing_continent_no_coordinates.wb b/tests/gwb-dat/testing_continent_no_coordinates.wb index 7e4644583..f8084fd92 100644 --- a/tests/gwb-dat/testing_continent_no_coordinates.wb +++ b/tests/gwb-dat/testing_continent_no_coordinates.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/testing_fault_no_coordinates.wb b/tests/gwb-dat/testing_fault_no_coordinates.wb index a21eda8ac..d56323d6a 100644 --- a/tests/gwb-dat/testing_fault_no_coordinates.wb +++ b/tests/gwb-dat/testing_fault_no_coordinates.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/testing_mantle_layer_no_coordinates.wb b/tests/gwb-dat/testing_mantle_layer_no_coordinates.wb index c3dadfd19..40c3b7258 100644 --- a/tests/gwb-dat/testing_mantle_layer_no_coordinates.wb +++ b/tests/gwb-dat/testing_mantle_layer_no_coordinates.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/testing_oceanic_no_coordinates.wb b/tests/gwb-dat/testing_oceanic_no_coordinates.wb index 2b2c3d17a..36d8ddedb 100644 --- a/tests/gwb-dat/testing_oceanic_no_coordinates.wb +++ b/tests/gwb-dat/testing_oceanic_no_coordinates.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-dat/testing_subducting_no_coordinates.wb b/tests/gwb-dat/testing_subducting_no_coordinates.wb index 8b57793d4..0a1130599 100644 --- a/tests/gwb-dat/testing_subducting_no_coordinates.wb +++ b/tests/gwb-dat/testing_subducting_no_coordinates.wb @@ -1,5 +1,5 @@ { -"version": "0.6", +"version": "1.0", "coordinate system":{"model":"cartesian"}, "cross section":[[100e3,100e3],[400e3,500e3]], "maximum distance between coordinates": 5, diff --git a/tests/gwb-grid/2d_cartesian_plume.wb b/tests/gwb-grid/2d_cartesian_plume.wb index cb5f1970d..b9c01622b 100644 --- a/tests/gwb-grid/2d_cartesian_plume.wb +++ b/tests/gwb-grid/2d_cartesian_plume.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "cross section":[[0,0],[100,0]], "features": [ diff --git a/tests/gwb-grid/3d_annulus_plume.wb b/tests/gwb-grid/3d_annulus_plume.wb index 93a0d2c82..badb4f9d7 100644 --- a/tests/gwb-grid/3d_annulus_plume.wb +++ b/tests/gwb-grid/3d_annulus_plume.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"starting point"}, "cross section":[[0,0],[10,0]], "maximum distance between coordinates":0.01, diff --git a/tests/gwb-grid/3d_plume.wb b/tests/gwb-grid/3d_plume.wb index 1b476e744..abe0cfb63 100644 --- a/tests/gwb-grid/3d_plume.wb +++ b/tests/gwb-grid/3d_plume.wb @@ -6,7 +6,7 @@ // in clockwise direction from top to bottom. This rotation crosses from 360 // to zero degrees, making sure this crossover works correctly. { - "version": "0.6", + "version": "1.0", "surface temperature":273.15, "potential mantle temperature":1573.15, "features": diff --git a/tests/gwb-grid/3d_plume_tip.wb b/tests/gwb-grid/3d_plume_tip.wb index fecd3d54b..d5671873a 100644 --- a/tests/gwb-grid/3d_plume_tip.wb +++ b/tests/gwb-grid/3d_plume_tip.wb @@ -6,7 +6,7 @@ // in clockwise direction from top to bottom. This rotation crosses from 360 // to zero degrees, making sure this crossover works correctly. { - "version": "0.6", + "version": "1.0", "surface temperature":273.15, "potential mantle temperature":1573.15, "features": diff --git a/tests/gwb-grid/3d_sphere_plume.wb b/tests/gwb-grid/3d_sphere_plume.wb index fcf2994f3..02b404801 100644 --- a/tests/gwb-grid/3d_sphere_plume.wb +++ b/tests/gwb-grid/3d_sphere_plume.wb @@ -8,7 +8,7 @@ // the same direction the center axis is curved, but the eccentricity stays // the same. { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"starting point"}, "cross section":[[0,0],[10,0]], "maximum distance between coordinates":0.01, diff --git a/tests/gwb-grid/3d_spherical_plume.wb b/tests/gwb-grid/3d_spherical_plume.wb index 88e78b876..1be2f3ec3 100644 --- a/tests/gwb-grid/3d_spherical_plume.wb +++ b/tests/gwb-grid/3d_spherical_plume.wb @@ -8,7 +8,7 @@ // the same direction the center axis is curved, but the eccentricity stays // the same. { - "version": "0.6", + "version": "1.0", "coordinate system":{"model":"spherical", "depth method":"starting point"}, "cross section":[[0,0],[10,0]], "maximum distance between coordinates":0.01, diff --git a/tests/gwb-grid/composition_operations.wb b/tests/gwb-grid/composition_operations.wb index d630f416f..94e8a9924 100644 --- a/tests/gwb-grid/composition_operations.wb +++ b/tests/gwb-grid/composition_operations.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "features": diff --git a/tests/gwb-grid/continental_plate_composition_random.wb b/tests/gwb-grid/continental_plate_composition_random.wb index fe96baa64..4ff3597de 100644 --- a/tests/gwb-grid/continental_plate_composition_random.wb +++ b/tests/gwb-grid/continental_plate_composition_random.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "features": diff --git a/tests/gwb-grid/fault.wb b/tests/gwb-grid/fault.wb index ea64beb13..83cc3dfa2 100644 --- a/tests/gwb-grid/fault.wb +++ b/tests/gwb-grid/fault.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "features": diff --git a/tests/gwb-grid/fault_edge_limits.wb b/tests/gwb-grid/fault_edge_limits.wb index 355634277..d7700110f 100644 --- a/tests/gwb-grid/fault_edge_limits.wb +++ b/tests/gwb-grid/fault_edge_limits.wb @@ -1,5 +1,5 @@ { - "version":"0.6", + "version":"1.0", "features": [ diff --git a/tests/gwb-grid/spherical_grid_fault.json b/tests/gwb-grid/spherical_grid_fault.json index 76f7a59bc..6f73e7285 100644 --- a/tests/gwb-grid/spherical_grid_fault.json +++ b/tests/gwb-grid/spherical_grid_fault.json @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "interpolation": "continuous monotone spline", "coordinate system": {"model": "spherical", "depth method": "starting point"}, "features": [{ "model": "fault", diff --git a/tests/gwb-grid/subducting_plate_composition_smooth.wb b/tests/gwb-grid/subducting_plate_composition_smooth.wb index d7ca52ff0..83b4541a5 100644 --- a/tests/gwb-grid/subducting_plate_composition_smooth.wb +++ b/tests/gwb-grid/subducting_plate_composition_smooth.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "features": diff --git a/tests/gwb-grid/subducting_plate_manual3.wb b/tests/gwb-grid/subducting_plate_manual3.wb index f77b413f2..f5afae185 100644 --- a/tests/gwb-grid/subducting_plate_manual3.wb +++ b/tests/gwb-grid/subducting_plate_manual3.wb @@ -1,5 +1,5 @@ { - "version": "0.6", + "version": "1.0", "gravity model":{"model":"uniform", "magnitude":10}, "cross section":[[0,50e3],[50e3,0]], "features": From f8854bbccf1f8ec3908fd9b5a79840899485790d Mon Sep 17 00:00:00 2001 From: MFraters Date: Fri, 8 Mar 2024 19:26:54 -0500 Subject: [PATCH 2/2] Leave pre 1.0.0 version behavoir for now. --- source/world_builder/world.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/source/world_builder/world.cc b/source/world_builder/world.cc index 3c217e6b9..5410b729c 100644 --- a/source/world_builder/world.cc +++ b/source/world_builder/world.cc @@ -163,12 +163,8 @@ namespace WorldBuilder * version number of the program. */ - WBAssertThrow((Version::MAJOR == "0" - && prm.get("version") == Version::MAJOR + "." + Version::MINOR) - || (Version::MAJOR != "0" - && prm.get("version") == Version::MAJOR), - "The major and minor version combination (for major version 0) or the major " - "version (for major versions after 0) for which is input file was written " + WBAssertThrow((prm.get("version") == Version::MAJOR + "." + Version::MINOR), + "The major and minor version combination for which is input file was written " "is not the same as the version of the World Builder you are running. This means " "That there may have been incompatible changes made between the versions. \n\n" "Verify those changes and whether they affect your model. If this is not "