OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
James E McClure 2018-09-21 13:54:27 -04:00
commit 2d9ba01b62
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
analysis/Minkowski.cpp
View File

@ -17,6 +17,13 @@
#define PI 3.14159265359 #define PI 3.14159265359
// Constructor // 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 <Domain> dm): Minkowski::Minkowski(std::shared_ptr <Domain> dm):
kstart(0), kfinish(0), isovalue(0), Volume(0), kstart(0), kfinish(0), isovalue(0), Volume(0),
LOGFILE(NULL), Dm(dm), Vi(0), Vi_global(0) LOGFILE(NULL), Dm(dm), Vi(0), Vi_global(0)
@ -39,7 +46,7 @@ Minkowski::Minkowski(std::shared_ptr <Domain> dm):
// Destructor // Destructor
Minkowski::~Minkowski() Minkowski::~Minkowski()
{ {
if ( LOGFILE!=NULL ) { fclose(LOGFILE); } // if ( LOGFILE!=NULL ) { fclose(LOGFILE); }
} }
double Minkowski::V(){ double Minkowski::V(){

2
analysis/Minkowski.h
View File

@ -46,7 +46,7 @@ public:
double X(); double X();
//........................................................................... //...........................................................................
Minkowski(){}; Minkowski();
Minkowski(std::shared_ptr <Domain> Dm); Minkowski(std::shared_ptr <Domain> Dm);
~Minkowski(); ~Minkowski();
void ComputeScalar(const DoubleArray& Field, const double isovalue); void ComputeScalar(const DoubleArray& Field, const double isovalue);

10
sample_scripts/configure_desktop
View File

@ -6,7 +6,7 @@ cmake \
-D CMAKE_CXX_COMPILER:PATH=mpicxx \ -D CMAKE_CXX_COMPILER:PATH=mpicxx \
-D CMAKE_C_FLAGS="-g " \ -D CMAKE_C_FLAGS="-g " \
-D CMAKE_CXX_FLAGS="-g " \ -D CMAKE_CXX_FLAGS="-g " \
-D CXX_STD=11 \ -D CMAKE_CXX_STANDARD=14 \
-D MPI_COMPILER:BOOL=TRUE \ -D MPI_COMPILER:BOOL=TRUE \
-D MPIEXEC=mpirun \ -D MPIEXEC=mpirun \
-D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \ -D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \
@ -14,10 +14,10 @@ cmake \
-D CUDA_FLAGS="-arch sm_35" \ -D CUDA_FLAGS="-arch sm_35" \
-D CUDA_HOST_COMPILER="/usr/bin/gcc" \ -D CUDA_HOST_COMPILER="/usr/bin/gcc" \
-D USE_NETCDF=0 \ -D USE_NETCDF=0 \
-D HDF5_DIRECTORY="/home/mcclurej/TPL/hdf5/" \ -D HDF5_DIRECTORY="/opt/apps/hdf5/" \
-D HDF5_LIB="/home/mcclurej/TPL/hdf5/lib/libhdf5.a" \ -D HDF5_LIB="/opt/apps/hdf5/lib/libhdf5.a" \
-D SILO_LIB="/home/mcclurej/TPL/silo/lib/libsiloh5.a" \ -D SILO_LIB="/opt/apps/silo/lib/libsiloh5.a" \
-D SILO_DIRECTORY="/home/mcclurej/TPL/silo/" \ -D SILO_DIRECTORY="/opt/apps/silo/" \
-D NETCDF_DIRECTORY="/apps/netcdf/" \ -D NETCDF_DIRECTORY="/apps/netcdf/" \
-D USE_SILO=1 \ -D USE_SILO=1 \
-D USE_CUDA=0 \ -D USE_CUDA=0 \