Changeset 24548


Ignore:
Timestamp:
02/05/20 10:22:07 (5 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added perturbation to linear melt

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

Legend:

Unmodified
Added
Removed

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

    r24479 r24548  
    168168                        break;
    169169                case LinearFloatingMeltRateEnum:
     170                        iomodel->FetchDataToInput(inputs2,elements,"md.basalforcings.perturbation_melting_rate",BasalforcingsPerturbationMeltingRateEnum,0.);
    170171                        break;
    171172                case MismipFloatingMeltRateEnum:

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

    r24505 r24548  
    463463syn keyword cConstant BasalforcingsGeothermalfluxEnum
    464464syn keyword cConstant BasalforcingsGroundediceMeltingRateEnum
     465syn keyword cConstant BasalforcingsPerturbationMeltingRateEnum
    465466syn keyword cConstant BasalforcingsIsmip6BasinIdEnum
    466467syn keyword cConstant BasalforcingsIsmip6TfEnum
    … …  
    13321333syn keyword cType Cfsurfacesquare
    13331334syn keyword cType Channel
     1335syn keyword cType classes
    13341336syn keyword cType Constraint
    13351337syn keyword cType Constraints
    … …  
    13381340syn keyword cType ControlInput2
    13391341syn keyword cType Covertree
     1342syn keyword cType DatasetInput2
    13401343syn keyword cType DataSetParam
    1341 syn keyword cType DatasetInput2
    13421344syn keyword cType Definition
    13431345syn keyword cType DependentObject
    … …  
    13511353syn keyword cType ElementInput2
    13521354syn keyword cType ElementMatrix
     1355syn keyword cType Elements
    13531356syn keyword cType ElementVector
    1354 syn keyword cType Elements
    13551357syn keyword cType ExponentialVariogram
    13561358syn keyword cType ExternalResult
    … …  
    13591361syn keyword cType Friction
    13601362syn keyword cType Gauss
     1363syn keyword cType GaussianVariogram
     1364syn keyword cType gaussobjects
    13611365syn keyword cType GaussPenta
    13621366syn keyword cType GaussSeg
    13631367syn keyword cType GaussTetra
    13641368syn keyword cType GaussTria
    1365 syn keyword cType GaussianVariogram
    13661369syn keyword cType GenericExternalResult
    13671370syn keyword cType GenericOption
    … …  
    13781381syn keyword cType IssmDirectApplicInterface
    13791382syn keyword cType IssmParallelDirectApplicInterface
     1383syn keyword cType krigingobjects
    13801384syn keyword cType Load
    13811385syn keyword cType Loads
    … …  
    13881392syn keyword cType Matice
    13891393syn keyword cType Matlitho
     1394syn keyword cType matrixobjects
    13901395syn keyword cType MatrixParam
    13911396syn keyword cType Misfit
    … …  
    14001405syn keyword cType Observations
    14011406syn keyword cType Option
     1407syn keyword cType Options
    14021408syn keyword cType OptionUtilities
    1403 syn keyword cType Options
    14041409syn keyword cType Param
    14051410syn keyword cType Parameters
    … …  
    14151420syn keyword cType Regionaloutput
    14161421syn keyword cType Results
     1422syn keyword cType Riftfront
    14171423syn keyword cType RiftStruct
    1418 syn keyword cType Riftfront
    14191424syn keyword cType Seg
    14201425syn keyword cType SegInput2
     1426syn keyword cType Segment
    14211427syn keyword cType SegRef
    1422 syn keyword cType Segment
    14231428syn keyword cType SpcDynamic
    14241429syn keyword cType SpcStatic
    … …  
    14391444syn keyword cType Vertex
    14401445syn keyword cType Vertices
    1441 syn keyword cType classes
    1442 syn keyword cType gaussobjects
    1443 syn keyword cType krigingobjects
    1444 syn keyword cType matrixobjects
    14451446syn keyword cType AdjointBalancethickness2Analysis
    14461447syn keyword cType AdjointBalancethicknessAnalysis
    … …  
    14611462syn keyword cType FreeSurfaceBaseAnalysis
    14621463syn keyword cType FreeSurfaceTopAnalysis
     1464syn keyword cType GiaIvinsAnalysis
    14631465syn keyword cType GLheightadvectionAnalysis
    1464 syn keyword cType GiaIvinsAnalysis
    14651466syn keyword cType HydrologyDCEfficientAnalysis
    14661467syn keyword cType HydrologyDCInefficientAnalysis

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

    r24505 r24548  
    459459        BasalforcingsGeothermalfluxEnum,
    460460        BasalforcingsGroundediceMeltingRateEnum,
     461        BasalforcingsPerturbationMeltingRateEnum,
    461462        BasalforcingsIsmip6BasinIdEnum,
    462463        BasalforcingsIsmip6TfEnum,

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

    r24505 r24548  
    465465                case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
    466466                case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate";
     467                case BasalforcingsPerturbationMeltingRateEnum : return "BasalforcingsPerturbationMeltingRate";
    467468                case BasalforcingsIsmip6BasinIdEnum : return "BasalforcingsIsmip6BasinId";
    468469                case BasalforcingsIsmip6TfEnum : return "BasalforcingsIsmip6Tf";

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

    r24505 r24548  
    474474              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    475475              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
     476              else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum;
    476477              else if (strcmp(name,"BasalforcingsIsmip6BasinId")==0) return BasalforcingsIsmip6BasinIdEnum;
    477478              else if (strcmp(name,"BasalforcingsIsmip6Tf")==0) return BasalforcingsIsmip6TfEnum;
    … …  
    505506              else if (strcmp(name,"Calvingratex")==0) return CalvingratexEnum;
    506507              else if (strcmp(name,"CalvingrateyAverage")==0) return CalvingrateyAverageEnum;
    507               else if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"CalvingFluxLevelset")==0) return CalvingFluxLevelsetEnum;
     511              if (strcmp(name,"Calvingratey")==0) return CalvingrateyEnum;
     512              else if (strcmp(name,"CalvingFluxLevelset")==0) return CalvingFluxLevelsetEnum;
    512513              else if (strcmp(name,"CalvingMeltingFluxLevelset")==0) return CalvingMeltingFluxLevelsetEnum;
    513514              else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    … …  
    628629              else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
    629630              else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
    630               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
     634              if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
     635              else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
    635636              else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
    636637              else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
    … …  
    751752              else if (strcmp(name,"SmbMelt")==0) return SmbMeltEnum;
    752753              else if (strcmp(name,"SmbMonthlytemperatures")==0) return SmbMonthlytemperaturesEnum;
    753               else if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum;
     757              if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum;
     758              else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum;
    758759              else if (strcmp(name,"SmbPAir")==0) return SmbPAirEnum;
    759760              else if (strcmp(name,"SmbP")==0) return SmbPEnum;
    … …  
    874875              else if (strcmp(name,"Outputdefinition22")==0) return Outputdefinition22Enum;
    875876              else if (strcmp(name,"Outputdefinition23")==0) return Outputdefinition23Enum;
    876               else if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Outputdefinition25")==0) return Outputdefinition25Enum;
     880              if (strcmp(name,"Outputdefinition24")==0) return Outputdefinition24Enum;
     881              else if (strcmp(name,"Outputdefinition25")==0) return Outputdefinition25Enum;
    881882              else if (strcmp(name,"Outputdefinition26")==0) return Outputdefinition26Enum;
    882883              else if (strcmp(name,"Outputdefinition27")==0) return Outputdefinition27Enum;
    … …  
    997998              else if (strcmp(name,"CalvingDev2")==0) return CalvingDev2Enum;
    998999              else if (strcmp(name,"CalvingHab")==0) return CalvingHabEnum;
    999               else if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum;
     1003              if (strcmp(name,"CalvingLevermann")==0) return CalvingLevermannEnum;
     1004              else if (strcmp(name,"CalvingVonmises")==0) return CalvingVonmisesEnum;
    10041005              else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum;
    10051006              else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum;
    … …  
    11201121              else if (strcmp(name,"IntInput")==0) return IntInputEnum;
    11211122              else if (strcmp(name,"ElementInput2")==0) return ElementInput2Enum;
    1122               else if (strcmp(name,"SegInput2")==0) return SegInput2Enum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"TriaInput2")==0) return TriaInput2Enum;
     1126              if (strcmp(name,"SegInput2")==0) return SegInput2Enum;
     1127              else if (strcmp(name,"TriaInput2")==0) return TriaInput2Enum;
    11271128              else if (strcmp(name,"PentaInput2")==0) return PentaInput2Enum;
    11281129              else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum;
    … …  
    12431244              else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
    12441245              else if (strcmp(name,"SMBd18opdd")==0) return SMBd18opddEnum;
    1245               else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
     1249              if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
     1250              else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
    12501251              else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
    12511252              else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum;
Note: See TracChangeset for help on using the changeset viewer.