Changeset 24045


Ignore:
Timestamp:
06/24/19 07:46:01 (6 years ago)
Author:
Mathieu Morlighem
Message:

CHG: typo Ismp6 -> Ismip6

Location:
issm/trunk-jpl/src/c
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r23959 r24045  
    109109                        break;
    110110                case BasalforcingsIsmip6Enum:
    111                         iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum);
     111                        iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum);
    112112                        break;
    113113                default:

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

    r24044 r24045  
    180180                        break;
    181181                case BasalforcingsIsmip6Enum:{
    182                         iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum);
    183                         iomodel->FetchDataToInput(elements,"md.basalforcings.melt_anomaly",BasalforcingsIsmp6MeltAnomalyEnum,0.);
     182                        iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum);
     183                        iomodel->FetchDataToInput(elements,"md.basalforcings.melt_anomaly",BasalforcingsIsmip6MeltAnomalyEnum,0.);
    184184                        IssmDouble** array3d = NULL; int* Ms = NULL; int* Ns = NULL; int K;
    185185                        iomodel->FetchData(&array3d,&Ms,&Ns,&K,"md.basalforcings.tf");
    … …  
    189189                                if(iomodel->domaintype!=Domain2DhorizontalEnum && !element->IsOnBase()) continue;
    190190                                for(int kk=0;kk<K;kk++){
    191                                         element->DatasetInputAdd(BasalforcingsIsmp6TfEnum,array3d[kk],iomodel,Ms[kk],Ns[kk],1,BasalforcingsIsmp6TfEnum,7,kk);
     191                                        element->DatasetInputAdd(BasalforcingsIsmip6TfEnum,array3d[kk],iomodel,Ms[kk],Ns[kk],1,BasalforcingsIsmip6TfEnum,7,kk);
    192192                                }
    193193                        }

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

    r23959 r24045  
    784784                                break;
    785785                        case BasalforcingsIsmip6Enum:
    786                                 iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum);
     786                                iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum);
    787787                                break;
    788788                        default:

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

    r23795 r24045  
    136136                        break;
    137137                case BasalforcingsIsmip6Enum:
    138                         iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum);
     138                        iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmip6BasinIdEnum);
    139139                        break;
    140140

  • issm/trunk-jpl/src/c/classes/Elements/Element.cpp

    r24044 r24045  
    21952195
    21962196        /* Get parameters and inputs */
    2197         this->inputs->GetInputValue(&basinid,BasalforcingsIsmp6BasinIdEnum);
    2198         this->parameters->FindParam(&num_basins,BasalforcingsIsmp6NumBasinsEnum);
    2199         this->parameters->FindParam(&gamma0,BasalforcingsIsmp6Gamma0Enum);
    2200         this->parameters->FindParam(&delta_t,&M,BasalforcingsIsmp6DeltaTEnum);    _assert_(M==num_basins);
    2201         this->parameters->FindParam(&islocal,BasalforcingsIsmp6IsLocalEnum);
     2197        this->inputs->GetInputValue(&basinid,BasalforcingsIsmip6BasinIdEnum);
     2198        this->parameters->FindParam(&num_basins,BasalforcingsIsmip6NumBasinsEnum);
     2199        this->parameters->FindParam(&gamma0,BasalforcingsIsmip6Gamma0Enum);
     2200        this->parameters->FindParam(&delta_t,&M,BasalforcingsIsmip6DeltaTEnum);    _assert_(M==num_basins);
     2201        this->parameters->FindParam(&islocal,BasalforcingsIsmip6IsLocalEnum);
    22022202        if(!islocal) {
    2203                 this->parameters->FindParam(&mean_tf,&N,BasalforcingsIsmp6AverageTfEnum); _assert_(N==num_basins);
    2204         }
    2205         Input* tf_input = this->GetInput(BasalforcingsIsmp6TfShelfEnum);              _assert_(tf_input);
    2206         Input* meltanomaly_input = this->GetInput(BasalforcingsIsmp6MeltAnomalyEnum); _assert_(meltanomaly_input);
     2203                this->parameters->FindParam(&mean_tf,&N,BasalforcingsIsmip6AverageTfEnum); _assert_(N==num_basins);
     2204        }
     2205        Input* tf_input = this->GetInput(BasalforcingsIsmip6TfShelfEnum);              _assert_(tf_input);
     2206        Input* meltanomaly_input = this->GetInput(BasalforcingsIsmip6MeltAnomalyEnum); _assert_(meltanomaly_input);
    22072207        delta_t_basin = delta_t[basinid];
    22082208        if(!islocal) mean_tf_basin = mean_tf[basinid];

  • issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

    r24023 r24045  
    7878        IssmDouble* tf_depths = NULL;
    7979
    80         femmodel->parameters->FindParam(&num_basins,BasalforcingsIsmp6NumBasinsEnum);
    81         femmodel->parameters->FindParam(&tf_depths,&num_depths,BasalforcingsIsmp6TfDepthsEnum); _assert_(tf_depths);
    82         femmodel->parameters->FindParam(&islocal,BasalforcingsIsmp6IsLocalEnum);
     80        femmodel->parameters->FindParam(&num_basins,BasalforcingsIsmip6NumBasinsEnum);
     81        femmodel->parameters->FindParam(&tf_depths,&num_depths,BasalforcingsIsmip6TfDepthsEnum); _assert_(tf_depths);
     82        femmodel->parameters->FindParam(&islocal,BasalforcingsIsmip6IsLocalEnum);
    8383
    8484        /*Binary search works for vectors that are sorted in increasing order only, make depths positive*/
    … …  
    9999                        IssmDouble* values = xNewZeroInit<IssmDouble>(numvertices);
    100100                        element->AddInput(BasalforcingsFloatingiceMeltingRateEnum,values,P1Enum);
    101                         element->AddInput(BasalforcingsIsmp6TfShelfEnum,values,P1Enum);
     101                        element->AddInput(BasalforcingsIsmip6TfShelfEnum,values,P1Enum);
    102102                        xDelete<IssmDouble>(values);
    103103                        continue;
    … …  
    107107                IssmDouble* tf_test        = xNew<IssmDouble>(numvertices);
    108108                IssmDouble* depth_vertices = xNew<IssmDouble>(numvertices);
    109                 Input*      tf_input = element->GetInput(BasalforcingsIsmp6TfEnum); _assert_(tf_input);
     109                Input*      tf_input = element->GetInput(BasalforcingsIsmip6TfEnum); _assert_(tf_input);
    110110
    111111                element->GetInputListOnVertices(&depth_vertices[0],BaseEnum);
    … …  
    144144                }
    145145
    146                 element->AddInput(BasalforcingsIsmp6TfShelfEnum,tf_test,P1Enum);
     146                element->AddInput(BasalforcingsIsmip6TfShelfEnum,tf_test,P1Enum);
    147147                xDelete<IssmDouble>(tf_test);
    148148                xDelete<IssmDouble>(depth_vertices);
    … …  
    157157                        /*Spawn basal element if on base to compute element area*/
    158158                        Element* basalelement = element->SpawnBasalElement();
    159                         Input* tf_input=basalelement->GetInput(BasalforcingsIsmp6TfShelfEnum); _assert_(tf_input);
    160                         basalelement->inputs->GetInputValue(&basinid,BasalforcingsIsmp6BasinIdEnum);
     159                        Input* tf_input=basalelement->GetInput(BasalforcingsIsmip6TfShelfEnum); _assert_(tf_input);
     160                        basalelement->inputs->GetInputValue(&basinid,BasalforcingsIsmip6BasinIdEnum);
    161161                        Gauss* gauss=basalelement->NewGauss(1); gauss->GaussPoint(0);
    162162                        tf_input->GetInputValue(&tf,gauss);
    … …  
    176176                /*Compute weighted means and save*/
    177177                for(int k=0;k<num_basins;k++){tf_weighted_avg_cpu[k] = tf_weighted_avg_cpu[k]/areas_summed_cpu[k];}
    178                 femmodel->parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6AverageTfEnum,tf_weighted_avg_cpu,num_basins));
     178                femmodel->parameters->AddObject(new DoubleVecParam(BasalforcingsIsmip6AverageTfEnum,tf_weighted_avg_cpu,num_basins));
    179179        }
    180180

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

    r23936 r24045  
    236236                        break;
    237237                case BasalforcingsIsmip6Enum:
    238                         parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsIsmp6NumBasinsEnum));
    239                         parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_0",BasalforcingsIsmp6Gamma0Enum));
    240                    parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.islocal",BasalforcingsIsmp6IsLocalEnum));       
     238                        parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsIsmip6NumBasinsEnum));
     239                        parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_0",BasalforcingsIsmip6Gamma0Enum));
     240                   parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.islocal",BasalforcingsIsmip6IsLocalEnum));       
    241241                        iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.delta_t");
    242                         parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6DeltaTEnum,transparam,N));
     242                        parameters->AddObject(new DoubleVecParam(BasalforcingsIsmip6DeltaTEnum,transparam,N));
    243243                        xDelete<IssmDouble>(transparam);
    244244                        iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.tf_depths");
    245                         parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6TfDepthsEnum,transparam,N));
     245                        parameters->AddObject(new DoubleVecParam(BasalforcingsIsmip6TfDepthsEnum,transparam,N));
    246246                        xDelete<IssmDouble>(transparam);
    247247                        break;

  • issm/trunk-jpl/src/c/shared/Enum/Enum.vim

    r24044 r24045  
    6969syn keyword cConstant BasalforcingsDtbgEnum
    7070syn keyword cConstant BasalforcingsEnum
    71 syn keyword cConstant BasalforcingsIsmp6AverageTfEnum
    72 syn keyword cConstant BasalforcingsIsmp6BasinAreaEnum
    73 syn keyword cConstant BasalforcingsIsmp6DeltaTEnum
    74 syn keyword cConstant BasalforcingsIsmp6Gamma0Enum
    75 syn keyword cConstant BasalforcingsIsmp6IsLocalEnum
    76 syn keyword cConstant BasalforcingsIsmp6NumBasinsEnum
    77 syn keyword cConstant BasalforcingsIsmp6TfDepthsEnum
     71syn keyword cConstant BasalforcingsIsmip6AverageTfEnum
     72syn keyword cConstant BasalforcingsIsmip6BasinAreaEnum
     73syn keyword cConstant BasalforcingsIsmip6DeltaTEnum
     74syn keyword cConstant BasalforcingsIsmip6Gamma0Enum
     75syn keyword cConstant BasalforcingsIsmip6IsLocalEnum
     76syn keyword cConstant BasalforcingsIsmip6NumBasinsEnum
     77syn keyword cConstant BasalforcingsIsmip6TfDepthsEnum
    7878syn keyword cConstant BasalforcingsLowercrustheatEnum
    7979syn keyword cConstant BasalforcingsMantleconductivityEnum
    … …  
    454454syn keyword cConstant BasalforcingsGeothermalfluxEnum
    455455syn keyword cConstant BasalforcingsGroundediceMeltingRateEnum
    456 syn keyword cConstant BasalforcingsIsmp6BasinIdEnum
    457 syn keyword cConstant BasalforcingsIsmp6TfEnum
    458 syn keyword cConstant BasalforcingsIsmp6TfShelfEnum
    459 syn keyword cConstant BasalforcingsIsmp6MeltAnomalyEnum
     456syn keyword cConstant BasalforcingsIsmip6BasinIdEnum
     457syn keyword cConstant BasalforcingsIsmip6TfEnum
     458syn keyword cConstant BasalforcingsIsmip6TfShelfEnum
     459syn keyword cConstant BasalforcingsIsmip6MeltAnomalyEnum
    460460syn keyword cConstant BasalforcingsPicoBasinIdEnum
    461461syn keyword cConstant BasalforcingsPicoBoxIdEnum

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r24044 r24045  
    6363        BasalforcingsDtbgEnum,
    6464        BasalforcingsEnum,
    65         BasalforcingsIsmp6AverageTfEnum,
    66         BasalforcingsIsmp6BasinAreaEnum,
    67         BasalforcingsIsmp6DeltaTEnum,
    68         BasalforcingsIsmp6Gamma0Enum,
    69         BasalforcingsIsmp6IsLocalEnum,
    70         BasalforcingsIsmp6NumBasinsEnum,
    71         BasalforcingsIsmp6TfDepthsEnum,
     65        BasalforcingsIsmip6AverageTfEnum,
     66        BasalforcingsIsmip6BasinAreaEnum,
     67        BasalforcingsIsmip6DeltaTEnum,
     68        BasalforcingsIsmip6Gamma0Enum,
     69        BasalforcingsIsmip6IsLocalEnum,
     70        BasalforcingsIsmip6NumBasinsEnum,
     71        BasalforcingsIsmip6TfDepthsEnum,
    7272        BasalforcingsLowercrustheatEnum,
    7373        BasalforcingsMantleconductivityEnum,
    … …  
    450450        BasalforcingsGeothermalfluxEnum,
    451451        BasalforcingsGroundediceMeltingRateEnum,
    452         BasalforcingsIsmp6BasinIdEnum,
    453         BasalforcingsIsmp6TfEnum,
    454         BasalforcingsIsmp6TfShelfEnum,
    455         BasalforcingsIsmp6MeltAnomalyEnum,
     452        BasalforcingsIsmip6BasinIdEnum,
     453        BasalforcingsIsmip6TfEnum,
     454        BasalforcingsIsmip6TfShelfEnum,
     455        BasalforcingsIsmip6MeltAnomalyEnum,
    456456        BasalforcingsPicoBasinIdEnum,
    457457        BasalforcingsPicoBoxIdEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r24044 r24045  
    7171                case BasalforcingsDtbgEnum : return "BasalforcingsDtbg";
    7272                case BasalforcingsEnum : return "Basalforcings";
    73                 case BasalforcingsIsmp6AverageTfEnum : return "BasalforcingsIsmp6AverageTf";
    74                 case BasalforcingsIsmp6BasinAreaEnum : return "BasalforcingsIsmp6BasinArea";
    75                 case BasalforcingsIsmp6DeltaTEnum : return "BasalforcingsIsmp6DeltaT";
    76                 case BasalforcingsIsmp6Gamma0Enum : return "BasalforcingsIsmp6Gamma0";
    77                 case BasalforcingsIsmp6IsLocalEnum : return "BasalforcingsIsmp6IsLocal";
    78                 case BasalforcingsIsmp6NumBasinsEnum : return "BasalforcingsIsmp6NumBasins";
    79                 case BasalforcingsIsmp6TfDepthsEnum : return "BasalforcingsIsmp6TfDepths";
     73                case BasalforcingsIsmip6AverageTfEnum : return "BasalforcingsIsmip6AverageTf";
     74                case BasalforcingsIsmip6BasinAreaEnum : return "BasalforcingsIsmip6BasinArea";
     75                case BasalforcingsIsmip6DeltaTEnum : return "BasalforcingsIsmip6DeltaT";
     76                case BasalforcingsIsmip6Gamma0Enum : return "BasalforcingsIsmip6Gamma0";
     77                case BasalforcingsIsmip6IsLocalEnum : return "BasalforcingsIsmip6IsLocal";
     78                case BasalforcingsIsmip6NumBasinsEnum : return "BasalforcingsIsmip6NumBasins";
     79                case BasalforcingsIsmip6TfDepthsEnum : return "BasalforcingsIsmip6TfDepths";
    8080                case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat";
    8181                case BasalforcingsMantleconductivityEnum : return "BasalforcingsMantleconductivity";
    … …  
    456456                case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
    457457                case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate";
    458                 case BasalforcingsIsmp6BasinIdEnum : return "BasalforcingsIsmp6BasinId";
    459                 case BasalforcingsIsmp6TfEnum : return "BasalforcingsIsmp6Tf";
    460                 case BasalforcingsIsmp6TfShelfEnum : return "BasalforcingsIsmp6TfShelf";
    461                 case BasalforcingsIsmp6MeltAnomalyEnum : return "BasalforcingsIsmp6MeltAnomaly";
     458                case BasalforcingsIsmip6BasinIdEnum : return "BasalforcingsIsmip6BasinId";
     459                case BasalforcingsIsmip6TfEnum : return "BasalforcingsIsmip6Tf";
     460                case BasalforcingsIsmip6TfShelfEnum : return "BasalforcingsIsmip6TfShelf";
     461                case BasalforcingsIsmip6MeltAnomalyEnum : return "BasalforcingsIsmip6MeltAnomaly";
    462462                case BasalforcingsPicoBasinIdEnum : return "BasalforcingsPicoBasinId";
    463463                case BasalforcingsPicoBoxIdEnum : return "BasalforcingsPicoBoxId";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r24044 r24045  
    7171              else if (strcmp(name,"BasalforcingsDtbg")==0) return BasalforcingsDtbgEnum;
    7272              else if (strcmp(name,"Basalforcings")==0) return BasalforcingsEnum;
    73               else if (strcmp(name,"BasalforcingsIsmp6AverageTf")==0) return BasalforcingsIsmp6AverageTfEnum;
    74               else if (strcmp(name,"BasalforcingsIsmp6BasinArea")==0) return BasalforcingsIsmp6BasinAreaEnum;
    75               else if (strcmp(name,"BasalforcingsIsmp6DeltaT")==0) return BasalforcingsIsmp6DeltaTEnum;
    76               else if (strcmp(name,"BasalforcingsIsmp6Gamma0")==0) return BasalforcingsIsmp6Gamma0Enum;
    77               else if (strcmp(name,"BasalforcingsIsmp6IsLocal")==0) return BasalforcingsIsmp6IsLocalEnum;
    78               else if (strcmp(name,"BasalforcingsIsmp6NumBasins")==0) return BasalforcingsIsmp6NumBasinsEnum;
    79               else if (strcmp(name,"BasalforcingsIsmp6TfDepths")==0) return BasalforcingsIsmp6TfDepthsEnum;
     73              else if (strcmp(name,"BasalforcingsIsmip6AverageTf")==0) return BasalforcingsIsmip6AverageTfEnum;
     74              else if (strcmp(name,"BasalforcingsIsmip6BasinArea")==0) return BasalforcingsIsmip6BasinAreaEnum;
     75              else if (strcmp(name,"BasalforcingsIsmip6DeltaT")==0) return BasalforcingsIsmip6DeltaTEnum;
     76              else if (strcmp(name,"BasalforcingsIsmip6Gamma0")==0) return BasalforcingsIsmip6Gamma0Enum;
     77              else if (strcmp(name,"BasalforcingsIsmip6IsLocal")==0) return BasalforcingsIsmip6IsLocalEnum;
     78              else if (strcmp(name,"BasalforcingsIsmip6NumBasins")==0) return BasalforcingsIsmip6NumBasinsEnum;
     79              else if (strcmp(name,"BasalforcingsIsmip6TfDepths")==0) return BasalforcingsIsmip6TfDepthsEnum;
    8080              else if (strcmp(name,"BasalforcingsLowercrustheat")==0) return BasalforcingsLowercrustheatEnum;
    8181              else if (strcmp(name,"BasalforcingsMantleconductivity")==0) return BasalforcingsMantleconductivityEnum;
    … …  
    465465              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    466466              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
    467               else if (strcmp(name,"BasalforcingsIsmp6BasinId")==0) return BasalforcingsIsmp6BasinIdEnum;
    468               else if (strcmp(name,"BasalforcingsIsmp6Tf")==0) return BasalforcingsIsmp6TfEnum;
    469               else if (strcmp(name,"BasalforcingsIsmp6TfShelf")==0) return BasalforcingsIsmp6TfShelfEnum;
    470               else if (strcmp(name,"BasalforcingsIsmp6MeltAnomaly")==0) return BasalforcingsIsmp6MeltAnomalyEnum;
     467              else if (strcmp(name,"BasalforcingsIsmip6BasinId")==0) return BasalforcingsIsmip6BasinIdEnum;
     468              else if (strcmp(name,"BasalforcingsIsmip6Tf")==0) return BasalforcingsIsmip6TfEnum;
     469              else if (strcmp(name,"BasalforcingsIsmip6TfShelf")==0) return BasalforcingsIsmip6TfShelfEnum;
     470              else if (strcmp(name,"BasalforcingsIsmip6MeltAnomaly")==0) return BasalforcingsIsmip6MeltAnomalyEnum;
    471471              else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
    472472              else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
    … …  
    506506              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
    507507              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
    508               else if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum;
    509508         else stage=5;
    510509   }
    511510   if(stage==5){
    512               if (strcmp(name,"DeviatoricStress2")==0) return DeviatoricStress2Enum;
     511              if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum;
     512              else if (strcmp(name,"DeviatoricStress2")==0) return DeviatoricStress2Enum;
    513513              else if (strcmp(name,"DistanceToCalvingfront")==0) return DistanceToCalvingfrontEnum;
    514514              else if (strcmp(name,"DistanceToGroundingline")==0) return DistanceToGroundinglineEnum;
    … …  
    629629              else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
    630630              else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
    631               else if (strcmp(name,"Node")==0) return NodeEnum;
    632631         else stage=6;
    633632   }
    634633   if(stage==6){
    635               if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum;
     634              if (strcmp(name,"Node")==0) return NodeEnum;
     635              else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum;
    636636              else if (strcmp(name,"P0")==0) return P0Enum;
    637637              else if (strcmp(name,"P1")==0) return P1Enum;
    … …  
    752752              else if (strcmp(name,"SmbW")==0) return SmbWEnum;
    753753              else if (strcmp(name,"SmbWini")==0) return SmbWiniEnum;
    754               else if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum;
    755754         else stage=7;
    756755   }
    757756   if(stage==7){
    758               if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum;
     757              if (strcmp(name,"SmbZMax")==0) return SmbZMaxEnum;
     758              else if (strcmp(name,"SmbZMin")==0) return SmbZMinEnum;
    759759              else if (strcmp(name,"SmbZTop")==0) return SmbZTopEnum;
    760760              else if (strcmp(name,"SmbZY")==0) return SmbZYEnum;
    … …  
    875875              else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
    876876              else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
    877               else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
    878877         else stage=8;
    879878   }
    880879   if(stage==8){
    881               if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
     880              if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
     881              else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
    882882              else if (strcmp(name,"Outputdefinition63")==0) return Outputdefinition63Enum;
    883883              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    … …  
    998998              else if (strcmp(name,"Element")==0) return ElementEnum;
    999999              else if (strcmp(name,"ElementHook")==0) return ElementHookEnum;
    1000               else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
    10011000         else stage=9;
    10021001   }
    10031002   if(stage==9){
    1004               if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
     1003              if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
     1004              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    10051005              else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
    10061006              else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
    … …  
    11211121              else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
    11221122              else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
    1123               else if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
    11241123         else stage=10;
    11251124   }
    11261125   if(stage==10){
    1127               if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
     1126              if (strcmp(name,"MaxVel")==0) return MaxVelEnum;
     1127              else if (strcmp(name,"MaxVx")==0) return MaxVxEnum;
    11281128              else if (strcmp(name,"MaxVy")==0) return MaxVyEnum;
    11291129              else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    … …  
    12441244              else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
    12451245              else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
    1246               else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
    12471246         else stage=11;
    12481247   }
    12491248   if(stage==11){
    1250               if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
     1249              if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
     1250              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
    12511251              else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum;
    12521252              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
Note: See TracChangeset for help on using the changeset viewer.