Ignore:
Timestamp:
08/02/16 17:06:46 (9 years ago)
Author:
agscott1
Message:

CHG: Replaced Enums with Strings in matlab and python. Updated corresponding cpp code.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

    r20381 r21049  
    4444%      [analyses]=AnalysisConfiguration(solutiontype);
    4545
    46 switch solutiontype,
    47 
    48         case StressbalanceSolutionEnum(),
    49                 analyses=[StressbalanceAnalysisEnum();StressbalanceVerticalAnalysisEnum();StressbalanceSIAAnalysisEnum();L2ProjectionBaseAnalysisEnum()];
    50 
    51         case SteadystateSolutionEnum(),
    52                 analyses=[StressbalanceAnalysisEnum();StressbalanceVerticalAnalysisEnum();StressbalanceSIAAnalysisEnum();L2ProjectionBaseAnalysisEnum();ThermalAnalysisEnum();MeltingAnalysisEnum();EnthalpyAnalysisEnum()];
    53 
    54         case ThermalSolutionEnum(),
    55                 analyses=[EnthalpyAnalysisEnum;ThermalAnalysisEnum();MeltingAnalysisEnum()];
    56 
    57         case MasstransportSolutionEnum(),
    58                 analyses=[MasstransportAnalysisEnum()];
    59 
    60         case BalancethicknessSolutionEnum(),
    61                 analyses=[BalancethicknessAnalysisEnum()];
    62 
    63         case Balancethickness2SolutionEnum(),
    64                 analyses=[Balancethickness2AnalysisEnum()];
    65 
    66         case BalancethicknessSoftSolutionEnum(),
    67                 analyses=[BalancethicknessAnalysisEnum()];
    68 
    69         case BalancevelocitySolutionEnum(),
    70                 analyses=[BalancevelocityAnalysisEnum()];
    71 
    72         case SurfaceSlopeSolutionEnum(),
    73                 analyses=[L2ProjectionBaseAnalysisEnum()];
    74 
    75         case BedSlopeSolutionEnum(),
    76                 analyses=[L2ProjectionBaseAnalysisEnum()];
    77 
    78         case GiaSolutionEnum(),
    79                 analyses=[GiaAnalysisEnum()];
    80 
    81         case TransientSolutionEnum(),
    82                 analyses=[StressbalanceAnalysisEnum();StressbalanceVerticalAnalysisEnum();StressbalanceSIAAnalysisEnum();L2ProjectionBaseAnalysisEnum();ThermalAnalysisEnum();MeltingAnalysisEnum();EnthalpyAnalysisEnum();MasstransportAnalysisEnum();HydrologySommersAnalysisEnum];
    83 
    84         case FlaimSolutionEnum(),
    85                 analyses=[FlaimAnalysisEnum()];
    86 
    87         case SealevelriseSolutionEnum(),
    88                 analyses=[SealevelriseAnalysisEnum()];
    89 
    90         case HydrologySolutionEnum(),
    91                 analyses=[L2ProjectionBaseAnalysisEnum();HydrologyShreveAnalysisEnum();HydrologyDCInefficientAnalysisEnum();HydrologyDCEfficientAnalysisEnum()];
    92        
    93         case DamageEvolutionSolutionEnum(),
    94                 analyses=[DamageEvolutionAnalysisEnum()];
    95 
    96         otherwise
    97                 error('%s%s%s',' solution type: ',EnumToString(solutiontype),' not supported yet!');
    98 
     46        if strcmp(solutiontype,'StressbalanceSolution')
     47                analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis'};
     48        elseif strcmp(solutiontype,'SteadystateSolution')
     49                analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis'};
     50        elseif strcmp(solutiontype,'ThermalSolution')
     51                analyses={'EnthalpyAnalysis','ThermalAnalysis','MeltingAnalysis'};
     52        elseif strcmp(solutiontype,'MasstransportSolution')
     53                analyses={'MasstransportAnalysis'};
     54        elseif strcmp(solutiontype,'BalancethicknessSolution')
     55                analyses={'BalancethicknessAnalysis'};
     56        elseif strcmp(solutiontype,'Balancethickness2Solution')
     57                analyses={'Balancethickness2Analysis'};
     58        elseif strcmp(solutiontype,'BalancethicknessSoftSolution')
     59                analyses={'BalancethicknessAnalysis'};
     60        elseif strcmp(solutiontype,'BalancevelocitySolution')
     61                analyses={'BalancevelocityAnalysis'};
     62        elseif strcmp(solutiontype,'SurfaceSlopeSolution')
     63                analyses={'L2ProjectionBaseAnalysis'};
     64        elseif strcmp(solutiontype,'BedSlopeSolution')
     65                analyses={'L2ProjectionBaseAnalysis'};
     66        elseif strcmp(solutiontype,'GiaSolution')
     67                analyses={'GiaAnalysis'};
     68        elseif strcmp(solutiontype,'TransientSolution')
     69                analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis'};
     70        elseif strcmp(solutiontype,'FlaimSolution')
     71                analyses={'FlaimAnalysis'};
     72        elseif strcmp(solutiontype,'SealevelriseSolution')
     73                analyses={'SealevelriseAnalysis'};
     74        elseif strcmp(solutiontype,'HydrologySolution')
     75                analyses={'L2ProjectionBaseAnalysis','HydrologyShreveAnalysis','HydrologyDCInefficientAnalysis','HydrologyDCEfficientAnalysis'};
     76        elseif strcmp(solutiontype,'DamageEvolutionSolution')
     77                analyses={'DamageEvolutionAnalysis'};
     78        else
     79                error(' solution type: %s' , solutiontype, ' not supported yet!');
    9980        end
    10081end % }}}
Note: See TracChangeset for help on using the changeset viewer.