Merge branch 'draco-7_2_0' of github.com:lanl/Draco into draco-7_2_0

lanl · Jun 25, 2019 · a879a6d · a879a6d
2 parents 5566425 + a6db606
commit a879a6d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 36 deletions.
diff --git a/regression/scripts/ats2-env.sh b/regression/scripts/ats2-env.sh
@@ -13,7 +13,7 @@ case $ddir in
       run "module purge"
       module use /usr/gapps/jayenne/vendors-ec/spack.20190616/share/spack/lmod/linux-rhel7-ppc64le/Core
       run "module load cuda python/3.7.2 gcc/7.3.1 spectrum-mpi/2019.04.19"
-      run "module load cmake/3.14.4 git gsl numdiff random123 metis netlib-lapack"
+      run "module load cmake/3.14.5 git gsl numdiff random123 metis netlib-lapack"
       run "module load parmetis superlu-dist trilinos csk/0.4.2"
       run "module load eospac/6.4.0"
       # ndi

diff --git a/regression/scripts/cray-env.sh b/regression/scripts/cray-env.sh
@@ -35,7 +35,7 @@ case $ddir in
       run "module unload cray-hugepages2M"
       run "module load intel/18.0.2"
       run "module load cmake/3.14.0 numdiff git"
-      run "module load gsl random123 eospac/6.4.0 ndi"
+      run "module load gsl random123 eospac/6.4.0 ndi python/3.6-anaconda-5.0.1"
       run "module load trilinos/12.10.1 metis parmetis/4.0.3 superlu-dist"
       run "module use --append ${VENDOR_DIR}-ec/modulefiles"
       run "module load csk"
@@ -68,7 +68,7 @@ case $ddir in
       run "module unload cray-hugepages2M"
       run "module load intel/18.0.2"
       run "module load cmake/3.14.0 numdiff git"
-      run "module load gsl random123 eospac/6.4.0 ndi"
+      run "module load gsl random123 eospac/6.4.0 ndi python/3.6-anaconda-5.0.1"
       run "module load trilinos/12.10.1 metis parmetis/4.0.3 superlu-dist"
       run "module use --append ${VENDOR_DIR}-ec/modulefiles"
       run "module load csk"
@@ -103,7 +103,7 @@ case $ddir in
       run "module unload xt-libsci xt-totalview"
       run "module load intel/17.0.4"
       run "module load cmake/3.14.0 numdiff git"
-      run "module load gsl random123 eospac/6.4.0 ndi"
+      run "module load gsl random123 eospac/6.4.0 ndi python/3.6-anaconda-5.0.1"
       run "module load trilinos/12.10.1 metis parmetis/4.0.3 superlu-dist"
       run "module use --append ${VENDOR_DIR}-ec/modulefiles"
       run "module load csk"
@@ -135,7 +135,7 @@ case $ddir in
       run "module unload xt-libsci xt-totalview"
       run "module load intel/17.0.4"
       run "module load cmake/3.14.0 numdiff git"
-      run "module load gsl random123 eospac/6.4.0 ndi"
+      run "module load gsl random123 eospac/6.4.0 ndi python/3.6-anaconda-5.0.1"
       run "module load trilinos/12.10.1 metis parmetis/4.0.3 superlu-dist"
       run "module use --append ${VENDOR_DIR}-ec/modulefiles"
       run "module load csk"

diff --git a/regression/scripts/release_ats2.sh b/regression/scripts/release_ats2.sh
@@ -43,7 +43,8 @@ environments="gcc731env"
 
 export script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export draco_script_dir=`readlink -f $script_dir`
-source $draco_script_dir/common.sh
+echo "source $draco_script_dir/common.sh"
+source ${draco_script_dir}/common.sh
 
 # CMake options that will be included in the configuration step
 CONFIG_BASE="-DDRACO_VERSION_PATCH=`echo $ddir | sed -e 's/.*_//'`"
@@ -96,13 +97,7 @@ LOGGING_OFF="-DDRACO_DIAGNOSTICS=0 -DDRACO_TIMING=0"
 # Define the meanings of the various code versions:
 
 VERSIONS=( "debug" "opt" "rwdi" )
