Index: /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/Synchronize.sh =================================================================== --- /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/Synchronize.sh (revision 15302) +++ /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/Synchronize.sh (revision 15303) @@ -6,14 +6,13 @@ 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 "[a-z]Enum," -e "[A-Z]Enum," | grep -v StringToEnum | sed -e "s/,//g" | awk '{ printf "syn keyword cConstant " $1 "\n"}' >> temp +cat ../../../../../src/c/shared/Enum/EnumDefinitions.h | grep -e "[0-9]Enum," -e "[a-z]Enum," -e "[A-Z]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 -exit 1 #Synchronize objects cat c.vim | sed "/ISSM's objects begin/,/vim: ts=8/d" > temp echo "\"ISSM's objects begin" >> temp -find ../../../../../src/c/classes -name "*.h" | sed -e "s/\// /g" -e "s/\.h//"| awk '{print $(NF)}' | awk '{ printf "syn keyword cType " $1 "\n"}'>> temp +find ../../../../../src/c/classes -name "*.cpp" | sed -e "s/\// /g" -e "s/\.cpp//"| 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 Index: /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim =================================================================== --- /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 15302) +++ /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 15303) @@ -403,168 +403,91 @@ " please try to keep the alphabetical ordering " """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -"ISSM containers: -syn keyword cType Constraints DataSet Elements Inputs Loads Materials Nodes Parameters Results Vertices Options "Petsc syn keyword cType Vec Mat SeqVec SeqMat "other ISSM's syntax -syn keyword cType mxArray ErrorException QuadtreeBox IssmDouble IssmPDouble Observations +syn keyword cType mxArray ErrorException QuadtreeBox +syn keyword cType IssmDouble IssmPDouble "ISSM's objects begin -syn keyword cType GaussPenta -syn keyword cType gaussobjects -syn keyword cType GaussTria -syn keyword cType objects -syn keyword cType Material +syn keyword cType Matdamageice +syn keyword cType Materials syn keyword cType Matice syn keyword cType Matpar -syn keyword cType objects -syn keyword cType Contour -syn keyword cType DoubleInput -syn keyword cType Input +syn keyword cType DofIndexing +syn keyword cType IntVecParam +syn keyword cType BoolParam +syn keyword cType IntMatParam +syn keyword cType DoubleTransientMatParam +syn keyword cType StringParam +syn keyword cType DoubleVecParam +syn keyword cType DoubleMatParam +syn keyword cType FileParam +syn keyword cType Parameters +syn keyword cType DataSetParam +syn keyword cType IntParam +syn keyword cType VectorParam +syn keyword cType MatrixParam +syn keyword cType StringArrayParam +syn keyword cType TransientParam +syn keyword cType DoubleParam +syn keyword cType DoubleMatArrayParam +syn keyword cType ExponentialVariogram +syn keyword cType PowerVariogram +syn keyword cType Quadtree +syn keyword cType Observations +syn keyword cType GaussianVariogram +syn keyword cType SphericalVariogram +syn keyword cType Observation +syn keyword cType RiftStruct +syn keyword cType OptionUtilities +syn keyword cType Options +syn keyword cType Penpair +syn keyword cType Loads +syn keyword cType Icefront +syn keyword cType Friction +syn keyword cType Riftfront +syn keyword cType Numericalflux +syn keyword cType Pengrid +syn keyword cType Contours +syn keyword cType Vertex +syn keyword cType ElementMatrix +syn keyword cType ElementVector +syn keyword cType Profiler +syn keyword cType Results +syn keyword cType PentaP1ElementResult +syn keyword cType DoubleElementResult +syn keyword cType BoolElementResult +syn keyword cType TriaP1ElementResult +syn keyword cType FemModel +syn keyword cType PentaRef +syn keyword cType Penta +syn keyword cType Elements +syn keyword cType TriaHook +syn keyword cType PentaHook +syn keyword cType TriaRef +syn keyword cType Tria +syn keyword cType GaussTria +syn keyword cType GaussPenta +syn keyword cType DependentObject +syn keyword cType Patch +syn keyword cType Hook syn keyword cType ControlInput syn keyword cType DatasetInput syn keyword cType IntInput syn keyword cType BoolInput -syn keyword cType TriaP1Input +syn keyword cType Inputs syn keyword cType TransientInput syn keyword cType PentaP1Input -syn keyword cType KML_Icon -syn keyword cType KML_Point -syn keyword cType KML_LinearRing -syn keyword cType KML_Feature -syn keyword cType KMLFileReadUtils -syn keyword cType KML_StyleSelector -syn keyword cType KML_LatLonBox -syn keyword cType KML_Attribute -syn keyword cType KML_PolyStyle -syn keyword cType KML_Object -syn keyword cType KML_SubStyle -syn keyword cType KML_LineString -syn keyword cType KML_Overlay -syn keyword cType KML_Container -syn keyword cType KML_Polygon -syn keyword cType KML_Geometry -syn keyword cType KML_ColorStyle -syn keyword cType KML_Placemark -syn keyword cType KML_Unknown -syn keyword cType KML_GroundOverlay -syn keyword cType KML_Style -syn keyword cType KML_Comment -syn keyword cType KML_MultiGeometry -syn keyword cType KML_LineStyle -syn keyword cType KML_Folder -syn keyword cType KML_Document -syn keyword cType KML_File -syn keyword cType DoubleVecParam -syn keyword cType DoubleParam -syn keyword cType DoubleMatArrayParam -syn keyword cType DoubleMatParam -syn keyword cType Param -syn keyword cType FileParam -syn keyword cType IntVecParam -syn keyword cType IntParam -syn keyword cType BoolParam -syn keyword cType IntMatParam -syn keyword cType VectorParam -syn keyword cType DoubleTransientMatParam -syn keyword cType MatrixParam -syn keyword cType StringArrayParam -syn keyword cType StringParam -syn keyword cType TransientParam -syn keyword cType OptionStruct -syn keyword cType OptionDouble -syn keyword cType OptionLogical -syn keyword cType OptionUtilities -syn keyword cType OptionChar -syn keyword cType Option -syn keyword cType OptionCell -syn keyword cType Segment -syn keyword cType Icefront -syn keyword cType Friction -syn keyword cType Riftfront -syn keyword cType Numericalflux -syn keyword cType Penpair -syn keyword cType Load -syn keyword cType Pengrid -syn keyword cType Object -syn keyword cType DoubleVecExternalResult -syn keyword cType DoubleExternalResult -syn keyword cType IntExternalResult -syn keyword cType BoolExternalResult -syn keyword cType DoubleMatExternalResult -syn keyword cType PetscVecExternalResult -syn keyword cType ExternalResult -syn keyword cType StringExternalResult -syn keyword cType Vertex +syn keyword cType DoubleInput +syn keyword cType TriaInput +syn keyword cType Constraints syn keyword cType SpcDynamic syn keyword cType SpcStatic syn keyword cType SpcTransient -syn keyword cType Constraint -syn keyword cType TriaP1ElementResult -syn keyword cType PentaP1ElementResult -syn keyword cType DoubleElementResult -syn keyword cType ElementResultLocal -syn keyword cType BoolElementResult -syn keyword cType ElementResult +syn keyword cType Nodes +syn keyword cType IndependentObject +syn keyword cType Vertices syn keyword cType Node -syn keyword cType TriaRef -syn keyword cType TriaHook -syn keyword cType PentaRef -syn keyword cType PentaHook -syn keyword cType Tria -syn keyword cType Element -syn keyword cType Penta -syn keyword cType classes -syn keyword cType DofIndexing -syn keyword cType Patch -syn keyword cType Hook -syn keyword cType Quadtree -syn keyword cType Observation -syn keyword cType ExponentialVariogram -syn keyword cType GaussianVariogram -syn keyword cType SphericalVariogram -syn keyword cType PowerVariogram -syn keyword cType krigingobjects -syn keyword cType Variogram -syn keyword cType DakotaPlugin -syn keyword cType ElementVector -syn keyword cType ElementMatrix -syn keyword cType matrixobjects -syn keyword cType Vector -syn keyword cType Matrix -syn keyword cType GeomSubDomain -syn keyword cType Geometry -syn keyword cType AdjacentTriangle -syn keyword cType VertexOnEdge -syn keyword cType BamgQuadtree -syn keyword cType Edge -syn keyword cType BamgVertex -syn keyword cType SetOfE4 -syn keyword cType GeomEdge -syn keyword cType Direction -syn keyword cType VertexOnGeom -syn keyword cType R2 -syn keyword cType Mesh -syn keyword cType ListofIntersectionTriangles -syn keyword cType Triangle -syn keyword cType DoubleAndInt -syn keyword cType VertexOnVertex -syn keyword cType BamgOpts -syn keyword cType BamgGeom -syn keyword cType bamgobjects -syn keyword cType CrackedEdge -syn keyword cType SubDomain -syn keyword cType BamgMesh -syn keyword cType Metric -syn keyword cType include -syn keyword cType typedefs -syn keyword cType Curve -syn keyword cType macros -syn keyword cType GeomVertex -syn keyword cType OptArgs -syn keyword cType Update -syn keyword cType OptPars syn keyword cType IoModel -syn keyword cType FemModel "ISSM's objects end "ISSM's Enums begin @@ -636,5 +559,5 @@ syn keyword cConstant FrictionQEnum syn keyword cConstant GeometryHydrostaticRatioEnum -syn keyword cConstant HydrologyEnum +syn keyword cConstant HydrologyModelEnum syn keyword cConstant HydrologyshreveEnum syn keyword cConstant HydrologyshreveCREnum @@ -647,4 +570,9 @@ syn keyword cConstant HydrologydcEnum syn keyword cConstant SedimentHeadEnum +syn keyword cConstant SedimentHeadOldEnum +syn keyword cConstant SedimentHeadResidualEnum +syn keyword cConstant EplHeadEnum +syn keyword cConstant EplHeadOldEnum +syn keyword cConstant HydrologydcRelTolEnum syn keyword cConstant HydrologydcSpcsedimentHeadEnum syn keyword cConstant HydrologydcSedimentCompressibilityEnum @@ -653,4 +581,22 @@ syn keyword cConstant HydrologydcSedimentTransmitivityEnum syn keyword cConstant HydrologydcWaterCompressibilityEnum +syn keyword cConstant HydrologydcSpceplHeadEnum +syn keyword cConstant HydrologydcMaskEplactiveEnum +syn keyword cConstant HydrologydcEplCompressibilityEnum +syn keyword cConstant HydrologydcEplPorosityEnum +syn keyword cConstant HydrologydcEplThicknessEnum +syn keyword cConstant HydrologydcEplTransmitivityEnum +syn keyword cConstant HydrologydcIsefficientlayerEnum +syn keyword cConstant HydrologydcSedimentlimitFlagEnum +syn keyword cConstant HydrologydcSedimentlimitEnum +syn keyword cConstant HydrologydcTransferFlagEnum +syn keyword cConstant HydrologydcLeakageFactorEnum +syn keyword cConstant HydrologydcPenaltyFactorEnum +syn keyword cConstant HydrologyLayerEnum +syn keyword cConstant HydrologySedimentEnum +syn keyword cConstant HydrologyEfficientEnum +syn keyword cConstant HydrologySedimentKmaxEnum +syn keyword cConstant BasisIntegralEnum +syn keyword cConstant WaterTransferEnum syn keyword cConstant IndependentObjectEnum syn keyword cConstant InversionControlParametersEnum @@ -698,4 +644,8 @@ syn keyword cConstant MaterialsThermalExchangeVelocityEnum syn keyword cConstant MaterialsThermalconductivityEnum +syn keyword cConstant MaterialsLithosphereShearModulusEnum +syn keyword cConstant MaterialsLithosphereDensityEnum +syn keyword cConstant MaterialsMantleShearModulusEnum +syn keyword cConstant MaterialsMantleDensityEnum syn keyword cConstant MeshAverageVertexConnectivityEnum syn keyword cConstant MeshDimensionEnum @@ -763,4 +713,6 @@ syn keyword cConstant SurfaceforcingsMassBalanceEnum syn keyword cConstant SurfaceforcingsIspddEnum +syn keyword cConstant SurfaceforcingsDesfacEnum +syn keyword cConstant SurfaceforcingsS0pEnum syn keyword cConstant SurfaceforcingsIssmbgradientsEnum syn keyword cConstant SurfaceforcingsMonthlytemperaturesEnum @@ -776,4 +728,6 @@ syn keyword cConstant ThermalStabilizationEnum syn keyword cConstant ThermalIsenthalpyEnum +syn keyword cConstant GiaMantleViscosityEnum +syn keyword cConstant GiaLithosphereThicknessEnum syn keyword cConstant ThicknessEnum syn keyword cConstant TimesteppingStartTimeEnum @@ -814,5 +768,7 @@ syn keyword cConstant FlaimAnalysisEnum syn keyword cConstant FlaimSolutionEnum -syn keyword cConstant HydrologyAnalysisEnum +syn keyword cConstant HydrologyShreveAnalysisEnum +syn keyword cConstant HydrologyDCInefficientAnalysisEnum +syn keyword cConstant HydrologyDCEfficientAnalysisEnum syn keyword cConstant HydrologySolutionEnum syn keyword cConstant MeltingAnalysisEnum @@ -843,4 +799,5 @@ syn keyword cConstant MaterialsEnum syn keyword cConstant NodesEnum +syn keyword cConstant ContoursEnum syn keyword cConstant ParametersEnum syn keyword cConstant VerticesEnum @@ -889,4 +846,5 @@ syn keyword cConstant ProfilerEnum syn keyword cConstant MatrixParamEnum +syn keyword cConstant NodeSIdEnum syn keyword cConstant VectorParamEnum syn keyword cConstant RiftfrontEnum @@ -901,6 +859,8 @@ syn keyword cConstant StringParamEnum syn keyword cConstant TriaEnum -syn keyword cConstant TriaP1InputEnum +syn keyword cConstant TriaInputEnum syn keyword cConstant VertexEnum +syn keyword cConstant VertexPIdEnum +syn keyword cConstant VertexSIdEnum syn keyword cConstant AirEnum syn keyword cConstant IceEnum @@ -920,5 +880,4 @@ syn keyword cConstant ConstantEnum syn keyword cConstant ConvergedEnum -syn keyword cConstant ExtToIuEnum syn keyword cConstant FillEnum syn keyword cConstant FractionIncrementEnum @@ -926,5 +885,4 @@ syn keyword cConstant GroundinglineMeltingRateEnum syn keyword cConstant InternalEnum -syn keyword cConstant IuToExtEnum syn keyword cConstant MassFluxEnum syn keyword cConstant MaxPenetrationEnum @@ -997,8 +955,11 @@ syn keyword cConstant StressTensoryzEnum syn keyword cConstant StressTensorzzEnum +syn keyword cConstant GiaCrossSectionShapeEnum +syn keyword cConstant GiadWdtEnum syn keyword cConstant GiaWEnum syn keyword cConstant P0Enum syn keyword cConstant P1Enum syn keyword cConstant P1DGEnum +syn keyword cConstant P2Enum syn keyword cConstant SaveResultsEnum syn keyword cConstant BoolElementResultEnum @@ -1031,5 +992,4 @@ syn keyword cConstant IceVolumeEnum syn keyword cConstant TotalSmbEnum -syn keyword cConstant RelativeEnum syn keyword cConstant AbsoluteEnum syn keyword cConstant IncrementalEnum