Changeset 9112

Timestamp:

07/25/11 16:10:26 (14 years ago)

Author:

Eric.Larour

Message:

Pushed logic down into RequestedOutputsx module

Location:

issm/trunk/src/c/solutions

Files:

• diagnostic_core.cpp (modified) (3 diffs)
• steadystate_core.cpp (modified) (3 diffs)

issm/trunk/src/c/solutions/diagnostic_core.cpp

@@ -24 +24 @@
         bool   control_analysis;
         int    solution_type;
-        int    numoutputs=0;
-        int*   requested_outputs    = NULL;
 
 
@@ -36 +34 @@
         femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
-        femmodel->parameters->FindParam(&requested_outputs,&numoutputs,RequestedOutputsEnum);
 
         /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
@@ -91 +88 @@
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
                 if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum);
-                if(numoutputs)RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
         }
 
-        /*Free ressources:*/
-        xfree((void**)&requested_outputs);
-
 }

issm/trunk/src/c/solutions/steadystate_core.cpp

@@ -22 +22 @@
         int max_steadystate_iterations;
         bool control_analysis;
-        int    numoutputs=0;
-        int*   requested_outputs    = NULL;
         
         /* recover parameters:*/
@@ -30 +28 @@
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
         femmodel->parameters->FindParam(&max_steadystate_iterations,MaxSteadystateIterationsEnum);
-        femmodel->parameters->FindParam(&requested_outputs,&numoutputs,RequestedOutputsEnum);
 
         /*intialize counters: */
@@ -72 +69 @@
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum);
-                if(numoutputs)RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
         }
 
-        /*Free ressources:*/
-        xfree((void**)&requested_outputs);
-
 }