Changeset 4297


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

Getting rid of SlopeAnalysis (now either Bed or Surface)

Location:
issm/trunk/src/c
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

    r4290 r4297  
    5151                case SteadyAnalysisEnum : return "SteadyAnalysis";
    5252                case TransientAnalysisEnum : return "TransientAnalysis";
    53                 case SlopeAnalysisEnum : return "SlopeAnalysis";
    5453                case BedSlopeSolutionEnum : return "BedSlopeSolution";
    5554                case BedSlopeAnalysisEnum : return "BedSlopeAnalysis";
  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r4290 r4297  
    5454        TransientAnalysisEnum, // needed by nighly run (to be removed at some point?)
    5555        //slope
    56         SlopeAnalysisEnum,
    5756        BedSlopeSolutionEnum,
    5857        BedSlopeAnalysisEnum,
  • issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

    r4290 r4297  
    4949        else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum;
    5050        else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum;
    51         else if (strcmp(name,"SlopeAnalysis")==0) return SlopeAnalysisEnum;
    5251        else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    5352        else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;
  • issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp

    r4295 r4297  
    5757                        break;
    5858
    59                 case SlopeAnalysisEnum:
    60                         CreateNodesSlopeCompute(pnodes, iomodel,iomodel_handle);
    61                         CreateConstraintsSlopeCompute(pconstraints,iomodel,iomodel_handle);
    62                         CreateLoadsSlopeCompute(ploads,iomodel,iomodel_handle);
    63                         UpdateElementsSlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
    64                         break;
    65                
    6659                case BedSlopeAnalysisEnum:
    67                         CreateNodesSlopeCompute(pnodes, iomodel,iomodel_handle);
    68                         CreateConstraintsSlopeCompute(pconstraints,iomodel,iomodel_handle);
    69                         CreateLoadsSlopeCompute(ploads,iomodel,iomodel_handle);
    70                         UpdateElementsSlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
     60                        CreateNodesBedSlope(pnodes, iomodel,iomodel_handle);
     61                        CreateConstraintsBedSlope(pconstraints,iomodel,iomodel_handle);
     62                        CreateLoadsBedSlope(ploads,iomodel,iomodel_handle);
     63                        UpdateElementsBedSlope(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
    7164                        break;
    7265
    7366                case SurfaceSlopeAnalysisEnum:
    74                         CreateNodesSlopeCompute(pnodes, iomodel,iomodel_handle);
    75                         CreateConstraintsSlopeCompute(pconstraints,iomodel,iomodel_handle);
    76                         CreateLoadsSlopeCompute(ploads,iomodel,iomodel_handle);
    77                         UpdateElementsSlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
     67                        CreateNodesSurfaceSlope(pnodes, iomodel,iomodel_handle);
     68                        CreateConstraintsSurfaceSlope(pconstraints,iomodel,iomodel_handle);
     69                        CreateLoadsSurfaceSlope(ploads,iomodel,iomodel_handle);
     70                        UpdateElementsSurfaceSlope(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
    7871                        break;
    7972
  • issm/trunk/src/c/solutions/steadystate.cpp

    r4295 r4297  
    3939        BoolParam* param=NULL;
    4040
    41         const int numanalyses=7;
    42         const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
     41        const int numanalyses=8;
     42        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
    4343        const int solution_type=SteadystateSolutionEnum;
    4444
  • issm/trunk/src/c/solutions/transient3d.cpp

    r4295 r4297  
    3535        double   start_init, finish_init;
    3636
    37         const int numanalyses=8;
    38         const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
     37        const int numanalyses=9;
     38        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
    3939        const int solution_type=Transient3DSolutionEnum;
    4040
Note: See TracChangeset for help on using the changeset viewer.