Index: /issm/trunk-jpl/m4/analyses.m4
===================================================================
--- /issm/trunk-jpl/m4/analyses.m4	(revision 27298)
+++ /issm/trunk-jpl/m4/analyses.m4	(revision 27299)
@@ -150,4 +150,18 @@
 AC_MSG_RESULT($HAVE_DAMAGEEVOLUTION)
 dnl }}}
+dnl with-Debris{{{
+AC_ARG_WITH([Debris],
+	AS_HELP_STRING([--with-Debris = YES], [compile with Debris capabilities (default is yes)]),
+	[DEBRIS=$withval],[DEBRIS=yes])
+AC_MSG_CHECKING(for Debris capability compilation)
+
+HAVE_DEBRIS=no 
+if test "x$DEBRIS" = "xyes"; then
+	HAVE_DEBRIS=yes
+	AC_DEFINE([_HAVE_DEBRIS_],[1],[with Debris capability])
+fi
+AM_CONDITIONAL([DEBRIS], [test x$HAVE_DEBRIS = xyes])
+AC_MSG_RESULT($HAVE_DEBRIS)
+dnl }}}
 dnl with-DepthAverage{{{
 AC_ARG_WITH([DepthAverage],
Index: /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp	(revision 27298)
+++ /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp	(revision 27299)
@@ -43,4 +43,7 @@
 		#ifdef _HAVE_DAMAGEEVOLUTION_
 		case DamageEvolutionAnalysisEnum : return new DamageEvolutionAnalysis();
+		#endif
+		#ifdef _HAVE_DEBRIS_
+		case DebrisAnalysisEnum : return new DebrisAnalysis();
 		#endif
 		#ifdef _HAVE_DEPTHAVERAGE_
Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 27298)
+++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim	(revision 27299)
@@ -162,5 +162,16 @@
 syn keyword cConstant DamageStressThresholdEnum
 syn keyword cConstant DamageStressUBoundEnum
+syn keyword cConstant DebrisMinThicknessEnum
+syn keyword cConstant DebrisNumRequestedOutputsEnum
+syn keyword cConstant DebrisPenaltyFactorEnum
+syn keyword cConstant DebrisRequestedOutputsEnum
+syn keyword cConstant DebrisStabilizationEnum
+syn keyword cConstant DebrisRemovalmodelEnum
+syn keyword cConstant DebrisDisplacementmodelEnum
+syn keyword cConstant DebrisRemovalSlopeThresholdEnum
+syn keyword cConstant DebrisRemovalStressThresholdEnum
+syn keyword cConstant DebrisPackingFractionEnum
 syn keyword cConstant DebugProfilingEnum
+syn keyword cConstant DebrisThicknessEnum
 syn keyword cConstant DomainDimensionEnum
 syn keyword cConstant DomainTypeEnum
@@ -598,4 +609,5 @@
 syn keyword cConstant TransientIsageEnum
 syn keyword cConstant TransientIsdamageevolutionEnum
+syn keyword cConstant TransientIsdebrisEnum
 syn keyword cConstant TransientIsesaEnum
 syn keyword cConstant TransientIsgiaEnum
@@ -1123,4 +1135,5 @@
 syn keyword cConstant VxAverageEnum
 syn keyword cConstant VxBaseEnum
+syn keyword cConstant VxDebrisEnum
 syn keyword cConstant VxEnum
 syn keyword cConstant VxMeshEnum
@@ -1130,4 +1143,5 @@
 syn keyword cConstant VyAverageEnum
 syn keyword cConstant VyBaseEnum
+syn keyword cConstant VyDebrisEnum
 syn keyword cConstant VyEnum
 syn keyword cConstant VyMeshEnum
@@ -1318,4 +1332,6 @@
 syn keyword cConstant DataSetParamEnum
 syn keyword cConstant DatasetInputEnum
+syn keyword cConstant DebrisAnalysisEnum
+syn keyword cConstant DebrisSolutionEnum
 syn keyword cConstant DefaultAnalysisEnum
 syn keyword cConstant DefaultCalvingEnum
@@ -1542,4 +1558,5 @@
 syn keyword cConstant SMBarmaEnum
 syn keyword cConstant SMBcomponentsEnum
+syn keyword cConstant SMBdebrisMLEnum
 syn keyword cConstant SMBd18opddEnum
 syn keyword cConstant SMBforcingEnum
@@ -1663,5 +1680,4 @@
 syn keyword cType Cfsurfacesquare
 syn keyword cType Channel
-syn keyword cType classes
 syn keyword cType Constraint
 syn keyword cType Constraints
@@ -1670,6 +1686,6 @@
 syn keyword cType ControlInput
 syn keyword cType Covertree
+syn keyword cType DataSetParam
 syn keyword cType DatasetInput
-syn keyword cType DataSetParam
 syn keyword cType Definition
 syn keyword cType DependentObject
@@ -1684,6 +1700,6 @@
 syn keyword cType ElementInput
 syn keyword cType ElementMatrix
+syn keyword cType ElementVector
 syn keyword cType Elements
-syn keyword cType ElementVector
 syn keyword cType ExponentialVariogram
 syn keyword cType ExternalResult
@@ -1692,10 +1708,9 @@
 syn keyword cType Friction
 syn keyword cType Gauss
-syn keyword cType GaussianVariogram
-syn keyword cType gaussobjects
 syn keyword cType GaussPenta
 syn keyword cType GaussSeg
 syn keyword cType GaussTetra
 syn keyword cType GaussTria
+syn keyword cType GaussianVariogram
 syn keyword cType GenericExternalResult
 syn keyword cType GenericOption
@@ -1714,5 +1729,4 @@
 syn keyword cType IssmDirectApplicInterface
 syn keyword cType IssmParallelDirectApplicInterface
-syn keyword cType krigingobjects
 syn keyword cType Load
 syn keyword cType Loads
@@ -1725,5 +1739,4 @@
 syn keyword cType Matice
 syn keyword cType Matlitho
-syn keyword cType matrixobjects
 syn keyword cType MatrixParam
 syn keyword cType Misfit
@@ -1738,6 +1751,6 @@
 syn keyword cType Observations
 syn keyword cType Option
+syn keyword cType OptionUtilities
 syn keyword cType Options
-syn keyword cType OptionUtilities
 syn keyword cType Param
 syn keyword cType Parameters
@@ -1753,11 +1766,11 @@
 syn keyword cType Regionaloutput
 syn keyword cType Results
+syn keyword cType RiftStruct
 syn keyword cType Riftfront
-syn keyword cType RiftStruct
 syn keyword cType SealevelGeometry
 syn keyword cType Seg
 syn keyword cType SegInput
+syn keyword cType SegRef
 syn keyword cType Segment
-syn keyword cType SegRef
 syn keyword cType SpcDynamic
 syn keyword cType SpcStatic
@@ -1778,4 +1791,8 @@
 syn keyword cType Vertex
 syn keyword cType Vertices
+syn keyword cType classes
+syn keyword cType gaussobjects
+syn keyword cType krigingobjects
+syn keyword cType matrixobjects
 syn keyword cType AdjointBalancethickness2Analysis
 syn keyword cType AdjointBalancethicknessAnalysis
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 27298)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 27299)
@@ -157,13 +157,13 @@
 	DamageStressUBoundEnum,
 	DebrisMinThicknessEnum,
-        DebrisNumRequestedOutputsEnum,
-        DebrisPenaltyFactorEnum,
-        DebrisRequestedOutputsEnum,
-        DebrisStabilizationEnum,
-        DebrisRemovalmodelEnum,
-        DebrisDisplacementmodelEnum,
-        DebrisRemovalSlopeThresholdEnum,
-        DebrisRemovalStressThresholdEnum,
-        DebrisPackingFractionEnum,
+	DebrisNumRequestedOutputsEnum,
+	DebrisPenaltyFactorEnum,
+	DebrisRequestedOutputsEnum,
+	DebrisStabilizationEnum,
+	DebrisRemovalmodelEnum,
+	DebrisDisplacementmodelEnum,
+	DebrisRemovalSlopeThresholdEnum,
+	DebrisRemovalStressThresholdEnum,
+	DebrisPackingFractionEnum,
 	DebugProfilingEnum,
 	DebrisThicknessEnum,
Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim	(revision 27298)
+++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim	(revision 27299)
@@ -155,5 +155,16 @@
 syn keyword juliaConstC DamageStressThresholdEnum
 syn keyword juliaConstC DamageStressUBoundEnum
+syn keyword juliaConstC DebrisMinThicknessEnum
+syn keyword juliaConstC DebrisNumRequestedOutputsEnum
+syn keyword juliaConstC DebrisPenaltyFactorEnum
+syn keyword juliaConstC DebrisRequestedOutputsEnum
+syn keyword juliaConstC DebrisStabilizationEnum
+syn keyword juliaConstC DebrisRemovalmodelEnum
+syn keyword juliaConstC DebrisDisplacementmodelEnum
+syn keyword juliaConstC DebrisRemovalSlopeThresholdEnum
+syn keyword juliaConstC DebrisRemovalStressThresholdEnum
+syn keyword juliaConstC DebrisPackingFractionEnum
 syn keyword juliaConstC DebugProfilingEnum
+syn keyword juliaConstC DebrisThicknessEnum
 syn keyword juliaConstC DomainDimensionEnum
 syn keyword juliaConstC DomainTypeEnum
@@ -591,4 +602,5 @@
 syn keyword juliaConstC TransientIsageEnum
 syn keyword juliaConstC TransientIsdamageevolutionEnum
+syn keyword juliaConstC TransientIsdebrisEnum
 syn keyword juliaConstC TransientIsesaEnum
 syn keyword juliaConstC TransientIsgiaEnum
@@ -1116,4 +1128,5 @@
 syn keyword juliaConstC VxAverageEnum
 syn keyword juliaConstC VxBaseEnum
+syn keyword juliaConstC VxDebrisEnum
 syn keyword juliaConstC VxEnum
 syn keyword juliaConstC VxMeshEnum
@@ -1123,4 +1136,5 @@
 syn keyword juliaConstC VyAverageEnum
 syn keyword juliaConstC VyBaseEnum
+syn keyword juliaConstC VyDebrisEnum
 syn keyword juliaConstC VyEnum
 syn keyword juliaConstC VyMeshEnum
@@ -1311,4 +1325,6 @@
 syn keyword juliaConstC DataSetParamEnum
 syn keyword juliaConstC DatasetInputEnum
+syn keyword juliaConstC DebrisAnalysisEnum
+syn keyword juliaConstC DebrisSolutionEnum
 syn keyword juliaConstC DefaultAnalysisEnum
 syn keyword juliaConstC DefaultCalvingEnum
@@ -1535,4 +1551,5 @@
 syn keyword juliaConstC SMBarmaEnum
 syn keyword juliaConstC SMBcomponentsEnum
+syn keyword juliaConstC SMBdebrisMLEnum
 syn keyword juliaConstC SMBd18opddEnum
 syn keyword juliaConstC SMBforcingEnum