Changeset 11832


Ignore:
Timestamp:
03/30/12 16:39:41 (13 years ago)
Author:
Mathieu Morlighem
Message:

Fixing steadystate and cleaning up

Location:
issm/trunk-jpl/src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp

    r11827 r11832  
    1717        /*parameters: */
    1818        bool save_results;
    19         int  solution_type;
    2019
    2120        /*retrieve parameters:*/
    2221        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    23         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    2422
    2523        /*compute thickness */

  • issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp

    r11827 r11832  
    1919        bool save_results;
    2020        bool conserve_loads   = true;
    21         int  solution_type;
    2221
    2322        /*retrieve parameters:*/
    2423        femmodel->parameters->FindParam(&isstokes,FlowequationIsstokesEnum);
    2524        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    26         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    2725
    2826        /*Compute velocities*/

  • issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp

    r11827 r11832  
    1616
    1717        /*parameters: */
    18         int  dim;
    19         int  solution_type;
    2018        bool save_results;
    2119
    … …  
    2422       
    2523        /*recover parameters: */
    26         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    2724        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    28         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    2925
    3026        _printf_(VerboseSolution(),"call computational core:\n");

  • issm/trunk-jpl/src/c/solutions/bedslope_core.cpp

    r11827 r11832  
    1414
    1515        /*parameters: */
    16         int  dim;
    17         bool isstokes;
    18         bool ishutter;
    1916        bool save_results;
    20         int  solution_type;
    2117
    2218        /*Recover some parameters: */
    23         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    2419        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    25         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    2620
    2721        _printf_(VerboseSolution(),"%s\n","   computing slope");

  • issm/trunk-jpl/src/c/solutions/hydrology_core.cpp

    r11827 r11832  
    2222        double dt;
    2323        bool   save_results;
    24         int    solution_type;
    2524        int    output_frequency;
    2625
    … …  
    3029        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    3130        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    32         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    3331        femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
    3432        /*first compute slopes: */

  • issm/trunk-jpl/src/c/solutions/prognostic_core.cpp

    r11827 r11832  
    1515
    1616        /*parameters: */
    17         int solution_type;
    1817        bool save_results;
    1918
    … …  
    2322        /*recover parameters: */
    2423        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    25         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    2624
    2725        _printf_(VerboseSolution(),"   call computational core\n");

  • issm/trunk-jpl/src/c/solutions/steadystate_core.cpp

    r11827 r11832  
    2626        /*parameters: */
    2727        bool save_results,isenthalpy;
    28         int  dim;
    29         int  solution_type;
    3028        int  maxiter;
    3129        int  numoutputs         = 0;
    … …  
    3331       
    3432        /* recover parameters:*/
    35         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    3633        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    37         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    3834        femmodel->parameters->FindParam(&maxiter,SteadystateMaxiterEnum);
    3935        femmodel->parameters->FindParam(&numoutputs,SteadystateNumRequestedOutputsEnum);
    4036        femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
     37        femmodel->parameters->SetParam(false,SaveResultsEnum);
    4138        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SteadystateRequestedOutputsEnum);
    4239

  • issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp

    r11827 r11832  
    1414
    1515        /*parameters: */
    16         int dim;
    17         bool isstokes;
    18         bool ishutter;
    1916        bool save_results;
    20         int solution_type;
    2117
    2218        /*Recover some parameters: */
    23         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    2419        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    25         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    2620
    2721        _printf_(VerboseSolution(),"%s\n","computing slope...");

  • issm/trunk-jpl/src/c/solutions/transient_core.cpp

    r11830 r11832  
    2727        bool   save_results,dakota_analysis;
    2828        bool   time_adapt=false;
    29         int    solution_type;
    3029        int    output_frequency;
    3130        int    dim,groundingline_migration;
    … …  
    4443        femmodel->parameters->FindParam(&yts,ConstantsYtsEnum);
    4544        femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
    46         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    4745        femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
    4846        femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum);

  • issm/trunk-jpl/src/m/solutions/adjointbalancethickness_core.m

    r11827 r11832  
    77        %recover parameters common to all solutions
    88        save_results=femmodel.parameters.SaveResults;
    9         solution_type=femmodel.parameters.SolutionType;
    109
    1110        %set analysis type to compute velocity:

  • issm/trunk-jpl/src/m/solutions/adjointdiagnostic_core.m

    r11827 r11832  
    77        %recover parameters common to all solutions
    88        isstokes=femmodel.parameters.FlowequationIsstokes;
    9         dim=femmodel.parameters.MeshDimension;
    109        save_results=femmodel.parameters.SaveResults;
    11         solution_type=femmodel.parameters.SolutionType;
    1210        conserve_loads=true;
    1311

  • issm/trunk-jpl/src/m/solutions/balancethickness_core.m

    r11827 r11832  
    66
    77        %recover parameters common to all solutions
    8         dim=femmodel.parameters.MeshDimension;
    98        save_results=femmodel.parameters.SaveResults;
    10         solution_type=femmodel.parameters.SolutionType;
    119
    1210        %Activate formulation

  • issm/trunk-jpl/src/m/solutions/bedslope_core.m

    r11827 r11832  
    77
    88        %Recover some parameters:
    9         dim=femmodel.parameters.MeshDimension;
    109        save_results=femmodel.parameters.SaveResults;
    11         solution_type=femmodel.parameters.SolutionType;
    1210
    1311        issmprintf(VerboseSolution,'   computing bed slope');

  • issm/trunk-jpl/src/m/solutions/control_core.m

    r11827 r11832  
    1717        tol_cm=femmodel.parameters.InversionCostFunctionThreshold;
    1818        gradient_only=femmodel.parameters.InversionGradientOnly;
    19         dim=femmodel.parameters.MeshDimension;
    2019        isstokes=femmodel.parameters.FlowequationIsstokes;
    2120        femmodel.parameters.SaveResults=false;

  • issm/trunk-jpl/src/m/solutions/diagnostic_core.m

    r11827 r11832  
    1111
    1212        %recover parameters common to all solutions
    13         dim=femmodel.parameters.MeshDimension;
    1413        ishutter=femmodel.parameters.FlowequationIshutter;
    1514        ismacayealpattyn=femmodel.parameters.FlowequationIsmacayealpattyn;

  • issm/trunk-jpl/src/m/solutions/enthalpy_core.m

    r11830 r11832  
    77        %recover parameters common to all solutions
    88        save_results=femmodel.parameters.SaveResults;
    9         solution_type=femmodel.parameters.SolutionType;
    109
    1110        issmprintf(VerboseSolution,'\n%s',['   computing enthalpy']);

  • issm/trunk-jpl/src/m/solutions/prognostic_core.m

    r11827 r11832  
    77        %recover parameters common to all solutions
    88        save_results=femmodel.parameters.SaveResults;
    9         solution_type=femmodel.parameters.SolutionType;
    109
    1110        %Activate formulation

  • issm/trunk-jpl/src/m/solutions/steadystate_core.m

    r11827 r11832  
    77
    88        %recover parameters common to all solutions
    9         dim=femmodel.parameters.MeshDimension;
    109        save_results=femmodel.parameters.SaveResults;
    11         solution_type=femmodel.parameters.SolutionType;
    1210        isenthalpy=femmodel.parameters.ThermalIsenthalpy;
     11        femmodel.parameters.SaveResults=false;
    1312
    1413        %Initialize counter

  • issm/trunk-jpl/src/m/solutions/surfaceslope_core.m

    r11827 r11832  
    77
    88        %Recover some parameters:
    9         dim=femmodel.parameters.MeshDimension;
    109        save_results=femmodel.parameters.SaveResults;
    11         solution_type=femmodel.parameters.SolutionType;
    1210
    1311        %Call on core computations:

  • issm/trunk-jpl/src/m/solutions/thermal_core.m

    r11830 r11832  
    88        %recover parameters common to all solutions
    99        save_results=femmodel.parameters.SaveResults;
    10         solution_type=femmodel.parameters.SolutionType;
    1110
    1211        issmprintf(VerboseSolution,'\n%s',['   computing temperature']);

  • issm/trunk-jpl/src/m/solutions/transient_core.m

    r11830 r11832  
    66
    77        %recover parameters common to all solutions
    8         dim=femmodel.parameters.MeshDimension;
    98        starttime=femmodel.parameters.TimesteppingStartTime;
    109        finaltime=femmodel.parameters.TimesteppingFinalTime;
    1110        dt=femmodel.parameters.TimesteppingTimeStep;
    1211        yts=femmodel.parameters.ConstantsYts;
    13         solution_type=femmodel.parameters.SolutionType;
    1412        output_frequency=femmodel.parameters.SettingsOutputFrequency;
    1513        time_adapt=femmodel.parameters.TimesteppingTimeAdapt;
Note: See TracChangeset for help on using the changeset viewer.