Changeset 25349


Ignore:
Timestamp:
08/05/20 13:33:01 (5 years ago)
Author:
Eric.Larour
Message:

CHG: changes.

Location:
issm/branches/trunk-larour-SLPS2020/src/c
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-larour-SLPS2020/src/c/Makefile.am

    r25066 r25349  
    760760bin_PROGRAMS =
    761761else
    762 bin_PROGRAMS = issm issm_slr
     762bin_PROGRAMS = issm issm_slr issm_post
    763763endif
    764764endif
    … …  
    777777endif
    778778
    779 issm_SOURCES = main/issm.cpp
     779issm_SOURCES = main/issm.cpp 
    780780issm_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
    781781
    782782issm_slr_SOURCES = main/issm_slr.cpp
    783783issm_slr_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
     784
     785issm_post_SOURCES = main/issm_post.cpp
     786issm_post_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
    784787
    785788if OCEAN

  • issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/Enum.vim

    r25323 r25349  
    208208syn keyword cConstant IndexEnum
    209209syn keyword cConstant InputFileNameEnum
     210syn keyword cConstant DirectoryNameEnum
    210211syn keyword cConstant InputToDepthaverageInEnum
    211212syn keyword cConstant InputToDepthaverageOutEnum
    … …  
    13631364syn keyword cType Cfsurfacesquare
    13641365syn keyword cType Channel
    1365 syn keyword cType classes
    13661366syn keyword cType Constraint
    13671367syn keyword cType Constraints
    … …  
    13701370syn keyword cType ControlInput2
    13711371syn keyword cType Covertree
     1372syn keyword cType DataSetParam
    13721373syn keyword cType DatasetInput2
    1373 syn keyword cType DataSetParam
    13741374syn keyword cType Definition
    13751375syn keyword cType DependentObject
    … …  
    13841384syn keyword cType ElementInput2
    13851385syn keyword cType ElementMatrix
     1386syn keyword cType ElementVector
    13861387syn keyword cType Elements
    1387 syn keyword cType ElementVector
    13881388syn keyword cType ExponentialVariogram
    13891389syn keyword cType ExternalResult
    … …  
    13921392syn keyword cType Friction
    13931393syn keyword cType Gauss
    1394 syn keyword cType GaussianVariogram
    1395 syn keyword cType gaussobjects
    13961394syn keyword cType GaussPenta
    13971395syn keyword cType GaussSeg
    13981396syn keyword cType GaussTetra
    13991397syn keyword cType GaussTria
     1398syn keyword cType GaussianVariogram
    14001399syn keyword cType GenericExternalResult
    14011400syn keyword cType GenericOption
    … …  
    14121411syn keyword cType IssmDirectApplicInterface
    14131412syn keyword cType IssmParallelDirectApplicInterface
    1414 syn keyword cType krigingobjects
    14151413syn keyword cType Load
    14161414syn keyword cType Loads
    … …  
    14231421syn keyword cType Matice
    14241422syn keyword cType Matlitho
    1425 syn keyword cType matrixobjects
    14261423syn keyword cType MatrixParam
    14271424syn keyword cType Misfit
    … …  
    14361433syn keyword cType Observations
    14371434syn keyword cType Option
     1435syn keyword cType OptionUtilities
    14381436syn keyword cType Options
    1439 syn keyword cType OptionUtilities
    14401437syn keyword cType Param
    14411438syn keyword cType Parameters
    … …  
    14511448syn keyword cType Regionaloutput
    14521449syn keyword cType Results
     1450syn keyword cType RiftStruct
    14531451syn keyword cType Riftfront
    1454 syn keyword cType RiftStruct
    14551452syn keyword cType SealevelMasks
    14561453syn keyword cType Seg
    14571454syn keyword cType SegInput2
     1455syn keyword cType SegRef
    14581456syn keyword cType Segment
    1459 syn keyword cType SegRef
    14601457syn keyword cType SpcDynamic
    14611458syn keyword cType SpcStatic
    … …  
    14761473syn keyword cType Vertex
    14771474syn keyword cType Vertices
     1475syn keyword cType classes
     1476syn keyword cType gaussobjects
     1477syn keyword cType krigingobjects
     1478syn keyword cType matrixobjects
    14781479syn keyword cType AdjointBalancethickness2Analysis
    14791480syn keyword cType AdjointBalancethicknessAnalysis
    … …  
    14941495syn keyword cType FreeSurfaceBaseAnalysis
    14951496syn keyword cType FreeSurfaceTopAnalysis
     1497syn keyword cType GLheightadvectionAnalysis
    14961498syn keyword cType GiaAnalysis
    1497 syn keyword cType GLheightadvectionAnalysis
    14981499syn keyword cType HydrologyDCEfficientAnalysis
    14991500syn keyword cType HydrologyDCInefficientAnalysis

  • issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/EnumToStringx.cpp

    r25323 r25349  
    210210                case IndexEnum : return "Index";
    211211                case InputFileNameEnum : return "InputFileName";
     212                case DirectoryNameEnum : return "DirectoryName";
    212213                case InputToDepthaverageInEnum : return "InputToDepthaverageIn";
    213214                case InputToDepthaverageOutEnum : return "InputToDepthaverageOut";

  • issm/branches/trunk-larour-SLPS2020/src/c/shared/Enum/StringToEnumx.cpp

    r25323 r25349  
    213213              else if (strcmp(name,"Index")==0) return IndexEnum;
    214214              else if (strcmp(name,"InputFileName")==0) return InputFileNameEnum;
     215              else if (strcmp(name,"DirectoryName")==0) return DirectoryNameEnum;
    215216              else if (strcmp(name,"InputToDepthaverageIn")==0) return InputToDepthaverageInEnum;
    216217              else if (strcmp(name,"InputToDepthaverageOut")==0) return InputToDepthaverageOutEnum;
    … …  
    259260              else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum;
    260261              else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum;
    261               else if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
     265              if (strcmp(name,"MasstransportStabilization")==0) return MasstransportStabilizationEnum;
     266              else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
    266267              else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum;
    267268              else if (strcmp(name,"MaterialsEffectiveconductivityAveraging")==0) return MaterialsEffectiveconductivityAveragingEnum;
    … …  
    382383              else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
    383384              else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
    384               else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum;
     388              if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
     389              else if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum;
    389390              else if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum;
    390391              else if (strcmp(name,"SmbIsprecipscaled")==0) return SmbIsprecipscaledEnum;
    … …  
    505506              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanOverturning")==0) return BasalforcingsPicoSubShelfOceanOverturningEnum;
    506507              else if (strcmp(name,"BasalforcingsPicoSubShelfOceanSalinity")==0) return BasalforcingsPicoSubShelfOceanSalinityEnum;
    507               else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum;
     511              if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum;
     512              else if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum;
    512513              else if (strcmp(name,"BasalStressy")==0) return BasalStressyEnum;
    513514              else if (strcmp(name,"BasalStress")==0) return BasalStressEnum;
    … …  
    628629              else if (strcmp(name,"HydrologydcMaskThawedElt")==0) return HydrologydcMaskThawedEltEnum;
    629630              else if (strcmp(name,"HydrologydcMaskThawedNode")==0) return HydrologydcMaskThawedNodeEnum;
    630               else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
    631               else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
    632631         else stage=6;
    633632   }
    634633   if(stage==6){
    635               if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
     634              if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
     635              else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum;
     636              else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum;
    636637              else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum;
    637638              else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum;
    … …  
    751752              else if (strcmp(name,"SmbDz")==0) return SmbDzEnum;
    752753              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
    753               else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
    754               else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    755754         else stage=7;
    756755   }
    757756   if(stage==7){
    758               if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
     757              if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
     758              else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
     759              else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
    759760              else if (strcmp(name,"SmbEC")==0) return SmbECEnum;
    760761              else if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum;
    … …  
    874875              else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    875876              else if (strcmp(name,"Vy")==0) return VyEnum;
    876               else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
    877               else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    878877         else stage=8;
    879878   }
    880879   if(stage==8){
    881               if (strcmp(name,"Vz")==0) return VzEnum;
     880              if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
     881              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
     882              else if (strcmp(name,"Vz")==0) return VzEnum;
    882883              else if (strcmp(name,"VzFS")==0) return VzFSEnum;
    883884              else if (strcmp(name,"VzHO")==0) return VzHOEnum;
    … …  
    997998              else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    998999              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
    999               else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
    1000               else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
    10011000         else stage=9;
    10021001   }
    10031002   if(stage==9){
    1004               if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
     1003              if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
     1004              else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
     1005              else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum;
    10051006              else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
    10061007              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
    … …  
    11201121              else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
    11211122              else if (strcmp(name,"GroundinglineMassFlux")==0) return GroundinglineMassFluxEnum;
    1122               else if (strcmp(name,"Gset")==0) return GsetEnum;
    1123               else if (strcmp(name,"Gsl")==0) return GslEnum;
    11241123         else stage=10;
    11251124   }
    11261125   if(stage==10){
    1127               if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
     1126              if (strcmp(name,"Gset")==0) return GsetEnum;
     1127              else if (strcmp(name,"Gsl")==0) return GslEnum;
     1128              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
    11281129              else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
    11291130              else if (strcmp(name,"Hook")==0) return HookEnum;
    … …  
    12431244              else if (strcmp(name,"Param")==0) return ParamEnum;
    12441245              else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    1245               else if (strcmp(name,"P0Array")==0) return P0ArrayEnum;
    1246               else if (strcmp(name,"P0DG")==0) return P0DGEnum;
    12471246         else stage=11;
    12481247   }
    12491248   if(stage==11){
    1250               if (strcmp(name,"P1DG")==0) return P1DGEnum;
     1249              if (strcmp(name,"P0Array")==0) return P0ArrayEnum;
     1250              else if (strcmp(name,"P0DG")==0) return P0DGEnum;
     1251              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    12511252              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    12521253              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    … …  
    13661367              else if (strcmp(name,"XYZ")==0) return XYZEnum;
    13671368              else if (strcmp(name,"BalancethicknessD0")==0) return BalancethicknessD0Enum;
    1368               else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
    1369               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
    13701369         else stage=12;
    13711370   }
    13721371   if(stage==12){
    1373               if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
     1372              if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
     1373              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
     1374              else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum;
    13741375              else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
    13751376              else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum;
Note: See TracChangeset for help on using the changeset viewer.