Changeset 23305

Timestamp:

09/18/18 09:11:06 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: FindParamAndMakePassive should always be compiled

Location:

issm/trunk-jpl/src/c/classes/Params

Files:

• Parameters.cpp (modified) (2 diffs)
• Parameters.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Params/Parameters.cpp

@@ -426 +426 @@
 }
 /*}}}*/
+void Parameters::FindParamAndMakePassive(IssmPDouble* pscalar,int param_enum){ _assert_(this);/*{{{*/
+        _assert_(param_enum>ParametersSTARTEnum);
+        _assert_(param_enum<ParametersENDEnum);
+
+        /*Get "active" parameter*/
+        IssmDouble intermediary;
+        int index = param_enum - ParametersSTARTEnum -1;
+        if(!this->params[index]) _error_("Parameter " << EnumToStringx(param_enum) <<" not set");
+        this->params[index]->GetParameterValue(&intermediary);
+
+        /*cast to "passive"*/
+        *pscalar=reCast<IssmPDouble>(intermediary);
+}
+/*}}}*/
 void Parameters::FindParamInDataset(IssmDouble** pIssmDoublearray,int* pM,int* pN,int dataset_type,int enum_type){/*{{{*/
         _assert_(this);
@@ -717 +731 @@
 }
 /*}}}*/
-
-/*Specific case with ADOL-C, we might need to get double params for m1qn3*/
-#if defined(_HAVE_AD_) && !defined(_WRAPPERS_) 
-void Parameters::FindParamAndMakePassive(double* pscalar,int param_enum){ _assert_(this);/*{{{*/
-        _assert_(param_enum>ParametersSTARTEnum);
-        _assert_(param_enum<ParametersENDEnum);
-
-        /*Get "active" parameter*/
-        IssmDouble intermediary;
-        int index = param_enum - ParametersSTARTEnum -1;
-        if(!this->params[index]) _error_("Parameter " << EnumToStringx(param_enum) <<" not set");
-        this->params[index]->GetParameterValue(&intermediary);
-
-        /*cast to "passive"*/
-        *pscalar=reCast<double>(intermediary);
-}
-/*}}}*/
-#endif

issm/trunk-jpl/src/c/classes/Params/Parameters.h

@@ -52 +52 @@
                 void  FindParam(FILE** pfid,int enum_type);
                 void  FindParam(DataSet** pdataset, int enum_type);
+                void  FindParamAndMakePassive(IssmPDouble* pscalar, int enum_type);
                 void  FindParamInDataset(IssmDouble** pIssmDoublearray,int* pM,int* pN,int dataset_type,int enum_type);
 
@@ -70 +71 @@
                 Param* FindParamObject(int enum_type);
 
-                /*Specific instantiations for IssmDouble*: */
-                #if defined(_HAVE_AD_) && !defined(_WRAPPERS_) 
-                void  FindParamAndMakePassive(double* pscalar, int enum_type);
-                #endif
-
 };