Changeset 4295 for issm/trunk


Ignore:
Timestamp:
06/29/10 08:21:25 (15 years ago)
Author:
Mathieu Morlighem
Message:

solution_type is now a SolutionEnum (not an AnalysisEnum) and some variables are now const for a better initialization

Location:
issm/trunk/src/c
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp

    r4285 r4295  
    1616
    1717
    18 void CreateDataSets(Elements** pelements,Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter){
     18void CreateDataSets(Elements** pelements,Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,const int solution_type,const int analysis_type,const int nummodels,int analysis_counter){
    1919
    2020        bool continuous=true;

  • issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

    r4237 r4295  
    1313#include "./ModelProcessorx.h"
    1414
    15 void    CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels){
     15void    CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,const int nummodels){
    1616
    1717        /*Intermediary*/

  • issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

    r4236 r4295  
    1212#include "./ModelProcessorx.h"
    1313
    14 void CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int analysis_counter){
     14void CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,const int solution_type,int analysis_type,int analysis_counter){
    1515       
    1616        int i;

  • issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

    r4236 r4295  
    1616#include "../../modules/modules.h"
    1717
    18 void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,int solution_type,int nummodels, int* analysis_type_list){
     18void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,const int solution_type,const int nummodels,const int* analysis_type_list){
    1919
    2020        int i;

  • issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h

    r4218 r4295  
    1313#include "../../io/io.h"
    1414
    15 void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle iomodel_handle,int solution_type,int nummodels, int* analysis_type_list);
     15void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle iomodel_handle,const int solution_type,const int nummodels,const int* analysis_type_list);
    1616
    1717/*Creation of fem datasets: general drivers*/
    18 void  CreateDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter);
    19 void  CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels);
    20 void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int analysis_counter);
     18void  CreateDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,const int solution_type,int analysis_type,const int nummodels,int analysis_counter);
     19void  CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,const int nummodels);
     20void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,const int solution_type,int analysis_type,int analysis_counter);
    2121void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
    2222void  CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int analysis_type);
    … …  
    3333void    CreateNodesDiagnosticVert(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    3434void    CreateConstraintsDiagnosticVert(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    35 void    CreateLoadsDiagnosticVert(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     35void  CreateLoadsDiagnosticVert(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    3636void    UpdateElementsDiagnosticVert(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    3737
    … …  
    3939void    CreateNodesDiagnosticHutter(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    4040void    CreateConstraintsDiagnosticHutter(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    41 void    CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     41void  CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    4242void    UpdateElementsDiagnosticHutter(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    4343
    … …  
    4545void    CreateNodesDiagnosticStokes(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    4646void    CreateConstraintsDiagnosticStokes(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    47 void    CreateLoadsDiagnosticStokes(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     47void  CreateLoadsDiagnosticStokes(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    4848void    UpdateElementsDiagnosticStokes(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    4949
    … …  
    5151void    CreateNodesSlopeCompute(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5252void    CreateConstraintsSlopeCompute(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    53 void    CreateLoadsSlopeCompute(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     53void  CreateLoadsSlopeCompute(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    5454void    UpdateElementsSlopeCompute(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    5555
    … …  
    5757void    CreateNodesThermal(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    5858void    CreateConstraintsThermal(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    59 void    CreateLoadsThermal(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     59void  CreateLoadsThermal(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    6060void    UpdateElementsThermal(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    6161
    … …  
    6363void    CreateNodesMelting(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    6464void    CreateConstraintsMelting(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    65 void    CreateLoadsMelting(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     65void  CreateLoadsMelting(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    6666void    UpdateElementsMelting(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    6767
    … …  
    6969void    CreateNodesPrognostic(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    7070void    CreateConstraintsPrognostic(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    71 void    CreateLoadsPrognostic(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     71void  CreateLoadsPrognostic(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    7272void    UpdateElementsPrognostic(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    7373
    … …  
    7575void    CreateNodesPrognostic2(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    7676void    CreateConstraintsPrognostic2(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    77 void    CreateLoadsPrognostic2(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     77void  CreateLoadsPrognostic2(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    7878void    UpdateElementsPrognostic2(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    7979
    … …  
    8181void    CreateNodesBalancedthickness(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8282void    CreateConstraintsBalancedthickness(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    83 void    CreateLoadsBalancedthickness(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     83void  CreateLoadsBalancedthickness(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    8484void    UpdateElementsBalancedthickness(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    8585
    8686void    CreateNodesBalancedthickness2(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    8787void    CreateConstraintsBalancedthickness2(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    88 void    CreateLoadsBalancedthickness2(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     88void  CreateLoadsBalancedthickness2(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    8989void    UpdateElementsBalancedthickness2(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    9090
    … …  
    9292void    CreateNodesBalancedvelocities(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
    9393void    CreateConstraintsBalancedvelocities(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
    94 void    CreateLoadsBalancedvelocities(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
     94void  CreateLoadsBalancedvelocities(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
    9595void    UpdateElementsBalancedvelocities(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
    9696

  • issm/trunk/src/c/objects/FemModel.cpp

    r4236 r4295  
    2020/*Object constructors and destructor*/
    2121/*FUNCTION FemModel::constructor {{{1*/
    22 FemModel::FemModel(ConstDataHandle IOMODEL,int in_solution_type,int* analyses, int nummodels){
     22FemModel::FemModel(ConstDataHandle IOMODEL,const int in_solution_type,const int* analyses,const int nummodels){
    2323
    2424        /*intermediary*/

  • issm/trunk/src/c/objects/FemModel.h

    r4218 r4295  
    5454
    5555                /*constructors, destructors: */
    56                 FemModel(ConstDataHandle IOMODEL,int solution_type,int* analyses, int nummodels);
     56                FemModel(ConstDataHandle IOMODEL,const int solution_type,const int* analyses,const int nummodels);
    5757                ~FemModel();
    5858

  • issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp

    r4285 r4295  
    4949                numdofs=1;
    5050        }
    51         else ISSMERROR("%s%i%s"," analysis type: ",analysis_type,"  not implemented yet!");
     51        else ISSMERROR("analysis type: %i (%s) not implemented yet",analysis_type,EnumAsString(analysis_type));
    5252
    5353        /*Assign output pointers:*/

  • issm/trunk/src/c/solutions/balancedthickness.cpp

    r4236 r4295  
    3434        double   start_init, finish_init;
    3535
    36         int analyses[1]={BalancedthicknessAnalysisEnum};
    37         int solution_type=BalancedthicknessAnalysisEnum;
     36        const int numanalyses=1;
     37        const int analyses[numanalyses]={BalancedthicknessAnalysisEnum};
     38        const int solution_type=BalancedthicknessSolutionEnum;
    3839
    3940        MODULEBOOT();
    … …  
    6364
    6465        _printf_("create finite element model:\n");
    65         femmodel=new FemModel(fid,solution_type,analyses,1);
     66        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6667
    6768        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/balancedthickness2.cpp

    r4236 r4295  
    3535        double   start_init, finish_init;
    3636
    37         int analyses[1]={Balancedthickness2AnalysisEnum};
    38         int solution_type=Balancedthickness2AnalysisEnum;
     37        const int numanalyses=1;
     38        const int analyses[numanalyses]={Balancedthickness2AnalysisEnum};
     39        const int solution_type=Balancedthickness2SolutionEnum;
    3940
    4041
    … …  
    6566
    6667        _printf_("create finite element model:\n");
    67         femmodel=new FemModel(fid,solution_type,analyses,1);
     68        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6869
    6970        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/balancedvelocities.cpp

    r4236 r4295  
    3535        double   start_init, finish_init;
    3636
    37         int analyses[1]={BalancedvelocitiesAnalysisEnum};
    38         int solution_type=BalancedvelocitiesAnalysisEnum;
     37        const int numanalyses=1;
     38        const int analyses[numanalyses]={BalancedvelocitiesAnalysisEnum};
     39        const int solution_type=BalancedvelocitiesSolutionEnum;
    3940
    4041        MODULEBOOT();
    … …  
    6465
    6566        _printf_("create finite element model:\n");
    66         femmodel=new FemModel(fid,solution_type,analyses,1);
     67        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6768
    6869        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/bedslope.cpp

    r4285 r4295  
    3737        double   start_init, finish_init;
    3838
    39         int analyses[1]={BedSlopeAnalysisEnum};
    40         int solution_type=BedSlopeAnalysisEnum;
     39        const int numanalyses=1;
     40        const int analyses[numanalyses]={BedSlopeAnalysisEnum};
     41        const int solution_type=BedSlopeSolutionEnum;
    4142
    4243        MODULEBOOT();
    … …  
    6667
    6768        _printf_("create finite element model, using analyses types statically defined above:\n");
    68         femmodel=new FemModel(fid,solution_type,analyses,1);
     69        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6970
    7071        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/diagnostic.cpp

    r4236 r4295  
    3636        double   start_init, finish_init;
    3737
    38         int analyses[5]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum};
    39         int solution_type=DiagnosticAnalysisEnum;
     38        const int numanalyses=6;
     39        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum};
     40        const int solution_type=DiagnosticAnalysisEnum;
    4041
    4142        MODULEBOOT();
    … …  
    6465
    6566        _printf_("create finite element model:\n");
    66         femmodel=new FemModel(fid,solution_type,analyses,5);
     67        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6768
    6869        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/prognostic.cpp

    r4236 r4295  
    3535        double   start_init, finish_init;
    3636
    37         int analyses[1]={PrognosticAnalysisEnum};
    38         int solution_type=PrognosticAnalysisEnum;
     37        const int numanalyses=1;
     38        const int analyses[numanalyses]={PrognosticAnalysisEnum};
     39        const int solution_type=PrognosticSolutionEnum;
    3940
    4041        MODULEBOOT();
    … …  
    6465
    6566        _printf_("create finite element model:\n");
    66         femmodel=new FemModel(fid,solution_type,analyses,1);
     67        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6768
    6869        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/prognostic2.cpp

    r4236 r4295  
    3535        double   start_init, finish_init;
    3636
    37         int analyses[1]={Prognostic2AnalysisEnum};
    38         int solution_type=Prognostic2AnalysisEnum;
     37        const int numanalyses=1;
     38        const int analyses[numanalyses]={Prognostic2AnalysisEnum};
     39        const int solution_type=Prognostic2SolutionEnum;
    3940
    4041        MODULEBOOT();
    … …  
    6465
    6566        _printf_("create finite element model:\n");
    66         femmodel=new FemModel(fid,solution_type,analyses,1);
     67        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6768
    6869        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/steadystate.cpp

    r4236 r4295  
    3939        BoolParam* param=NULL;
    4040
    41         int analyses[7]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
    42         int solution_type=SteadystateAnalysisEnum;
     41        const int numanalyses=7;
     42        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
     43        const int solution_type=SteadystateSolutionEnum;
    4344
    4445        MODULEBOOT();
    … …  
    6869
    6970        _printf_("create finite element model:\n");
    70         femmodel=new FemModel(fid,solution_type,analyses,5);
     71        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    7172
    7273        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/surfaceslope.cpp

    r4285 r4295  
    3737        double   start_init, finish_init;
    3838
    39         int analyses[1]={SurfaceSlopeAnalysisEnum};
    40         int solution_type=SurfaceSlopeAnalysisEnum;
     39        const int numanalyses=1;
     40        const int analyses[numanalyses]={SurfaceSlopeAnalysisEnum};
     41        const int solution_type=SurfaceSlopeSolutionEnum;
    4142
    4243        MODULEBOOT();
    … …  
    6667
    6768        _printf_("create finite element model, using analyses types statically defined above:\n");
    68         femmodel=new FemModel(fid,solution_type,analyses,1);
     69        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6970
    7071        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/thermal.cpp

    r4236 r4295  
    3737        double   start_init, finish_init;
    3838
    39         int analyses[2]={ThermalAnalysisEnum,MeltingAnalysisEnum};
    40         int solution_type=ThermalAnalysisEnum;
     39        const int numanalyses=2;
     40        const int analyses[numanalyses]={ThermalAnalysisEnum,MeltingAnalysisEnum};
     41        const int solution_type=ThermalSolutionEnum;
    4142
    4243        MODULEBOOT();
    … …  
    6667
    6768        _printf_("create finite element model:\n");
    68         femmodel=new FemModel(fid,solution_type,analyses,2);
     69        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6970
    7071        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/transient2d.cpp

    r4236 r4295  
    3535        double   start_init, finish_init;
    3636
    37         int analyses[2]={DiagnosticHorizAnalysisEnum,PrognosticAnalysisEnum};
    38         int solution_type=Transient2DAnalysisEnum;
     37        const int numanalyses=2;
     38        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,PrognosticAnalysisEnum};
     39        const int solution_type=Transient2DSolutionEnum;
    3940
    4041        MODULEBOOT();
    … …  
    6162
    6263        _printf_("create finite element model:\n");
    63         femmodel=new FemModel(fid,solution_type,analyses,2);
     64        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6465
    6566        /*add outputfilename in parameters: */

  • issm/trunk/src/c/solutions/transient3d.cpp

    r4236 r4295  
    3535        double   start_init, finish_init;
    3636
    37         int analyses[8]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
    38         int solution_type=Transient3DAnalysisEnum;
     37        const int numanalyses=8;
     38        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
     39        const int solution_type=Transient3DSolutionEnum;
    3940
    4041        MODULEBOOT();
    … …  
    6162
    6263        _printf_("create finite element model:\n");
    63         femmodel=new FemModel(fid,solution_type,analyses,8);
     64        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
    6465
    6566        /*add outputfilename in parameters: */
Note: See TracChangeset for help on using the changeset viewer.