Merge pull request #242 from LLNL/bugfix/release-number

Correcting release number

.gitlab/scripts.yml

@@ -5,7 +5,7 @@
 .build:
   stage: build_and_install
   script:
-    - CI_BUILD_DIR=$SPHERAL_BUILDS_DIR/$CI_JOB_ID
+    - CI_BUILD_DIR=$SPHERAL_BUILDS_DIR/$CI_JOB_ID/project
     - echo $CI_BUILD_DIR &> ci-dir.txt && echo $CI_JOB_NAME &> job-name.txt
     - echo $CI_BUILD_DIR && echo $CI_PROJECT_DIR
     - mkdir -p $CI_BUILD_DIR && cp -a $CI_PROJECT_DIR/. $CI_BUILD_DIR

License.txt

@@ -1,7 +1,7 @@
 Copyright (c) 2012, Lawrence Livermore National Security, LLC. 
 Produced at the Lawrence Livermore National Laboratory
 Written by J. Michael Owen <[email protected]>
-CODE-OCEC-12-049
+LLNL-CODE-561852
 All rights reserved.
 
 The files in this directory and below are part of Spheral++. For details, see

README.md

@@ -17,7 +17,7 @@ Release and license:
 Copyright (c) 2012, Lawrence Livermore National Security, LLC.  
 Produced at the Lawrence Livermore National Laboratory  
 Written by J. Michael Owen <[email protected]>  
-CODE-OCEC-12-049  
+LLNL-CODE-561852  
 All rights reserved.
 
 Please see full license at https://github.com/jmikeowen/spheral/blob/master/License.txt

cmake/Compilers.cmake

@@ -64,12 +64,15 @@ message("-- Fortran flags: ${CMAKE_Fortran_FLAGS}")
 # PYB11 Target Flags
 #-------------------------------------------------------------------------------
 set(SPHERAL_PYB11_TARGET_FLAGS
+  -O1
   -Wno-unused-local-typedefs 
   -Wno-overloaded-virtual)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   list(APPEND SPHERAL_PYB11_TARGET_FLAGS
     -Wno-self-assign-overloaded 
-    -Wno-delete-non-abstract-non-virtual-dtor)
+    -Wno-inconsistent-missing-override
+    -Wno-delete-non-abstract-non-virtual-dtor
+    -Wno-delete-abstract-non-virtual-dtor)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   list(APPEND SPHERAL_PYB11_TARGET_FLAGS
     -Wno-pedantic)

docs/intro/introduction.rst.inc

@@ -28,7 +28,7 @@ Release and License:
 Copyright (c) 2012, Lawrence Livermore National Security, LLC.
 Produced at the Lawrence Livermore National Laboratory
 Written by J. Michael Owen [email protected]
-CODE-OCEC-12-049
+LLNL-CODE-561852
 All rights reserved.
 
 Please see `full license <https://github.com/jmikeowen/spheral/blob/master/License.txt>`_

scripts/gitlab/build_and_install.py

@@ -65,7 +65,8 @@ def main():
   # Build out our TPLs for this spec if we need to.
   if not args.build_only:
     print("** Building spec TPLs : {0}".format(args.spec))
-    sexe("{0} --spheral-spack-dir spheral-spack-tpls --spec=\"{1}\"".format(tpl_manager_cmd, args.spec))
+    sexe("{0} --spec=\"{1}\"".format(tpl_manager_cmd, args.spec))
+    #sexe("{0} --spheral-spack-dir spheral-spack-tpls --spec=\"{1}\"".format(tpl_manager_cmd, args.spec))
 
   # Get the host-config name and path.
   if not args.build_only and not args.host_config:

scripts/lc/lcats

@@ -741,11 +741,14 @@ def getUniqueTestPath():
         for name in ['jade', 'agate', 'mica', 'magma', 'ruby']:
             filesystems[name] = ['/p/lustre2', '/p/lustre1']
 
+        for name in ['rzgenie']:
+            filesystems[name] = ['/p/lustre1']
+
         for name in ['sierra', 'tron']:
             filesystems[name] = [ '/p/gpfs1' ]
 
         # RZ LLNL machines
-        for name in ['rzalastor', 'rzcereal', 'rzzeus', 'rzmerl', 'rzgenie', 'rztopaz']:
+        for name in ['rzalastor', 'rzcereal', 'rzzeus', 'rzmerl', 'rztopaz']:
             filesystems[name] = [ '/p/lscratchrza' ]
 
         for name in ['rzansel', 'lassen']: