Changeset 22425

Timestamp:

02/16/18 08:05:48 (7 years ago)

Author:

erobo

Message:

CHG: added FindParamAndMakePassive for ADOLC

Location:

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

Files:

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

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

@@ -275 +275 @@
 /*}}}*/
 void Parameters::FindParam(IssmDouble* pscalar,int param_enum){ _assert_(this);/*{{{*/
-
         _assert_(param_enum>ParametersSTARTEnum);
         _assert_(param_enum<ParametersENDEnum);
@@ -668 +667 @@
 }
 /*}}}*/
+
+/*Specific case with ADOL-C, we might need to get double params for m1qn3*/
+#if defined(_HAVE_ADOLC_) && !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

@@ -68 +68 @@
                 Param* FindParamObject(int enum_type);
 
+                /*Specific instantiations for IssmDouble*: */
+                #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) 
+                void  FindParamAndMakePassive(double* pscalar, int enum_type);
+                #endif
+
 };