Merge pull request #698 from MFraters/post_v0.6.0_release_version_bump

Post v0.6.0 release version bump.
GeodynamicWorldBuilder · Mar 9, 2024 · a8702f7 · a8702f7
2 parents 7e8c76d + f8854bb
commit a8702f7
Show file tree

Hide file tree

Showing 139 changed files with 152 additions and 148 deletions.
diff --git 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
@@ -1 +1 @@
-0.6.0
+1.0.0-pre
diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 {
-  "version": "0.6",
+  "version": "1.0",
   "cross section":[[0,0],[100,0]],
   "features":
   [

diff --git a/...d_cartesian_subduction_rift_sepran_example/2d_cartesian_subduction_rift_sepran_example.wb b/...d_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
 {
-  "version": "0.6",
+  "version": "1.0",
   "features": []
 }
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
@@ -1,4 +1,4 @@
 {
-    "version": "0.6",
+    "version": "1.0",
     "features":[]
  }
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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<std::string>("version") == Version::MAJOR + "." + Version::MINOR)
-                  || (Version::MAJOR != "0"
-                      && prm.get<std::string>("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<std::string>("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 "

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]],