Changeset 23310

Timestamp:

09/18/18 10:48:48 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: forgot to commit vector passive

Location:

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

Files:

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

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

@@ -440 +440 @@
 }
 /*}}}*/
+void Parameters::FindParamAndMakePassive(IssmPDouble** pvec,int* pM, int param_enum){ _assert_(this);/*{{{*/
+
+        _assert_(param_enum>ParametersSTARTEnum);
+        _assert_(param_enum<ParametersENDEnum);
+
+        int index = param_enum - ParametersSTARTEnum -1;
+
+        /*Output*/
+        int         n;
+        IssmDouble* vector = NULL;
+
+        if(!this->params[index]) _error_("Parameter " << EnumToStringx(param_enum) <<" not set");
+        this->params[index]->GetParameterValue(&vector,&n);
+
+        /*Make output passive*/
+        IssmPDouble* output = xNew<IssmPDouble>(n);
+        for(int i=0;i<n;i++) output[i] = reCast<IssmPDouble>(vector[i]);
+
+        /*assign output pointers*/
+        if(pvec) *pvec = output;
+        if(pM)   *pM   = n;
+}/*}}}*/
 void Parameters::FindParamInDataset(IssmDouble** pIssmDoublearray,int* pM,int* pN,int dataset_type,int enum_type){/*{{{*/
         _assert_(this);

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

@@ -53 +53 @@
                 void  FindParam(DataSet** pdataset, int enum_type);
                 void  FindParamAndMakePassive(IssmPDouble* pscalar, int enum_type);
+                void  FindParamAndMakePassive(IssmPDouble** pvec,int* pM,int enum_type);
                 void  FindParamInDataset(IssmDouble** pIssmDoublearray,int* pM,int* pN,int dataset_type,int enum_type);