-OPTIONS=(\
-    "$OPTIMIZE_OFF $LOGGING_OFF" \
-    "$OPTIMIZE_ON $LOGGING_OFF" \
-    "$OPTIMIZE_RWDI $LOGGING_OFF" \
-)
-#VERSIONS=( "debug")
-#OPTIONS=( "$OPTIMIZE_OFF $LOGGING_OFF" )
+OPTIONS=( "${OPTIMIZE_OFF} ${LOGGING_OFF}" "${OPTIMIZE_ON} ${LOGGING_OFF}" "${OPTIMIZE_RWDI} ${LOGGING_OFF}" )
 
 ##---------------------------------------------------------------------------##
 ## Environment review
@@ -130,7 +125,8 @@ fi
 ## Execute the build, test and install
 ##---------------------------------------------------------------------------##
 
-source $draco_script_dir/ats2-env.sh
+echo "source ${draco_script_dir}/ats2-env.sh"
+source ${draco_script_dir}/ats2-env.sh
 
 jobids=""
 for env in $environments; do

diff --git a/src/units/PhysicalConstants.cc b/src/units/PhysicalConstants.cc
@@ -9,33 +9,12 @@
 //---------------------------------------------------------------------------//
 
 #include "PhysicalConstants.hh"
-#include "PhysicalConstantsSI.hh"
 #include "ds++/Soft_Equivalence.hh"
 #include <iomanip>
 #include <iostream>
 
 namespace rtt_units {
 
-//----------------------------------------------------------------------------//
-/*!
- * \brief Default constructor provides physical constants with SI units (kg,
- *        m, seconds, degree K, amp, radian, mole).
- * \return A PhysicalConstants object.
- */
-PhysicalConstants::PhysicalConstants()
-    : d_avogadro(AVOGADRO), d_planck(planckSI), d_gasConstant(gasConstantSI),
-      d_boltzmann(boltzmannSI), d_electronCharge(electronChargeSI),
-      d_cLight(cLightSI), d_stefanBoltzmann(stefanBoltzmannSI),
-      d_gravitationalConstant(gravitationalConstantSI),
-      d_accelerationFromGravity(accelerationFromGravitySI),
-      d_faradayConstant(faradayConstantSI),
-      d_permeabilityOfVacuum(permeabilityOfVacuumSI),
-      d_permittivityOfFreeSpace(permittivityOfFreeSpaceSI),
-      d_classicalElectronRadius(classicalElectronRadiusSI),
-      d_electronMass(electronMassSI), d_protonMass(protonMassSI) {
-  // empty
-}
-
 //----------------------------------------------------------------------------//
 /*!
  * \brief Constuctor that creates a set of PhysicalConstants using the

diff --git a/src/units/PhysicalConstants.hh b/src/units/PhysicalConstants.hh
@@ -12,6 +12,7 @@
 #define __units_PhysicalConstants_hh__
 
 #include "MathConstants.hh"
+#include "PhysicalConstantsSI.hh"
 #include "UnitSystem.hh"
 
 //! \namespace rtt_units Namespace for units and physical constants
@@ -48,7 +49,25 @@ namespace rtt_units {
 class PhysicalConstants {
 public:
   // Constructors.
-  PhysicalConstants();
+  //----------------------------------------------------------------------------//
+  /*!                                                                              
+   * \brief Default constructor provides physical constants with SI units (kg,        
+   *        m, seconds, degree K, amp, radian, mole).                              
+   * \return A PhysicalConstants object.                                           
+   */
+  constexpr PhysicalConstants()
+      : d_avogadro(AVOGADRO), d_planck(planckSI), d_gasConstant(gasConstantSI),
+        d_boltzmann(boltzmannSI), d_electronCharge(electronChargeSI),
+        d_cLight(cLightSI), d_stefanBoltzmann(stefanBoltzmannSI),
+        d_gravitationalConstant(gravitationalConstantSI),
+        d_accelerationFromGravity(accelerationFromGravitySI),
+        d_faradayConstant(faradayConstantSI),
+        d_permeabilityOfVacuum(permeabilityOfVacuumSI),
+        d_permittivityOfFreeSpace(permittivityOfFreeSpaceSI),
+        d_classicalElectronRadius(classicalElectronRadiusSI),
+        d_electronMass(electronMassSI), d_protonMass(protonMassSI) {
+    // empty
+  }
   explicit PhysicalConstants(UnitSystem const &u);
 
   //! \todo Make electronCharge and Avaragodo adjustable based on units.