Changeset 23394 for issm/trunk/src/c/classes/FemModel.h

Timestamp:

10/05/18 10:42:45 (6 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23392

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/FemModel.h (modified) (5 diffs)

issm/trunk/src/c/classes/FemModel.h

@@ -20 +20 @@
 class Profiler;
 class Elements;
-#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
+#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_AD_)
 #include "./AdaptiveMeshRefinement.h"
 #endif
-#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
+#if defined(_HAVE_BAMG_) && !defined(_HAVE_AD_)
 #include "./AmrBamg.h"
 #endif
@@ -51 +51 @@
 
                 //FIXME: do we want only one class and have virtual functions? or keep 2 classes, at least rename AdaptiveMeshRefinement -> AmrNeopz
-                #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
+                #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_AD_)
                 AdaptiveMeshRefinement *amr;              //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
                 #endif
 
-                #if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
+                #if defined(_HAVE_BAMG_) && !defined(_HAVE_AD_)
                 AmrBamg *amrbamg; //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
                 #endif
@@ -164 +164 @@
 
                 /*AMR*/
-                #if !defined(_HAVE_ADOLC_)
+                #if !defined(_HAVE_AD_)
                 void ReMesh(void);
                 void BedrockFromMismipPlus(void);
@@ -191 +191 @@
                 #endif
 
-                #if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
+                #if defined(_HAVE_BAMG_) && !defined(_HAVE_AD_)
                 void ReMeshBamg(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist);
                 void InitializeAdaptiveRefinementBamg(void);
@@ -199 +199 @@
                 #endif
 
-                #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
+                #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_AD_)
                 void ReMeshNeopz(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist);
                 void InitializeAdaptiveRefinementNeopz(void);