Changeset 14992


Ignore:
Timestamp:
05/09/13 11:28:38 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moved solvers to solutionsequences

Location:
issm/trunk-jpl/src/c
Files:
25 edited
9 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r14985 r14992  
    331331                                        ./analyses/EnvironmentFinalize.cpp\
    332332                                        ./analyses/ad_core.cpp\
    333                                         ./solvers/solver_linear.cpp\
    334                                         ./solvers/solver_nonlinear.cpp\
    335                                         ./solvers/solver_newton.cpp\
     333                                        ./solutionsequences/solutionsequence_linear.cpp\
     334                                        ./solutionsequences/solutionsequence_nonlinear.cpp\
     335                                        ./solutionsequences/solutionsequence_newton.cpp\
    336336                                        ./classes/objects/Options/Option.h\
    337337                                        ./classes/objects/Options/GenericOption.h\
    … …  
    390390                                           ./analyses/thermal_core.cpp\
    391391                                           ./analyses/enthalpy_core.cpp\
    392                                            ./solvers/solver_thermal_nonlinear.cpp
     392                                           ./solutionsequences/solutionsequence_thermal_nonlinear.cpp
    393393#}}}
    394394#Control sources  {{{
    … …  
    444444                                          ./analyses/adjointbalancethickness_core.cpp\
    445445                                          ./analyses/AdjointCorePointerFromSolutionEnum.cpp\
    446                                           ./solvers/solver_adjoint_linear.cpp
     446                                          ./solutionsequences/solutionsequence_adjoint_linear.cpp
    447447
    448448#}}}
    … …  
    464464                                                        ./modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp \
    465465                                                        ./analyses/hydrology_core.cpp\
    466                                                         ./solvers/solver_hydro_nonlinear.cpp
     466                                                        ./solutionsequences/solutionsequence_hydro_nonlinear.cpp
    467467#}}}
    468468#Diagnostic sources  {{{
    … …  
    480480                                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp \
    481481                                                        ./analyses/diagnostic_core.cpp\
    482                                                         ./solvers/solver_stokescoupling_nonlinear.cpp
     482                                                        ./solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp
    483483#}}}
    484484#Balanced sources  {{{

  • issm/trunk-jpl/src/c/analyses/AdjointCorePointerFromSolutionEnum.cpp

    r14985 r14992  
    1414#include "../shared/Enum/Enum.h"
    1515#include "../modules/modules.h"
    16 #include "../solvers/solvers.h"
     16#include "../solutionsequences/solutionsequences.h"
    1717
    1818void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype){

  • issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp

    r14985 r14992  
    1414#include "../shared/Enum/Enum.h"
    1515#include "../modules/modules.h"
    16 #include "../solvers/solvers.h"
     16#include "../solutionsequences/solutionsequences.h"
    1717
    1818void AnalysisConfiguration(int** panalyses,int* pnumanalyses, int solutiontype){

  • issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp

    r14985 r14992  
    1414#include "../shared/Enum/Enum.h"
    1515#include "../modules/modules.h"
    16 #include "../solvers/solvers.h"
     16#include "../solutionsequences/solutionsequences.h"
    1717
    1818void CorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),Parameters* parameters,int solutiontype){

  • issm/trunk-jpl/src/c/analyses/WrapperCorePointerFromSolutionEnum.cpp

    r14985 r14992  
    1313#include "../shared/Enum/Enum.h"
    1414#include "../modules/modules.h"
    15 #include "../solvers/solvers.h"
     15#include "../solutionsequences/solutionsequences.h"
    1616
    1717void WrapperCorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),Parameters* parameters,int solutiontype,bool nodakotacore){

  • issm/trunk-jpl/src/c/analyses/ad_core.cpp

    r14985 r14992  
    1818#include "../shared/Enum/Enum.h"
    1919#include "../modules/modules.h"
    20 #include "../solvers/solvers.h"
     20#include "../solutionsequences/solutionsequences.h"
    2121/*}}}*/
    2222

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

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void adjointbalancethickness_core(FemModel* femmodel){
    … …  
    2222        if(VerboseSolution()) _pprintLine_("   computing thickness");
    2323        femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
    24         solver_linear(femmodel);
     24        solutionsequence_linear(femmodel);
    2525
    2626        /*Call SurfaceAreax, because some it might be needed by PVector*/
    … …  
    3030        if(VerboseSolution()) _pprintLine_("   computing adjoint");
    3131        femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum,AdjointBalancethicknessAnalysisEnum);
    32         solver_adjoint_linear(femmodel);
     32        solutionsequence_adjoint_linear(femmodel);
    3333
    3434        /*Save results*/

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

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void adjointdiagnostic_core(FemModel* femmodel){
    … …  
    2525        if(VerboseSolution()) _pprintLine_("   computing velocities");
    2626        femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
    27         solver_nonlinear(femmodel,conserve_loads);
     27        solutionsequence_nonlinear(femmodel,conserve_loads);
    2828
    2929        /*Call SurfaceAreax, because some it might be needed by PVector*/
    … …  
    3333        if(VerboseSolution()) _pprintLine_("   computing adjoint");
    3434        femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum);
    35         solver_adjoint_linear(femmodel);
     35        solutionsequence_adjoint_linear(femmodel);
    3636
    3737        /*Save results*/

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

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void balancethickness_core(FemModel* femmodel){
    … …  
    2323
    2424        if(VerboseSolution()) _pprintLine_("call computational core:");
    25         solver_linear(femmodel);
     25        solutionsequence_linear(femmodel);
    2626
    2727        if(save_results){

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

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void bedslope_core(FemModel* femmodel){
    … …  
    2323        /*Call on core computations: */
    2424        femmodel->SetCurrentConfiguration(BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
    25         solver_linear(femmodel);
     25        solutionsequence_linear(femmodel);
    2626        femmodel->SetCurrentConfiguration(BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
    27         solver_linear(femmodel);
     27        solutionsequence_linear(femmodel);
    2828
    2929        if(save_results){

  • issm/trunk-jpl/src/c/analyses/control_core.cpp

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void control_core(FemModel* femmodel){

  • issm/trunk-jpl/src/c/analyses/controltao_core.cpp

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313#if defined (_HAVE_TAO_) && defined (_HAVE_PETSC_) && (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 1)

  • issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void diagnostic_core(FemModel* femmodel){
    … …  
    6565
    6666                femmodel->SetCurrentConfiguration(DiagnosticHutterAnalysisEnum);
    67                 solver_linear(femmodel);
     67                solutionsequence_linear(femmodel);
    6868
    6969                if (ismacayealpattyn) ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum);
    … …  
    7575                femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
    7676                if(newton>0)
    77                  solver_newton(femmodel);
     77                 solutionsequence_newton(femmodel);
    7878                else
    79                  solver_nonlinear(femmodel,conserve_loads);
     79                 solutionsequence_nonlinear(femmodel,conserve_loads);
    8080        }
    8181
    … …  
    8383
    8484                if(VerboseSolution()) _pprintLine_("   computing coupling macayealpattyn and stokes velocities and pressure ");
    85                 solver_stokescoupling_nonlinear(femmodel,conserve_loads);
     85                solutionsequence_stokescoupling_nonlinear(femmodel,conserve_loads);
    8686        }
    8787
    … …  
    9090                if(VerboseSolution()) _pprintLine_("   computing vertical velocities");
    9191                femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
    92                 solver_linear(femmodel);
     92                solutionsequence_linear(femmodel);
    9393        }
    9494

  • issm/trunk-jpl/src/c/analyses/enthalpy_core.cpp

    r14985 r14992  
    99#include "../modules/modules.h"
    1010#include "../shared/io/io.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void enthalpy_core(FemModel* femmodel){
    … …  
    2121        if(VerboseSolution()) _pprintLine_("   computing enthalpy");
    2222        femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
    23         solver_nonlinear(femmodel,true);
     23        solutionsequence_nonlinear(femmodel,true);
    2424
    2525        /*transfer enthalpy to enthalpy picard for the next step: */

  • issm/trunk-jpl/src/c/analyses/gia_core.cpp

    r14989 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212void gia_core(FemModel* femmodel){
    1313

  • issm/trunk-jpl/src/c/analyses/gradient_core.cpp

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void gradient_core(FemModel* femmodel,int step,bool orthogonalize){

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

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void hydrology_core(FemModel* femmodel){
    … …  
    6161                        if(VerboseSolution()) _pprintLine_("   computing water column");
    6262                        femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum);
    63                         solver_nonlinear(femmodel,modify_loads);
     63                        solutionsequence_nonlinear(femmodel,modify_loads);
    6464
    6565                        /*transfer water column thickness to old water column thickness: */
    … …  
    8181                        femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
    8282                        if(VerboseSolution()) _pprintLine_("   computing water head");
    83                         solver_hydro_nonlinear(femmodel);
     83                        solutionsequence_hydro_nonlinear(femmodel);
    8484                        if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
    8585                                if(VerboseSolution()) _pprintLine_("   saving results ");

  • issm/trunk-jpl/src/c/analyses/objectivefunction.cpp

    r14985 r14992  
    1313#include "../classes/objects/objects.h"
    1414#include "../shared/Enum/Enum.h"
    15 #include "../solvers/solvers.h"
     15#include "../solutionsequences/solutionsequences.h"
    1616#include "../modules/modules.h"
    1717/*}}}*/
    … …  
    5858        }
    5959        else if (solution_type==DiagnosticSolutionEnum){
    60                 solver_nonlinear(femmodel,conserve_loads);
     60                solutionsequence_nonlinear(femmodel,conserve_loads);
    6161        }
    6262        else if (solution_type==BalancethicknessSolutionEnum){
    63                 solver_linear(femmodel);
     63                solutionsequence_linear(femmodel);
    6464        }
    6565        else if (solution_type==WeakBalancethicknessSolutionEnum){

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

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void prognostic_core(FemModel* femmodel){
    … …  
    4545        }
    4646        if(VerboseSolution()) _pprintLine_("   call computational core");
    47         solver_linear(femmodel);
     47        solutionsequence_linear(femmodel);
    4848
    4949        if(save_results){

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

    r14985 r14992  
    1414#include "../shared/Enum/Enum.h"
    1515#include "../modules/modules.h"
    16 #include "../solvers/solvers.h"
     16#include "../solutionsequences/solutionsequences.h"
    1717
    1818void steadystate_core(FemModel* femmodel){

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

    r14985 r14992  
    88#include "../shared/io/io.h"
    99#include "../shared/Enum/Enum.h"
    10 #include "../solvers/solvers.h"
     10#include "../solutionsequences/solutionsequences.h"
    1111#include "../modules/modules.h"
    1212
    … …  
    2323        /*Call on core computations: */
    2424        femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
    25         solver_linear(femmodel);
     25        solutionsequence_linear(femmodel);
    2626        femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
    27         solver_linear(femmodel);
     27        solutionsequence_linear(femmodel);
    2828
    2929        if(save_results){

  • issm/trunk-jpl/src/c/analyses/thermal_core.cpp

    r14985 r14992  
    99#include "../shared/Enum/Enum.h"
    1010#include "../modules/modules.h"
    11 #include "../solvers/solvers.h"
     11#include "../solutionsequences/solutionsequences.h"
    1212
    1313void thermal_core(FemModel* femmodel){
    … …  
    2828        if(VerboseSolution()) _pprintLine_("   computing temperatures");
    2929        femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
    30         solver_thermal_nonlinear(femmodel);
     30        solutionsequence_thermal_nonlinear(femmodel);
    3131
    3232        if(VerboseSolution()) _pprintLine_("   computing melting");
    3333        femmodel->SetCurrentConfiguration(MeltingAnalysisEnum);
    34         solver_linear(femmodel);
     34        solutionsequence_linear(femmodel);
    3535
    3636        if(save_results){

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

    r14985 r14992  
    1616#include "../shared/Enum/Enum.h"
    1717#include "../modules/modules.h"
    18 #include "../solvers/solvers.h"
     18#include "../solutionsequences/solutionsequences.h"
    1919
    2020void transient_core(FemModel* femmodel){

  • issm/trunk-jpl/src/c/main/issm.h

    r14985 r14992  
    1919#include "../toolkits/toolkits.h"
    2020#include "../analyses/analyses.h"
    21 #include "../solvers/solvers.h"
     21#include "../solutionsequences/solutionsequences.h"
    2222#include "../modules/modules.h"
    2323

  • issm/trunk-jpl/src/c/solutionsequences/CMakeLists.txt

    r14284 r14992  
    22# }}}
    33# Include Directory {{{
    4 include_directories(AFTER $ENV{ISSM_DIR}/src/c/solvers)
     4include_directories(AFTER $ENV{ISSM_DIR}/src/c/solutionsequences)
    55# }}}
    66# CORE_SOURCES {{{
    7 set(CORE_SOURCES $ENV{ISSM_DIR}/src/c/solvers/solver_linear.cpp
    8                  $ENV{ISSM_DIR}/src/c/solvers/solver_newton.cpp
    9               $ENV{ISSM_DIR}/src/c/solvers/solver_nonlinear.cpp PARENT_SCOPE)
     7set(CORE_SOURCES $ENV{ISSM_DIR}/src/c/solutionsequences/solutionsequence_linear.cpp
     8                 $ENV{ISSM_DIR}/src/c/solutionsequences/solutionsequence_newton.cpp
     9              $ENV{ISSM_DIR}/src/c/solutionsequences/solutionsequence_nonlinear.cpp PARENT_SCOPE)
    1010# }}}
    1111# THERMAL_SOURCES {{{
    12 set(THERMAL_SOURCES $ENV{ISSM_DIR}/src/c/solvers/solver_thermal_nonlinear.cpp PARENT_SCOPE)
     12set(THERMAL_SOURCES $ENV{ISSM_DIR}/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp PARENT_SCOPE)
    1313# }}}
    1414# DIAGNOSTIC_SOURCES {{{
    15 set(DIAGNOSTIC_SOURCES $ENV{ISSM_DIR}/src/c/solvers/solver_stokescoupling_nonlinear.cpp PARENT_SCOPE)
     15set(DIAGNOSTIC_SOURCES $ENV{ISSM_DIR}/src/c/solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp PARENT_SCOPE)
    1616# }}}

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_adjoint_linear.cpp

    r14990 r14992  
    1 /*!\file: solver_adjoint_linear.cpp
     1/*!\file: solutionsequence_adjoint_linear.cpp
    22 * \brief: numerical core of linear solutions
    33 */
    … …  
    88#include "../modules/modules.h"
    99
    10 void solver_adjoint_linear(FemModel* femmodel){
    11         /*This is axactly the same solver as solver_linear except that Reduceloadfromgtofx and Mergesolutionfromftogx
     10void solutionsequence_adjoint_linear(FemModel* femmodel){
     11        /*This is axactly the same solutionsequence as solutionsequence_linear except that Reduceloadfromgtofx and Mergesolutionfromftogx
    1212         * use the flag "true" so that all spc are taken as 0*/
    1313

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

    r14990 r14992  
    1 /*!\file: solver_hydro_nonlinear.cpp
     1/*!\file: solutionsequence_hydro_nonlinear.cpp
    22 * \brief: core of the hydro solution
    33 */
    44
    5 #include "./solvers.h"
    65#include "../toolkits/toolkits.h"
    76#include "../classes/objects/objects.h"
    … …  
    109#include "../modules/modules.h"
    1110
    12 void solver_hydro_nonlinear(FemModel* femmodel){
     11void solutionsequence_hydro_nonlinear(FemModel* femmodel){
    1312
    1413        /*solution : */

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp

    r14990 r14992  
    1 /*!\file: solver_linear.cpp
     1/*!\file: solutionsequence_linear.cpp
    22 * \brief: numerical core of linear solutions
    33 */
    … …  
    88#include "../modules/modules.h"
    99
    10 void solver_linear(FemModel* femmodel){
     10void solutionsequence_linear(FemModel* femmodel){
    1111
    1212        /*intermediary: */

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp

    r14990 r14992  
    1 /*!\file: solver_nonlinear.cpp
     1/*!\file: solutionsequence_nonlinear.cpp
    22 * \brief: core of a non-linear solution, using fixed-point method
    33 */
    44
    5 #include "./solvers.h"
    65#include "../toolkits/toolkits.h"
    76#include "../classes/objects/objects.h"
    … …  
    1110#include "../analyses/analyses.h"
    1211
    13 void solver_newton(FemModel* femmodel){
     12void solutionsequence_newton(FemModel* femmodel){
    1413
    1514        /*intermediary: */

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_nonlinear.cpp

    r14990 r14992  
    1 /*!\file: solver_nonlinear.cpp
     1/*!\file: solutionsequence_nonlinear.cpp
    22 * \brief: core of a non-linear solution, using fixed-point method
    33 */
    44
    5 #include "./solvers.h"
    65#include "../toolkits/toolkits.h"
    76#include "../classes/objects/objects.h"
    … …  
    1110#include "../analyses/analyses.h"
    1211
    13 void solver_nonlinear(FemModel* femmodel,bool conserve_loads){
     12void solutionsequence_nonlinear(FemModel* femmodel,bool conserve_loads){
    1413
    1514        /*intermediary: */

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp

    r14990 r14992  
    1 /*!\file: solver_stokescoupling_nonlinear.cpp
     1/*!\file: solutionsequence_stokescoupling_nonlinear.cpp
    22 * \brief: core of the coupling between stokes and macayealpattyn
    33 */
    44
    5 #include "./solvers.h"
    65#include "../toolkits/toolkits.h"
    76#include "../classes/objects/objects.h"
    … …  
    1110#include "../analyses/analyses.h"
    1211
    13 void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads){
     12void solutionsequence_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads){
    1413
    1514        /*intermediary: */

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_thermal_nonlinear.cpp

    r14990 r14992  
    1 /*!\file: solver_thermal_nonlinear.cpp
     1/*!\file: solutionsequence_thermal_nonlinear.cpp
    22 * \brief: core of the thermal solution
    33 */
    44
    5 #include "./solvers.h"
    65#include "../toolkits/toolkits.h"
    76#include "../classes/objects/objects.h"
    … …  
    109#include "../modules/modules.h"
    1110
    12 void solver_thermal_nonlinear(FemModel* femmodel){
     11void solutionsequence_thermal_nonlinear(FemModel* femmodel){
    1312
    1413        /*solution : */

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequences.h

    r14990 r14992  
    11/*
    2  * solvers.h:
     2 * solutionsequences.h:
    33 */
    44
    5 #ifndef SOLVERS_H_
    6 #define SOLVERS_H_
    7 
    8 #include "../classes/objects/objects.h"
    9 #include "../shared/io/io.h"
     5#ifndef _SOLUTION_SEQUENCES_H_
     6#define _SOLUTION_SEQUENCES_H_
    107
    118struct OptArgs;
    129class FemModel;
    1310
    14 void solver_thermal_nonlinear(FemModel* femmodel);
    15 void solver_hydro_nonlinear(FemModel* femmodel);
    16 void solver_nonlinear(FemModel* femmodel,bool conserve_loads);
    17 void solver_newton(FemModel* femmodel);
    18 void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads);
    19 void solver_linear(FemModel* femmodel);
    20 void solver_adjoint_linear(FemModel* femmodel);
     11void solutionsequence_thermal_nonlinear(FemModel* femmodel);
     12void solutionsequence_hydro_nonlinear(FemModel* femmodel);
     13void solutionsequence_nonlinear(FemModel* femmodel,bool conserve_loads);
     14void solutionsequence_newton(FemModel* femmodel);
     15void solutionsequence_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads);
     16void solutionsequence_linear(FemModel* femmodel);
     17void solutionsequence_adjoint_linear(FemModel* femmodel);
    2118
    2219#endif
Note: See TracChangeset for help on using the changeset viewer.