Changeset 21854

Timestamp:

07/24/17 15:32:06 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing AD

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (2 diffs)

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

@@ -89 +89 @@
         this->amrbamg = NULL;
         #endif
+        #if !defined(_HAVE_ADOLC_)
         if(amr_frequency){
                 this->parameters->FindParam(&amrtype,AmrTypeEnum);
                 switch(amrtype){
 
-                        #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
+                        #if defined(_HAVE_NEOPZ_)
                         case AmrNeopzEnum: this->InitializeAdaptiveRefinementNeopz(); break;
                         #endif
 
-                        #if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
+                        #if defined(_HAVE_BAMG_)
                         case AmrBamgEnum: this->InitializeAdaptiveRefinementBamg(); break;
                         #endif
@@ -104 +105 @@
                 }
         }
+        #endif
 
         /*Free resources */