Changeset 9585

Timestamp:

09/02/11 09:52:36 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fix dakota serial

Location:

issm/trunk/src

Files:

• c/modules/Dakotax/Dakotax.cpp (modified) (1 diff)
• m/solutions/SpawnCore.m (modified) (1 diff)

issm/trunk/src/c/modules/Dakotax/Dakotax.cpp

@@ -70 +70 @@
         /*Retrieve parameters: */
         #ifdef _SERIAL_
-        printf("-------------- file: Dakotax.cpp line: %i\n",__LINE__); 
         FetchMatlabData((Parameters**)&parameters,mxGetField((mxArray*)femmodel,0,"parameters"));
-        printf("-------------- file: Dakotax.cpp line: %i\n",__LINE__); 
         #else
         parameters=femmodel->parameters;

issm/trunk/src/m/solutions/SpawnCore.m

@@ -17 +17 @@
 
 %now run the core solution
-[solutioncore]=CorePointerFromSolutionEnum(parameters,solution_type);
+[solutioncore]=CorePointerFromSolutionEnum(femmodel.parameters,solution_type);
 if(control_analysis)solutioncore='control_core';end;
 eval(['femmodel=' solutioncore '(femmodel);']);