Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

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

    r9880 r11995  
    2525
    2626        /*parameters: */
    27         int dim;
    28         int solution_type;
    29         int maxiter;
    30         bool control_analysis;
     27        bool save_results,isenthalpy;
     28        int  maxiter;
    3129        int  numoutputs         = 0;
    3230        int  *requested_outputs = NULL;
    3331       
    3432        /* recover parameters:*/
    35         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    36         femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum);
    37         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
     33        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    3834        femmodel->parameters->FindParam(&maxiter,SteadystateMaxiterEnum);
    3935        femmodel->parameters->FindParam(&numoutputs,SteadystateNumRequestedOutputsEnum);
     36        femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
     37        femmodel->parameters->SetParam(false,SaveResultsEnum);
    4038        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SteadystateRequestedOutputsEnum);
    4139
    … …  
    4745                _printf_(VerboseSolution(),"%s%i\n","   computing temperature and velocity for step: ",step);
    4846                #ifdef _HAVE_THERMAL_
    49                 thermal_core(femmodel);
     47                if(isenthalpy==0){
     48                        thermal_core(femmodel);
     49                }
     50                else{
     51                        enthalpy_core(femmodel);
     52                }
    5053                #else
    5154                _error_("ISSM was not compiled with thermal capabilities. Exiting");
    … …  
    7578        }
    7679       
    77         if(solution_type==SteadystateSolutionEnum && !control_analysis){
     80        if(save_results){
    7881                _printf_(VerboseSolution(),"   saving results\n");
    7982                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
    … …  
    8386                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
    8487                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
    85                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum);
     88                if(isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterfractionEnum);
     89                if(isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum);
     90                if(!isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum);
    8691                RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
    8792        }
Note: See TracChangeset for help on using the changeset viewer.