Changeset 9112


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/solutions/diagnostic_core.cpp

    r9110 r9112  
    2424        bool   control_analysis;
    2525        int    solution_type;
    26         int    numoutputs=0;
    27         int*   requested_outputs    = NULL;
    2826
    2927
     
    3634        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    3735        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    38         femmodel->parameters->FindParam(&requested_outputs,&numoutputs,RequestedOutputsEnum);
    3936
    4037        /*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.*/
     
    9188                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
    9289                if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum);
    93                 if(numoutputs)RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
     90                RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    9491        }
    9592
    96         /*Free ressources:*/
    97         xfree((void**)&requested_outputs);
    98 
    9993}
  • issm/trunk/src/c/solutions/steadystate_core.cpp

    r9110 r9112  
    2222        int max_steadystate_iterations;
    2323        bool control_analysis;
    24         int    numoutputs=0;
    25         int*   requested_outputs    = NULL;
    2624       
    2725        /* recover parameters:*/
     
    3028        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    3129        femmodel->parameters->FindParam(&max_steadystate_iterations,MaxSteadystateIterationsEnum);
    32         femmodel->parameters->FindParam(&requested_outputs,&numoutputs,RequestedOutputsEnum);
    3330
    3431        /*intialize counters: */
     
    7269                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
    7370                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum);
    74                 if(numoutputs)RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
     71                RequestedOutputsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    7572        }
    7673
    77         /*Free ressources:*/
    78         xfree((void**)&requested_outputs);
    79 
    8074}
Note: See TracChangeset for help on using the changeset viewer.