Feature/updated json

.github/workflows/ContinuousIntegration.yml

@@ -2,7 +2,10 @@
 name: Continuous Integration
 
 # This workflow is triggered on pushes and pull requests to the repository.
+# This workflow will also run each Monday on the default branch (i.e. master)
 on:
+  schedule:
+    - cron: '0 0 * * 1'
   push:
     branches: '**'
   pull_request:
@@ -13,20 +16,26 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [ ubuntu-18.04, macos-10.15 ]
-        cxx: [ g++-9, clang++ ]
+        os: [ ubuntu-20.04, macos-11 ]
+        cxx: [ clang++, g++-10 ]
         build_type: [ Debug, Release ]
 
     steps:
+    - name: Install hdf5 libraries for Linux
+      if: matrix.os == 'ubuntu-20.04'
+      run: sudo apt-get install libhdf5-dev
+    - name: Install hdf5 libraries for MacOS
+      if: matrix.os == 'macos-11'
+      run: brew install hdf5
     - name: which CXX
       run: |
         which ${{matrix.cxx}}
         ${{matrix.cxx}} --version
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: mkdir bin
       run: mkdir bin
     - name: cmake
-      run: cmake -DPYTHON_EXECUTABLE=$(which python3) -D CMAKE_CXX_COMPILER=`which ${{matrix.cxx}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ..
+      run: cmake -DPYTHON_EXECUTABLE=$(which python3) -D CMAKE_CXX_COMPILER=`which ${{matrix.cxx}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_COMPILER_FLAGS="-DNJOY_GNDSTK_DISABLE_HDF5" ..
       working-directory: ./bin
     - name: make
       run: make -j2

.gitignore

@@ -5,3 +5,6 @@ build
 *~
 metaconfigure/*.pyc
 docs/.build
+debug
+minsizerel
+release

LICENSE

@@ -7,4 +7,4 @@ Additionally, redistribution and use in source and binary forms, with or without
 2.      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 3.      Neither the name of Los Alamos National Security, LLC, Los Alamos National Laboratory, LANL, the U.S. Government, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,5 +1,7 @@
+![Continuous Integration](https://github.com/njoy/GNDStk/workflows/Continuous%20Integration/badge.svg)
+
 # GNDStk
-Generalized Nuclear Database Structure toolkit
+Toolkit for reading and interacting with GNDS formatted files. This toolkit provides a full C++ library along with python bindings.
 
 ## LICENSE
 This software is copyrighted by Los Alamos National Laboratory and distributed according to the conditions in the accompanying [LICENSE](LICENSE) file.

autogen/changes.json

@@ -2,16 +2,15 @@
     "name": {
         "// REMARK": [
             "These give changes to apply to METADATUM or CHILD NODE names.",
-            "GNDS v1.9 does in fact have a child node named [double]. But",
-            "that name won't work in C++, so the following forces a change."
+            "GNDS does in fact have a child node named [double]. But that",
+            "name won't work in C++, so the following forces a change."
         ],
         "double": "Double"
     },
 
     "metadata": {
         "type": {
             "Boolean":       "bool",
-            "string":        "std::string",
             "encoding":      "enums::Encoding",
             "frame":         "enums::Frame",
             "interaction":   "enums::Interaction",
@@ -40,7 +39,7 @@
             "nuclear": "enums::Interaction::nuclear",
             "atomic":  "enums::Interaction::atomic",
             "thermalNeutronScatteringLaw":
-                "enums::Interaction::thermalNeutronScatteringLaw",
+            "enums::Interaction::thermalNeutronScatteringLaw",
 
             "// INTERPOLATION": {},
             "flat":              "enums::Interpolation::flat",
@@ -55,7 +54,7 @@
             "row-major":    "enums::StorageOrder::rowMajor",
             "column-major": "enums::StorageOrder::columnMajor",
 
-            "// MISCELLANEOUS CONTENT SEEN IN THE GNDS V1.9 SPEC": {},
+            "// MISCELLANEOUS CONTENT SEEN IN THE GNDS SPECS": {},
             "`' (i.e. unitless)": "",
             " \\\\kern-1ex":      "",
             "`' (no label)":      "",