Merge pull request #40 from MFraters/fix_and_force_version_number_in_…

…input_file Fix and force version number in input file
GeodynamicWorldBuilder · Sep 17, 2018 · 02e7230 · 02e7230
2 parents 0109638 + 394b806
commit 02e7230
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,8 +3,17 @@ cmake_minimum_required (VERSION 2.6)
 project(WorldBuilder C CXX Fortran)
 
 # load in version info and export it
-FILE(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" ASPECT_PACKAGE_VERSION LIMIT_COUNT 1)
-
+FILE(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" WORLD_BUILDER_VERSION LIMIT_COUNT 1)
+
+string(REPLACE "-" "." VERSION_LIST_TEMP ${WORLD_BUILDER_VERSION})
+string(REPLACE "." ";" VERSION_LIST ${VERSION_LIST_TEMP})
+list(LENGTH VERSION_LIST VERSION_LENGTH)
+list(GET VERSION_LIST 0 WORLD_BUILDER_VERSION_MAJOR)
+list(GET VERSION_LIST 1 WORLD_BUILDER_VERSION_MINOR)
+list(GET VERSION_LIST 2 WORLD_BUILDER_VERSION_PATCH)
+if (${VERSION_LENGTH} GREATER 3)
+list(GET VERSION_LIST 3 WORLD_BUILDER_VERSION_LABEL)
+endif()
 # the commit's SHA1, and whether the building workspace was dirty or not
 find_package(Git)
 execute_process(COMMAND

diff --git a/include/config.h b/include/config.h
@@ -30,6 +30,7 @@ namespace WorldBuilder
     static const std::string MAJOR;
     static const std::string MINOR;
     static const std::string PATCH;
+    static const std::string LABEL;
 
     static const std::string GIT_SHA1;
     static const std::string GIT_BRANCH;

diff --git a/source/config.cc.in b/source/config.cc.in
@@ -21,9 +21,10 @@
 
 using namespace WorldBuilder;
 
-const std::string Version::MAJOR = "@VERSION_MAJOR@";
-const std::string Version::MINOR = "@VERSION_MINOR@";
-const std::string Version::PATCH = "@VERSION_PATCH@";
+const std::string Version::MAJOR = "@WORLD_BUILDER_VERSION_MAJOR@";
+const std::string Version::MINOR = "@WORLD_BUILDER_VERSION_MINOR@";
+const std::string Version::PATCH = "@WORLD_BUILDER_VERSION_PATCH@";
+const std::string Version::LABEL = "@WORLD_BUILDER_VERSION_LABEL@";
 
 const std::string Version::GIT_SHA1 = "@GIT_SHA1@";
 const std::string Version::GIT_BRANCH = "@GIT_BRANCH@";

diff --git a/source/world.cc b/source/world.cc
@@ -19,7 +19,7 @@
 
 #include <sstream>
 
-
+#include <config.h>
 #include <world_builder/world.h>
 #include <world_builder/utilities.h>
 #include <world_builder/assert.h>
@@ -50,7 +50,20 @@ namespace WorldBuilder
   void World::declare_and_parse(Parameters &prm)
   {
     /**
-     * First load the coordinate system parameters.
+     * First load the major version number in the file and check the major
+     * version number of the program.
+     */
+    prm.load_entry("version", true, Types::UnsignedInt(NaN::ISNAN,
+                                                       "The major version number for which the input file was written."));
+
+    WBAssertThrow(prm.get_unsigned_int("version") == Utilities::string_to_unsigned_int(Version::MAJOR),
+                  "The major version 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 have been incompatible changes made between the versions. "
+                  "Verify those changes and wheter they affect your model. If this is not "
+                  "the case, adjust the version number in the input file.");
+    /**
+     * Seconly load the coordinate system parameters.
      */
     prm.load_entry("coordinate system", false, Types::CoordinateSystem("cartesian","This determines the coordinate system"));
 

diff --git a/tests/app/app_spherical.wb b/tests/app/app_spherical.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"spherical":{"depth method":"starting point"}},
 "surface rotation point": ["0","0"],

diff --git a/tests/app/app_wb1.wb b/tests/app/app_wb1.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"Cartesian":{}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/app/app_wb2.wb b/tests/app/app_wb2.wb
@@ -1,3 +1,4 @@
+"version":0,
 "surface rotation point": ["165e3","166e3"],
 "surface rotation angle": "0",
 "minimum parts per distance unit": 5,

diff --git a/tests/app/app_wb3.wb b/tests/app/app_wb3.wb
@@ -1,3 +1,4 @@
+"version":0,
 "surface rotation point": ["165e3","166e3"],
 "surface rotation angle": "0",
 "sinimum parts per distance unit": 5,

diff --git a/tests/data/continental_plate.wb b/tests/data/continental_plate.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"cartesian":{}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/data/oceanic_plate_cartesian.wb b/tests/data/oceanic_plate_cartesian.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"cartesian":{}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/data/oceanic_plate_spherical.wb b/tests/data/oceanic_plate_spherical.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"spherical":{"depth method":"starting point"}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/data/simple_wb1.json b/tests/data/simple_wb1.json
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"cartesian":{}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/data/simple_wb2.json b/tests/data/simple_wb2.json
@@ -1,3 +1,4 @@
+"version":0,
 "surface rotation point": ["165e3","166e3"],
 "surface rotation angle": "0",
 "minimum parts per distance unit": 5,

diff --git a/tests/data/simple_wb3.json b/tests/data/simple_wb3.json
@@ -1,3 +1,4 @@
+"version":0,
 "surface rotation point": ["165e3","166e3"],
 "surface rotation angle": "0",
 "minimum parts per distance unit": 5,

diff --git a/tests/data/subducting_plate_constant_angles_cartesian.wb b/tests/data/subducting_plate_constant_angles_cartesian.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"cartesian":{}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/data/subducting_plate_different_angles_cartesian.wb b/tests/data/subducting_plate_different_angles_cartesian.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"cartesian":{}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/data/subducting_plate_different_angles_spherical.wb b/tests/data/subducting_plate_different_angles_spherical.wb
@@ -1,3 +1,4 @@
+"version":0,
 "cross section": [[100e3,100e3],[400e3,500e3]],
 "coordinate system":{"spherical":{"depth method":"starting point"}},
 "surface rotation point": ["165e3","166e3"],

diff --git a/tests/unit_tests/unit_test_world_builder.cc b/tests/unit_tests/unit_test_world_builder.cc
@@ -1573,6 +1573,7 @@ TEST_CASE("WorldBuilder Types: print_tree")
   std::stringstream output;
   output <<
          "{\n" <<
+         "  \"version\": \"0\",\n"
          "  \"cross section\": \n" <<
          "  {\n" <<
          "    \"\": \n" <<