diff --git a/analysis/Minkowski.cpp b/analysis/Minkowski.cpp index 650d30dc..9414e02c 100644 --- a/analysis/Minkowski.cpp +++ b/analysis/Minkowski.cpp @@ -17,6 +17,13 @@ #define PI 3.14159265359 // Constructor + +Minkowski::Minkowski(): + kstart(0), kfinish(0), isovalue(0), Volume(0), + LOGFILE(NULL), Dm(NULL), Vi(0), Vi_global(0) +{ +} + Minkowski::Minkowski(std::shared_ptr dm): kstart(0), kfinish(0), isovalue(0), Volume(0), LOGFILE(NULL), Dm(dm), Vi(0), Vi_global(0) @@ -39,7 +46,7 @@ Minkowski::Minkowski(std::shared_ptr dm): // Destructor Minkowski::~Minkowski() { - if ( LOGFILE!=NULL ) { fclose(LOGFILE); } + // if ( LOGFILE!=NULL ) { fclose(LOGFILE); } } double Minkowski::V(){ diff --git a/analysis/Minkowski.h b/analysis/Minkowski.h index e2905174..778e4ee0 100644 --- a/analysis/Minkowski.h +++ b/analysis/Minkowski.h @@ -46,7 +46,7 @@ public: double X(); //........................................................................... - Minkowski(){}; + Minkowski(); Minkowski(std::shared_ptr Dm); ~Minkowski(); void ComputeScalar(const DoubleArray& Field, const double isovalue); diff --git a/sample_scripts/configure_desktop b/sample_scripts/configure_desktop index d4e5fb5f..3a853517 100755 --- a/sample_scripts/configure_desktop +++ b/sample_scripts/configure_desktop @@ -6,7 +6,7 @@ cmake \ -D CMAKE_CXX_COMPILER:PATH=mpicxx \ -D CMAKE_C_FLAGS="-g " \ -D CMAKE_CXX_FLAGS="-g " \ - -D CXX_STD=11 \ + -D CMAKE_CXX_STANDARD=14 \ -D MPI_COMPILER:BOOL=TRUE \ -D MPIEXEC=mpirun \ -D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \ @@ -14,10 +14,10 @@ cmake \ -D CUDA_FLAGS="-arch sm_35" \ -D CUDA_HOST_COMPILER="/usr/bin/gcc" \ -D USE_NETCDF=0 \ - -D HDF5_DIRECTORY="/home/mcclurej/TPL/hdf5/" \ - -D HDF5_LIB="/home/mcclurej/TPL/hdf5/lib/libhdf5.a" \ - -D SILO_LIB="/home/mcclurej/TPL/silo/lib/libsiloh5.a" \ - -D SILO_DIRECTORY="/home/mcclurej/TPL/silo/" \ + -D HDF5_DIRECTORY="/opt/apps/hdf5/" \ + -D HDF5_LIB="/opt/apps/hdf5/lib/libhdf5.a" \ + -D SILO_LIB="/opt/apps/silo/lib/libsiloh5.a" \ + -D SILO_DIRECTORY="/opt/apps/silo/" \ -D NETCDF_DIRECTORY="/apps/netcdf/" \ -D USE_SILO=1 \ -D USE_CUDA=0 \