Changeset 16543

Timestamp:

10/24/13 16:33:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed new interface with no dataset pointer

Location:

issm/trunk-jpl/src/c/modules/ModelProcessorx

Files:

• Autodiff/CreateParametersAutodiff.cpp (modified) (3 diffs)
• Dakota/CreateParametersDakota.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp

@@ -8 +8 @@
 #include "../ModelProcessorx.h"
 
-void CreateParametersAutodiff(Parameters** pparameters,IoModel* iomodel){
+void CreateParametersAutodiff(Parameters* parameters,IoModel* iomodel){
 
         int         i;
-        Parameters *parameters       = NULL;
         bool        autodiff_analysis;
         int         num_dependent_objects;
@@ -27 +26 @@
         int         num_ind,local_num_ind;
         DataSet*    dependent_objects=NULL;
-
-        /*Get parameters: */
-        parameters=*pparameters;
 
         /*retrieve some parameters: */
@@ -164 +160 @@
         #endif
 
-        /*Assign output pointer: */
-        *pparameters=parameters;
-
 }

issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

@@ -9 +9 @@
 #include "../ModelProcessorx.h"
 
-void CreateParametersDakota(Parameters** pparameters,IoModel* iomodel,char* rootpath){
+void CreateParametersDakota(Parameters* parameters,IoModel* iomodel,char* rootpath){
 
         /*variable declarations*/
         int          i;
-        Parameters  *parameters             = NULL;
         int         *part                   = NULL;
         double      *dpart                  = NULL;
@@ -35 +34 @@
         int   numberofresponses;
         int   nrows,ncols;
-
-        /*recover parameters : */
-        parameters = *pparameters;
 
         /*recover parameters: */
@@ -124 +120 @@
         /*Free data*/
         xDelete<char>(name);
-
-        /*Assign output pointer: */
-        *pparameters = parameters;
 }