Index: /issm/trunk/externalpackages/vim/addons/vim/syntax/Synchronize.sh =================================================================== --- /issm/trunk/externalpackages/vim/addons/vim/syntax/Synchronize.sh (revision 9287) +++ /issm/trunk/externalpackages/vim/addons/vim/syntax/Synchronize.sh (revision 9287) @@ -0,0 +1,21 @@ +#!/bin/bash + +#Synchronize Enums + +#Get all lines of EnumDefinitions.h which hold Enum +cat c.vim | sed "/ISSM's Enums begin/,/vim: ts=8/d" > temp +echo "\"ISSM's Enums begin" >> temp +cat ../../../../../src/c/EnumDefinitions/EnumDefinitions.h | grep -e "[0-9]Enum" -e "[Aa-Zz]Enum" | grep -v StringToEnum | sed -e "s/,//g" | awk '{ printf "syn keyword cConstant " $1 "\n"}' >> temp +echo "\"ISSM's Enums end" >> temp +cat c.vim | sed "1,/ISSM's Enums end/d" >> temp + +mv temp c.vim + +#Synchronize objects +cat c.vim | sed "/ISSM's objects begin/,/vim: ts=8/d" > temp +echo "\"ISSM's objects begin" >> temp +cat ../../../../../src/c/objects/objects.h | grep "\.h" | sed -e "s/\// /g" -e "s/\.h\"//" | awk '{print $(NF)}' | awk '{ printf "syn keyword cType " $1 "\n"}' >> temp +echo "\"ISSM's objects end" >> temp +cat c.vim | sed "1,/ISSM's objects end/d" >> temp + +mv temp c.vim Index: sm/trunk/externalpackages/vim/addons/vim/syntax/SynchronizeEnums.sh =================================================================== --- /issm/trunk/externalpackages/vim/addons/vim/syntax/SynchronizeEnums.sh (revision 9286) +++ (revision ) @@ -1,12 +1,0 @@ -#!/bin/bash -#Synchronize EnumAsString.cpp and StringToEnum.cpp - -#Get all lines of EnumDefinitions.h which hold Enum - -cat c.vim | sed "/ISSM's Enums begin/,/vim: ts=8/d" > temp -echo "\"ISSM's Enums begin" >> temp -cat ../../../../../src/c/EnumDefinitions/EnumDefinitions.h | grep -e "[0-9]Enum" -e "[Aa-Zz]Enum" | grep -v StringToEnum | sed -e "s/,//g" | awk '{ printf "syn keyword cConstant " $1 "\n"}' >> temp -echo "\"ISSM's Enums end" >> temp -cat c.vim | sed "1,/ISSM's Enums end/d" >> temp - -mv temp c.vim Index: /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim =================================================================== --- /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 9286) +++ /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 9287) @@ -405,19 +405,142 @@ "ISSM containers: syn keyword cType Constraints DataSet Elements Inputs Loads Materials Parameters Results Vertices -"ISSM objects -syn keyword cType Beam BeamRef BeamVertexElementResult BeamVertexInput BoolExternalResult BoolInput BoolParam ControlInput DofIndexing -syn keyword cType DoubleElementResult DoubleExternalResult DoubleInput DoubleMatExternalResult DoubleMatParam DoubleParam DoubleVecExternalResult DoubleVecParam -syn keyword cType Element ElementResult ElementMatrix ElementVector ExternalResult FemModel GaussSeg GaussTria GaussPenta Friction Hook Icefront Input -syn keyword cType IntExternalResult IntInput IntParal IntVecParam IoModel Load Material Matice Matpar Node Nodes NodeSets Numericalflux Object -syn keyword cType Param Patch Pengrid Penpair Penta PentaHook PentaRef PentaVertexElementResult PentaVertexInput PetscMatParam PetscVecExternalResult PetscVecParam -syn keyword cType Rgb Riftfront Sing SingVertexElementResult SingVertexInput Spc StringArrayParam StringExternalResult StringParam -syn keyword cType Tria TriaHook TriaRef TriaVertexElementResult TriaVertexInput Update Vertex -"Bamg objects -syn keyword cType BamgGeom BamgMesh BamgOpts CrackedEdge Curve Direction DoubleAndInt Edge GeomEdge GeomSubDomain GeomVertex Geometry IntEdge -syn keyword cType ListofIntersectionTriangles EigenMetric BamgVertex Metric P2 P2xP2 QuadTree R2 SetOfEdges4 SubDomain Triangle AdjacentTriangle Mesh VertexOnEdge VertexOnGeom VertexOnVertex "Petsc syn keyword cType Vec Mat "other ISSM's syntax -syn keyword cType Contour OptArgs OptPars mxArray ErrorException +syn keyword cType mxArray ErrorException + +"ISSM's objects begin +syn keyword cType objects.h +syn keyword cType Object +syn keyword cType Hook +syn keyword cType DofIndexing +syn keyword cType Vertex +syn keyword cType Node +syn keyword cType Segment +syn keyword cType IoModel +syn keyword cType Patch +syn keyword cType Update +syn keyword cType Constraint +syn keyword cType SpcStatic +syn keyword cType SpcTransient +syn keyword cType SpcDynamic +syn keyword cType GaussTria +syn keyword cType GaussPenta +syn keyword cType Friction +syn keyword cType Icefront +syn keyword cType Numericalflux +syn keyword cType Riftfront +syn keyword cType Penpair +syn keyword cType Pengrid +syn keyword cType Element +syn keyword cType Penta +syn keyword cType PentaHook +syn keyword cType PentaRef +syn keyword cType Tria +syn keyword cType TriaHook +syn keyword cType TriaRef +syn keyword cType KML_Attribute +syn keyword cType KML_ColorStyle +syn keyword cType KML_Container +syn keyword cType KML_Document +syn keyword cType KML_Feature +syn keyword cType KML_File +syn keyword cType KML_Folder +syn keyword cType KML_Geometry +syn keyword cType KML_GroundOverlay +syn keyword cType KML_Icon +syn keyword cType KML_LatLonBox +syn keyword cType KML_LinearRing +syn keyword cType KML_LineString +syn keyword cType KML_LineStyle +syn keyword cType KML_MultiGeometry +syn keyword cType KML_Object +syn keyword cType KML_Overlay +syn keyword cType KML_Placemark +syn keyword cType KML_Polygon +syn keyword cType KML_PolyStyle +syn keyword cType KML_Style +syn keyword cType KML_StyleSelector +syn keyword cType KML_SubStyle +syn keyword cType KMLFileReadUtils +syn keyword cType Option +syn keyword cType OptionDouble +syn keyword cType OptionLogical +syn keyword cType OptionChar +syn keyword cType OptionStruct +syn keyword cType OptionCell +syn keyword cType OptionUtilities +syn keyword cType Input +syn keyword cType BoolInput +syn keyword cType DoubleInput +syn keyword cType IntInput +syn keyword cType PentaVertexInput +syn keyword cType TriaVertexInput +syn keyword cType ControlInput +syn keyword cType DatasetInput +syn keyword cType TransientInput +syn keyword cType ElementResult +syn keyword cType DoubleElementResult +syn keyword cType TriaVertexElementResult +syn keyword cType PentaVertexElementResult +syn keyword cType BoolElementResult +syn keyword cType ExternalResult +syn keyword cType BoolExternalResult +syn keyword cType DoubleExternalResult +syn keyword cType DoubleVecExternalResult +syn keyword cType DoubleMatExternalResult +syn keyword cType IntExternalResult +syn keyword cType PetscVecExternalResult +syn keyword cType StringExternalResult +syn keyword cType Material +syn keyword cType Matice +syn keyword cType Matpar +syn keyword cType ElementMatrix +syn keyword cType ElementVector +syn keyword cType BoolParam +syn keyword cType DoubleMatParam +syn keyword cType DoubleMatArrayParam +syn keyword cType DoubleParam +syn keyword cType DoubleVecParam +syn keyword cType IntParam +syn keyword cType IntVecParam +syn keyword cType IntMatParam +syn keyword cType FileParam +syn keyword cType Param +syn keyword cType PetscMatParam +syn keyword cType PetscVecParam +syn keyword cType StringArrayParam +syn keyword cType StringParam +syn keyword cType Contour +syn keyword cType SolverEnum +syn keyword cType FemModel +syn keyword cType OptArgs +syn keyword cType OptPars +syn keyword cType BamgOpts +syn keyword cType BamgGeom +syn keyword cType BamgMesh +syn keyword cType Metric +syn keyword cType DoubleAndInt +syn keyword cType Direction +syn keyword cType BamgVertex +syn keyword cType AdjacentTriangle +syn keyword cType Edge +syn keyword cType GeomVertex +syn keyword cType GeomEdge +syn keyword cType Curve +syn keyword cType Triangle +syn keyword cType ListofIntersectionTriangles +syn keyword cType GeomSubDomain +syn keyword cType SubDomain +syn keyword cType VertexOnGeom +syn keyword cType VertexOnVertex +syn keyword cType VertexOnEdge +syn keyword cType CrackedEdge +syn keyword cType Mesh +syn keyword cType Geometry +syn keyword cType QuadTree +syn keyword cType SetOfE4 +"ISSM's objects end + "ISSM's Enums begin syn keyword cConstant ConstraintsEnum @@ -449,8 +572,5 @@ syn keyword cConstant HydrologySolutionEnum syn keyword cConstant HydrologyAnalysisEnum -syn keyword cConstant Transient2DSolutionEnum -syn keyword cConstant Transient2DAnalysisEnum -syn keyword cConstant Transient3DSolutionEnum -syn keyword cConstant Transient3DAnalysisEnum +syn keyword cConstant TransientSolutionEnum syn keyword cConstant GroundingLineMigration2DSolutionEnum syn keyword cConstant SteadyAnalysisEnum @@ -466,6 +586,6 @@ syn keyword cConstant BalancethicknessSolutionEnum syn keyword cConstant BalancethicknessAnalysisEnum -syn keyword cConstant BalancevelocitiesSolutionEnum -syn keyword cConstant BalancevelocitiesAnalysisEnum +syn keyword cConstant Fake31Enum +syn keyword cConstant Fake32Enum syn keyword cConstant PrognosticSolutionEnum syn keyword cConstant PrognosticAnalysisEnum @@ -519,4 +639,6 @@ syn keyword cConstant PentaVertexInputEnum syn keyword cConstant TriaVertexInputEnum +syn keyword cConstant Fake0Enum +syn keyword cConstant Fake1Enum syn keyword cConstant ControlInputEnum syn keyword cConstant ParamEnum @@ -535,5 +657,6 @@ syn keyword cConstant ElementResultEnum syn keyword cConstant ExternalResultEnum -syn keyword cConstant SpcEnum +syn keyword cConstant SpcStaticEnum +syn keyword cConstant SpcTransientEnum syn keyword cConstant GeographyEnum syn keyword cConstant IceSheetEnum @@ -546,5 +669,4 @@ syn keyword cConstant OpenEnum syn keyword cConstant ClosedEnum -syn keyword cConstant AccumulationRateEnum syn keyword cConstant AdjointxEnum syn keyword cConstant AdjointyEnum @@ -559,10 +681,10 @@ syn keyword cConstant CmResponseEnum syn keyword cConstant CmResponsesEnum -syn keyword cConstant CmNoiseDmpEnum +syn keyword cConstant Fake2Enum syn keyword cConstant ConstantEnum syn keyword cConstant NumControlsEnum syn keyword cConstant ControlTypeEnum syn keyword cConstant ConvergedEnum -syn keyword cConstant DhDtEnum +syn keyword cConstant Fake3Enum syn keyword cConstant DragCoefficientEnum syn keyword cConstant DragPEnum @@ -576,9 +698,9 @@ syn keyword cConstant ElementOnSurfaceEnum syn keyword cConstant ElementOnWaterEnum -syn keyword cConstant EpsVelEnum +syn keyword cConstant Fake4Enum syn keyword cConstant FillEnum syn keyword cConstant FractionIncrementEnum syn keyword cConstant FrictionEnum -syn keyword cConstant GeothermalFluxEnum +syn keyword cConstant Fake5Enum syn keyword cConstant HydrostaticAdjustmentEnum syn keyword cConstant InternalEnum @@ -594,8 +716,8 @@ syn keyword cConstant SurfaceAverageVelMisfitEnum syn keyword cConstant MaxPenetrationEnum -syn keyword cConstant MeanVelEnum +syn keyword cConstant Fake6Enum syn keyword cConstant MeltingOffsetEnum syn keyword cConstant GroundingLineMeltingRateEnum -syn keyword cConstant MeltingRateEnum +syn keyword cConstant BasalMeltingRateEnum syn keyword cConstant MisfitEnum syn keyword cConstant NodeOnBedEnum @@ -617,7 +739,10 @@ syn keyword cConstant ShelfDampeningEnum syn keyword cConstant StabilizeConstraintsEnum -syn keyword cConstant StokesReconditioningEnum +syn keyword cConstant Fake7Enum +syn keyword cConstant SurfaceAccumulationRateEnum +syn keyword cConstant SurfaceAblationRateEnum syn keyword cConstant SurfaceAreaEnum syn keyword cConstant SurfaceEnum +syn keyword cConstant SurfaceMassBalanceEnum syn keyword cConstant SurfaceSlopeXEnum syn keyword cConstant SurfaceSlopeYEnum @@ -672,5 +797,5 @@ syn keyword cConstant TimeEnum syn keyword cConstant OutputFrequencyEnum -syn keyword cConstant WaterColumnEnum +syn keyword cConstant Fake8Enum syn keyword cConstant WaterColumnOldEnum syn keyword cConstant WaterColumnPicardEnum @@ -697,7 +822,7 @@ syn keyword cConstant RhoWaterEnum syn keyword cConstant GravityEnum -syn keyword cConstant ThermalConductivityEnum -syn keyword cConstant MeltingRateCorrectionEnum -syn keyword cConstant MeltingRateCorrectionApplyEnum +syn keyword cConstant Fake9Enum +syn keyword cConstant BasalMeltingRateCorrectionEnum +syn keyword cConstant BasalMeltingRateCorrectionApplyEnum syn keyword cConstant MixedLayerCapacityEnum syn keyword cConstant ThermalExchangeVelocityEnum @@ -725,17 +850,17 @@ syn keyword cConstant EpsRelEnum syn keyword cConstant EpsResEnum -syn keyword cConstant HeatCapacityEnum -syn keyword cConstant IsHutterEnum -syn keyword cConstant IsMacAyealPattynEnum -syn keyword cConstant IsStokesEnum -syn keyword cConstant KffEnum -syn keyword cConstant LatentHeatEnum +syn keyword cConstant Fake10Enum +syn keyword cConstant Fake29Enum +syn keyword cConstant Fake11Enum +syn keyword cConstant Fake12Enum +syn keyword cConstant Fake13Enum +syn keyword cConstant Fake14Enum syn keyword cConstant LowmemEnum -syn keyword cConstant MaxIterEnum +syn keyword cConstant Fake16Enum syn keyword cConstant MaxNonlinearIterationsEnum -syn keyword cConstant MeltingPointEnum +syn keyword cConstant Fake17Enum syn keyword cConstant MinMechanicalConstraintsEnum syn keyword cConstant MinThermalConstraintsEnum -syn keyword cConstant NStepsEnum +syn keyword cConstant Fake18Enum syn keyword cConstant NdtEnum syn keyword cConstant NumOutputEnum @@ -744,8 +869,8 @@ syn keyword cConstant NumberOfNodesEnum syn keyword cConstant NumberOfVerticesEnum -syn keyword cConstant OptScalEnum +syn keyword cConstant Fake19Enum syn keyword cConstant OutputFilePointerEnum -syn keyword cConstant OutputFileNameEnum -syn keyword cConstant ParameterOutputEnum +syn keyword cConstant Fake20Enum +syn keyword cConstant Fake21Enum syn keyword cConstant PenaltyMeltingEnum syn keyword cConstant QmuAnalysisEnum @@ -763,11 +888,11 @@ syn keyword cConstant ScaledEnum syn keyword cConstant NodalEnum -syn keyword cConstant ResponseDescriptorsEnum +syn keyword cConstant ResponsedescriptorsEnum syn keyword cConstant PetscRcEnum syn keyword cConstant SparsityEnum -syn keyword cConstant TolXEnum -syn keyword cConstant VariableDescriptorsEnum +syn keyword cConstant Fake22Enum +syn keyword cConstant VariabledescriptorsEnum syn keyword cConstant VerboseEnum -syn keyword cConstant WaitOnLockEnum +syn keyword cConstant Fake23Enum syn keyword cConstant PetscOptionsStringsEnum syn keyword cConstant PetscOptionsAnalysesEnum @@ -792,7 +917,109 @@ syn keyword cConstant VyMeshEnum syn keyword cConstant VzMeshEnum -syn keyword cConstant IsDiagnosticEnum -syn keyword cConstant IsPrognosticEnum -syn keyword cConstant IsThermalEnum +syn keyword cConstant Fake24Enum +syn keyword cConstant Fake25Enum +syn keyword cConstant Fake26Enum +syn keyword cConstant EnthalpySolutionEnum +syn keyword cConstant EnthalpyAnalysisEnum +syn keyword cConstant EnthalpyEnum +syn keyword cConstant EnthalpyPicardEnum +syn keyword cConstant Fake27Enum +syn keyword cConstant Fake28Enum +syn keyword cConstant ThicknessAbsGradientEnum +syn keyword cConstant VelAbsGradientEnum +syn keyword cConstant DatasetInputEnum +syn keyword cConstant NumResponsesEnum +syn keyword cConstant StepResponsesEnum +syn keyword cConstant IntMatParamEnum +syn keyword cConstant RheologyBbarAbsGradientEnum +syn keyword cConstant DragCoefficientAbsGradientEnum +syn keyword cConstant TransientInputEnum +syn keyword cConstant NumberOfElements2DEnum +syn keyword cConstant NumControlTypeEnum +syn keyword cConstant SpcvyEnum +syn keyword cConstant HydroQEnum +syn keyword cConstant VerboseBinaryEnum +syn keyword cConstant NodeOnWaterEnum +syn keyword cConstant YEnum +syn keyword cConstant GlMeltingRateEnum +syn keyword cConstant ElementsTypeEnum +syn keyword cConstant PenaltiesEnum +syn keyword cConstant PrognosticDGEnum +syn keyword cConstant PressureloadEnum +syn keyword cConstant HydroCREnum +syn keyword cConstant NameEnum +syn keyword cConstant VerticesTypeEnum +syn keyword cConstant HydroKnEnum +syn keyword cConstant GEnum +syn keyword cConstant InputfilenameEnum +syn keyword cConstant SpcvzEnum +syn keyword cConstant Fake33Enum +syn keyword cConstant NumberOfNodes2DEnum +syn keyword cConstant NodeOnStokesEnum +syn keyword cConstant NodeOnHutterEnum +syn keyword cConstant ZEnum +syn keyword cConstant GlMigrationEnum +syn keyword cConstant RiftinfoEnum +syn keyword cConstant ElementOnIceSheetEnum +syn keyword cConstant SpcthicknessEnum +syn keyword cConstant SpctemperatureEnum +syn keyword cConstant PenaltyLockEnum +syn keyword cConstant SpcvxEnum +syn keyword cConstant UpperelementsEnum +syn keyword cConstant HydroPEnum +syn keyword cConstant NodeOnPattynEnum +syn keyword cConstant EdgesEnum +syn keyword cConstant Elements2DEnum +syn keyword cConstant XEnum +syn keyword cConstant NumCmResponsesEnum +syn keyword cConstant NodeOnMacayealEnum +syn keyword cConstant ElementconnectivityEnum +syn keyword cConstant SpcwatercolumnEnum +syn keyword cConstant ArtificialDiffusivityEnum +syn keyword cConstant HydroNEnum +syn keyword cConstant BorderstokesEnum +syn keyword cConstant NumlayersEnum +syn keyword cConstant DiagnosticRefEnum +syn keyword cConstant IshutterEnum +syn keyword cConstant IsmacayealpattynEnum +syn keyword cConstant IsstokesEnum +syn keyword cConstant StokesreconditioningEnum +syn keyword cConstant LowerelementsEnum +syn keyword cConstant HeatcapacityEnum +syn keyword cConstant LatentheatEnum +syn keyword cConstant ThermalconductivityEnum +syn keyword cConstant MeltingpointEnum +syn keyword cConstant ReferencetemperatureEnum +syn keyword cConstant DhdtEnum +syn keyword cConstant GeothermalfluxEnum +syn keyword cConstant IsprognosticEnum +syn keyword cConstant IsdiagnosticEnum +syn keyword cConstant IsthermalEnum +syn keyword cConstant NstepsEnum +syn keyword cConstant MaxiterEnum +syn keyword cConstant TolxEnum +syn keyword cConstant OptscalEnum +syn keyword cConstant EpsvelEnum +syn keyword cConstant MeanvelEnum +syn keyword cConstant Fake30Enum +syn keyword cConstant OutputfilenameEnum +syn keyword cConstant WaterfractionEnum +syn keyword cConstant WatercolumnEnum +syn keyword cConstant WaitonlockEnum +syn keyword cConstant NumberOfVariablesEnum +syn keyword cConstant NumberOfResponsesEnum +syn keyword cConstant NpartEnum +syn keyword cConstant QmuMassFluxNumProfilesEnum +syn keyword cConstant PartEnum +syn keyword cConstant MaxSteadystateIterationsEnum +syn keyword cConstant RequestedOutputsEnum +syn keyword cConstant NumRequestedOutputsEnum +syn keyword cConstant BasalFrictionEnum +syn keyword cConstant ViscousHeatingEnum +syn keyword cConstant QmuTemperatureEnum +syn keyword cConstant QmuRheologyBEnum +syn keyword cConstant HydrologyWaterVxEnum +syn keyword cConstant HydrologyWaterVyEnum +syn keyword cConstant SpcDynamicEnum "ISSM's Enums end """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""