Changeset 22704

Timestamp:

04/23/18 12:48:20 (7 years ago)

Author:

tsantos

Message:

CHG: changed sub dir in NeoPZ install file. Fixed a bug on AMR calling NeoPZ

Location:

issm/trunk-jpl

Files:

• externalpackages/neopz/install.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/classes/AdaptiveMeshRefinement.h (modified) (1 diff)
• src/c/classes/FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/externalpackages/neopz/install.sh

@@ -23 +23 @@
 
 cd $PROJECT_SOURCE_DIR
-#Compile and install 
-if [ $# -eq 0 ]; then
-        make
-        make install
-else
-        make -j $1
-        make -j $1 install
-fi
+make
+make install
+
 cd $PROJECT_BINARY_DIR/pzlib
 mv lib ../

issm/trunk-jpl/m4/issm_options.m4

@@ -1871 +1871 @@
         if test "x$HAVE_NEOPZ" == "xyes"; then
           NEOPZLIB="$NEOPZ_ROOT/lib/libpz.a"
-     NEOPZINCL=-I"$NEOPZ_ROOT/include"
+     NEOPZINCL=" -I$NEOPZ_ROOT/include"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Analysis"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Common"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/External"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Frontal"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Geom"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Integral"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/LinearSolvers"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Material"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Matrix"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Mesh"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Multigrid"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/PerfUtil"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Post"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Pre"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Refine"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Save"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Shape"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/SpecialMaps"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/StrMatrix"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/SubStruct"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Topology"
+          NEOPZINCL+=" -I$NEOPZ_ROOT/include/Util"
+          CXXFLAGS+=" -std=c++11"
           AC_DEFINE([_HAVE_NEOPZ_],[1],[with NEOPZ in ISSM src])
           AC_SUBST([NEOPZINCL])

issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h

@@ -12 +12 @@
 
 /*NeoPZ includes*/
-/*REAL and STATE definitions, NeoPZ variables itapopo should be read by NeoPZ's config.h*/
-#ifndef REFPATTERNDIR
-        #define REFPATTERNDIR "/home/santos/trunk-jpl/externalpackages/neopz/install/include/refpatterns"
-#endif
-
-#ifndef REALdouble
-        #define REALdouble
-#endif
-
-#ifndef STATEdouble
-        #define STATEdouble
-#endif
-
+#include <pz_config.h>
 #include <pzreal.h>
 #include <pzgmesh.h>

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -5157 +5157 @@
                 if(newnumberofvertices<=0 || newnumberofelements<=0) _error_("Error in the ReMeshNeopz.");
         }
-        else{
+
+        /*Send new mesh to others CPU*/
+        ISSM_MPI_Bcast(&newnumberofvertices,1,ISSM_MPI_INT,0,IssmComm::GetComm());
+        ISSM_MPI_Bcast(&newnumberofelements,1,ISSM_MPI_INT,0,IssmComm::GetComm());
+        if(my_rank){
                 newx=xNew<IssmDouble>(newnumberofvertices);
                 newy=xNew<IssmDouble>(newnumberofvertices);
@@ -5163 +5167 @@
                 newelementslist=xNew<int>(newnumberofelements*this->GetElementsWidth());
         }
-
-        /*Send new mesh to others CPU*/
-        ISSM_MPI_Bcast(&newnumberofvertices,1,ISSM_MPI_INT,0,IssmComm::GetComm());
-        ISSM_MPI_Bcast(&newnumberofelements,1,ISSM_MPI_INT,0,IssmComm::GetComm());
         ISSM_MPI_Bcast(newx,newnumberofvertices,ISSM_MPI_DOUBLE,0,IssmComm::GetComm()); 
         ISSM_MPI_Bcast(newy,newnumberofvertices,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());