Changeset 21850

Timestamp:

07/24/17 13:37:47 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing AD

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (2 diffs)
• FemModel.h (modified) (3 diffs)

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

@@ -4316 +4316 @@
 #endif
 
-#ifdef _HAVE_BAMG_
+#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
 void FemModel::ReMeshBamg(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist){/*{{{*/
 
@@ -4414 +4414 @@
 #endif
 
-#ifdef _HAVE_NEOPZ_
+#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
 void FemModel::ReMeshNeopz(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist){/*{{{*/
 

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

@@ -20 +20 @@
 class Profiler;
 class Elements;
-#ifdef _HAVE_NEOPZ_
+#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
 #include "./AdaptiveMeshRefinement.h"
 #endif
-#ifdef _HAVE_BAMG_
+#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
 #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
-                #ifdef _HAVE_NEOPZ_
+                #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
                 AdaptiveMeshRefinement *amr;              //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
                 #endif
 
-                #ifdef _HAVE_BAMG_
+                #if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
                 AmrBamg *amrbamg; //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
                 #endif
@@ -177 +177 @@
                 void MeanGroundedIceLevelSet(IssmDouble** pmasklevelset);
 
-                #ifdef _HAVE_BAMG_
+                #if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
                 void ReMeshBamg(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist);
                 void InitializeAdaptiveRefinementBamg(void);
                 #endif
 
-                #ifdef _HAVE_NEOPZ_
+                #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
                 /*Adaptive mesh refinement methods*/
                 void ReMeshNeopz(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist);