Ignore:
Timestamp:
10/13/22 15:01:31 (2 years ago)
Author:
caronlam
Message:

CHG: sea-level change core optimization (runtime and memory use). NEW: love number core, added support for parallelization, quad precision and EBM rheology. CHG: class fourierlove renamed to just love

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r27298 r27308  
    326326              else if (strcmp(name,"LoveMinIntegrationSteps")==0) return LoveMinIntegrationStepsEnum;
    327327              else if (strcmp(name,"LoveMaxIntegrationdr")==0) return LoveMaxIntegrationdrEnum;
     328              else if (strcmp(name,"LoveIntegrationScheme")==0) return LoveIntegrationSchemeEnum;
    328329              else if (strcmp(name,"LoveKernels")==0) return LoveKernelsEnum;
    329330              else if (strcmp(name,"LoveMu0")==0) return LoveMu0Enum;
    … …  
    382383              else if (strcmp(name,"OutputBufferSizePointer")==0) return OutputBufferSizePointerEnum;
    383384              else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
    384               else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
     388              if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
     389              else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
    389390              else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
    390391              else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
    … …  
    505506              else if (strcmp(name,"SmbAdThresh")==0) return SmbAdThreshEnum;
    506507              else if (strcmp(name,"SmbARMAInitialTime")==0) return SmbARMAInitialTimeEnum;
    507               else if (strcmp(name,"SmbARMATimestep")==0) return SmbARMATimestepEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SmbARMAarOrder")==0) return SmbARMAarOrderEnum;
     511              if (strcmp(name,"SmbARMATimestep")==0) return SmbARMATimestepEnum;
     512              else if (strcmp(name,"SmbARMAarOrder")==0) return SmbARMAarOrderEnum;
    512513              else if (strcmp(name,"SmbARMAmaOrder")==0) return SmbARMAmaOrderEnum;
    513514              else if (strcmp(name,"SmbAveraging")==0) return SmbAveragingEnum;
    … …  
    628629              else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
    629630              else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum;
    630               else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"TransientIsoceantransport")==0) return TransientIsoceantransportEnum;
     634              if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
     635              else if (strcmp(name,"TransientIsoceantransport")==0) return TransientIsoceantransportEnum;
    635636              else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
    636637              else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
    … …  
    751752              else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum;
    752753              else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum;
    753               else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
     757              if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
     758              else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
    758759              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
    759760              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
    … …  
    874875              else if (strcmp(name,"MasstransportSpcthickness")==0) return MasstransportSpcthicknessEnum;
    875876              else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum;
    876               else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"MaterialsRheologyE")==0) return MaterialsRheologyEEnum;
     880              if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum;
     881              else if (strcmp(name,"MaterialsRheologyE")==0) return MaterialsRheologyEEnum;
    881882              else if (strcmp(name,"MaterialsRheologyEbar")==0) return MaterialsRheologyEbarEnum;
    882883              else if (strcmp(name,"MaterialsRheologyEc")==0) return MaterialsRheologyEcEnum;
    … …  
    962963              else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
    963964              else if (strcmp(name,"SealevelchangeIndices")==0) return SealevelchangeIndicesEnum;
     965              else if (strcmp(name,"SealevelchangeConvolutionVertices")==0) return SealevelchangeConvolutionVerticesEnum;
    964966              else if (strcmp(name,"SealevelchangeAlphaIndex")==0) return SealevelchangeAlphaIndexEnum;
    965967              else if (strcmp(name,"SealevelchangeAzimuthIndex")==0) return SealevelchangeAzimuthIndexEnum;
    … …  
    980982              else if (strcmp(name,"SealevelchangeViscousN")==0) return SealevelchangeViscousNEnum;
    981983              else if (strcmp(name,"SealevelchangeViscousE")==0) return SealevelchangeViscousEEnum;
     984              else if (strcmp(name,"CouplingTransferCount")==0) return CouplingTransferCountEnum;
    982985              else if (strcmp(name,"SedimentHead")==0) return SedimentHeadEnum;
    983986              else if (strcmp(name,"SedimentHeadOld")==0) return SedimentHeadOldEnum;
    … …  
    995998              else if (strcmp(name,"SmbAccumulatedRefreeze")==0) return SmbAccumulatedRefreezeEnum;
    996999              else if (strcmp(name,"SmbAccumulatedRunoff")==0) return SmbAccumulatedRunoffEnum;
    997               else if (strcmp(name,"SmbA")==0) return SmbAEnum;
    998               else if (strcmp(name,"SmbAdiff")==0) return SmbAdiffEnum;
    999               else if (strcmp(name,"SmbAValue")==0) return SmbAValueEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
     1003              if (strcmp(name,"SmbA")==0) return SmbAEnum;
     1004              else if (strcmp(name,"SmbAdiff")==0) return SmbAdiffEnum;
     1005              else if (strcmp(name,"SmbAValue")==0) return SmbAValueEnum;
     1006              else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
    10041007              else if (strcmp(name,"SmbAdiffini")==0) return SmbAdiffiniEnum;
    10051008              else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum;
    … …  
    11181121              else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
    11191122              else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
    1120               else if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;
    1121               else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
    1122               else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
     1126              if (strcmp(name,"StressMaxPrincipal")==0) return StressMaxPrincipalEnum;
     1127              else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
     1128              else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
     1129              else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    11271130              else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
    11281131              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    … …  
    12411244              else if (strcmp(name,"Outputdefinition51")==0) return Outputdefinition51Enum;
    12421245              else if (strcmp(name,"Outputdefinition52")==0) return Outputdefinition52Enum;
    1243               else if (strcmp(name,"Outputdefinition53")==0) return Outputdefinition53Enum;
    1244               else if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum;
    1245               else if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
     1249              if (strcmp(name,"Outputdefinition53")==0) return Outputdefinition53Enum;
     1250              else if (strcmp(name,"Outputdefinition54")==0) return Outputdefinition54Enum;
     1251              else if (strcmp(name,"Outputdefinition55")==0) return Outputdefinition55Enum;
     1252              else if (strcmp(name,"Outputdefinition56")==0) return Outputdefinition56Enum;
    12501253              else if (strcmp(name,"Outputdefinition57")==0) return Outputdefinition57Enum;
    12511254              else if (strcmp(name,"Outputdefinition58")==0) return Outputdefinition58Enum;
    … …  
    13641367              else if (strcmp(name,"DataSetParam")==0) return DataSetParamEnum;
    13651368              else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum;
    1366               else if (strcmp(name,"DebrisAnalysis")==0) return DebrisAnalysisEnum;
    1367               else if (strcmp(name,"DebrisSolution")==0) return DebrisSolutionEnum;
    1368               else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
    13691369         else stage=12;
    13701370   }
    13711371   if(stage==12){
    1372               if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
     1372              if (strcmp(name,"DebrisAnalysis")==0) return DebrisAnalysisEnum;
     1373              else if (strcmp(name,"DebrisSolution")==0) return DebrisSolutionEnum;
     1374              else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
     1375              else if (strcmp(name,"DefaultCalving")==0) return DefaultCalvingEnum;
    13731376              else if (strcmp(name,"Dense")==0) return DenseEnum;
    13741377              else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum;
    … …  
    14871490              else if (strcmp(name,"LoveHf")==0) return LoveHfEnum;
    14881491              else if (strcmp(name,"LoveHt")==0) return LoveHtEnum;
    1489               else if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
    1490               else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
    1491               else if (strcmp(name,"LoveKf")==0) return LoveKfEnum;
    14921492         else stage=13;
    14931493   }
    14941494   if(stage==13){
    1495               if (strcmp(name,"LoveKt")==0) return LoveKtEnum;
     1495              if (strcmp(name,"LoveKernelsImag")==0) return LoveKernelsImagEnum;
     1496              else if (strcmp(name,"LoveKernelsReal")==0) return LoveKernelsRealEnum;
     1497              else if (strcmp(name,"LoveKf")==0) return LoveKfEnum;
     1498              else if (strcmp(name,"LoveKt")==0) return LoveKtEnum;
    14961499              else if (strcmp(name,"LoveLf")==0) return LoveLfEnum;
    14971500              else if (strcmp(name,"LoveLt")==0) return LoveLtEnum;
    … …  
    16101613              else if (strcmp(name,"SMBsemic")==0) return SMBsemicEnum;
    16111614              else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
    1612               else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
    1613               else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
    1614               else if (strcmp(name,"Scaled")==0) return ScaledEnum;
    16151615         else stage=14;
    16161616   }
    16171617   if(stage==14){
    1618               if (strcmp(name,"SealevelAbsolute")==0) return SealevelAbsoluteEnum;
     1618              if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
     1619              else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
     1620              else if (strcmp(name,"Scaled")==0) return ScaledEnum;
     1621              else if (strcmp(name,"SealevelAbsolute")==0) return SealevelAbsoluteEnum;
    16191622              else if (strcmp(name,"SealevelEmotion")==0) return SealevelEmotionEnum;
    16201623              else if (strcmp(name,"SealevelchangePolarMotionX")==0) return SealevelchangePolarMotionXEnum;
Note: See TracChangeset for help on using the changeset viewer.