Changeset 4331


Ignore:
Timestamp:
06/30/10 10:00:01 (15 years ago)
Author:
Mathieu Morlighem
Message:

Check Solution, not analysis type

Location:
issm/trunk/src/c/solutions
Files:
14 edited

Legend:

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

    r4285 r4331  
    7777
    7878        if(verbose)_printf_("saving results:\n");
    79         if(solution_type==AdjointAnalysisEnum){
     79        if(solution_type==AdjointSolutionEnum){
    8080                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointxEnum);
    8181                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointyEnum);
  • issm/trunk/src/c/solutions/balancedthickness2_core.cpp

    r4285 r4331  
    4444
    4545        if(verbose)_printf_("saving results:\n");
    46         if(solution_type==Balancedthickness2AnalysisEnum){
     46        if(solution_type==Balancedthickness2SolutionEnum){
    4747                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
    4848        }
  • issm/trunk/src/c/solutions/balancedthickness_core.cpp

    r4285 r4331  
    3939
    4040        if(verbose)_printf_("saving results:\n");
    41         if(solution_type==BalancedthicknessAnalysisEnum){
     41        if(solution_type==BalancedthicknessSolutionEnum){
    4242                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
    4343        }
  • issm/trunk/src/c/solutions/balancedvelocities_core.cpp

    r4285 r4331  
    3939
    4040        if(verbose)_printf_("saving results:\n");
    41         if(solution_type==BalancedvelocitiesAnalysisEnum){
     41        if(solution_type==BalancedvelocitiesSolutionEnum){
    4242                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
    4343                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
  • issm/trunk/src/c/solutions/bedslope_core.cpp

    r4304 r4331  
    4040       
    4141        if(verbose)_printf_("saving results:\n");
    42         if(solution_type==BedSlopeAnalysisEnum){
     42        if(solution_type==BedSlopeSolutionEnum){
    4343                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeXEnum);
    4444                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeYEnum);
  • issm/trunk/src/c/solutions/diagnostic.cpp

    r4295 r4331  
    3838        const int numanalyses=6;
    3939        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum};
    40         const int solution_type=DiagnosticAnalysisEnum;
     40        const int solution_type=DiagnosticSolutionEnum;
    4141
    4242        MODULEBOOT();
  • issm/trunk/src/c/solutions/diagnostic_core.cpp

    r4285 r4331  
    8787
    8888        if(verbose)_printf_("saving results:\n");
    89         if(solution_type==DiagnosticAnalysisEnum){
     89        if(solution_type==DiagnosticSolutionEnum){
    9090                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
    9191                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
  • issm/trunk/src/c/solutions/prognostic2_core.cpp

    r4285 r4331  
    3737
    3838        if(verbose)_printf_("saving results:\n");
    39         if(solution_type==Prognostic2AnalysisEnum){
     39        if(solution_type==Prognostic2SolutionEnum){
    4040                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
    4141        }
  • issm/trunk/src/c/solutions/prognostic_core.cpp

    r4285 r4331  
    3535
    3636        if(verbose)_printf_("saving results:\n");
    37         if(solution_type==PrognosticAnalysisEnum){
     37        if(solution_type==PrognosticSolutionEnum){
    3838                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
    3939        }
  • issm/trunk/src/c/solutions/steadystate_core.cpp

    r4285 r4331  
    5858       
    5959        if(verbose)_printf_("saving results:\n");
    60         if(solution_type==SteadystateAnalysisEnum){
     60        if(solution_type==SteadystateSolutionEnum){
    6161                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
    6262                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
  • issm/trunk/src/c/solutions/surfaceslope_core.cpp

    r4304 r4331  
    4040       
    4141        if(verbose)_printf_("saving results:\n");
    42         if(solution_type==SurfaceSlopeAnalysisEnum){
     42        if(solution_type==SurfaceSlopeSolutionEnum){
    4343                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeXEnum);
    4444                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeYEnum);
  • issm/trunk/src/c/solutions/thermal_core.cpp

    r4285 r4331  
    4848
    4949                if(verbose)_printf_("saving results:\n");
    50                 if(solution_type==ThermalAnalysisEnum){
     50                if(solution_type==ThermalSolutionEnum){
    5151                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i,time);
    5252                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,i,time);
  • issm/trunk/src/c/solutions/transient2d_core.cpp

    r4285 r4331  
    5252
    5353                if(verbose)_printf_("%s\n","saving results:\n");
    54                 if(solution_type==Transient2DAnalysisEnum){
     54                if(solution_type==Transient2DSolutionEnum){
    5555                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time);
    5656                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);
  • issm/trunk/src/c/solutions/transient3d_core.cpp

    r4285 r4331  
    6060
    6161                if(verbose)_printf_("%s\n","saving results:\n");
    62                 if(solution_type==Transient3DAnalysisEnum){
     62                if(solution_type==Transient3DSolutionEnum){
    6363                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time);
    6464                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);
Note: See TracChangeset for help on using the changeset viewer.