Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologydc.m	(revision 14770)
+++ /issm/trunk-jpl/src/m/classes/hydrologydc.m	(revision 14771)
@@ -49,5 +49,7 @@
 			
 		%Early return
-			if ~ismember(HydrologyAnalysisEnum(),analyses), return; end
+			if ~ismember(HydrologyDCInefficientAnalysisEnum(),analyses) & ~ismember(HydrologyDCEfficientAnalysisEnum(),analyses),
+				return;
+			end
 			
 			md = checkfield(md,'hydrology.spcsediment_head','forcing',1);
@@ -104,5 +106,5 @@
 			WriteData(fid,'object',obj,'fieldname','epl_thickness','format','Double');
 			WriteData(fid,'object',obj,'fieldname','epl_transmitivity','format','Double');
-      WriteData(fid,'object',obj,'fieldname','isefficientlayer','format','Boolean');
+			WriteData(fid,'object',obj,'fieldname','isefficientlayer','format','Boolean');
 			
 		end % }}}
Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologyshreve.m	(revision 14770)
+++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.m	(revision 14771)
@@ -40,5 +40,7 @@
 
 			%Early return
-			if ~ismember(HydrologyAnalysisEnum(),analyses), return; end
+			if ~ismember(HydrologyShreveAnalysisEnum(),analyses)
+				return;
+			end
 
 			md = checkfield(md,'hydrology.spcwatercolumn','forcing',1);
Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 14770)
+++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 14771)
@@ -54,5 +54,5 @@
 
 		#Early return
-		if HydrologyAnalysisEnum() not in analyses:
+		if HydrologyShreveAnalysisEnum() not in analyses:
 			return md
 
Index: /issm/trunk-jpl/src/m/classes/initialization.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/initialization.m	(revision 14770)
+++ /issm/trunk-jpl/src/m/classes/initialization.m	(revision 14771)
@@ -57,12 +57,19 @@
 				md = checkfield(md,'initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices 1]);
 			end
-			if ismember(HydrologyAnalysisEnum(),analyses),
+			if ismember(HydrologyShreveAnalysisEnum(),analyses),
+				if isa(md.hydrology,'hydrologyshreve'),
+					md = checkfield(md,'initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices 1]);
+				end
+			end
+			if ismember(HydrologyDCInefficientAnalysisEnum(),analyses),
 				if isa(md.hydrology,'hydrologydc'),
 					md = checkfield(md,'initialization.sediment_head','NaN',1,'size',[md.mesh.numberofvertices 1]);
+				end
+			end
+			if ismember(HydrologyDCEfficientAnalysisEnum(),analyses),
+				if isa(md.hydrology,'hydrologydc'),
 					if md.hydrology.isefficientlayer==1,
 						md = checkfield(md,'initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices 1]);
-		      end
-				else
-					md = checkfield(md,'initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices 1]);
+					end
 				end
 			end
Index: /issm/trunk-jpl/src/m/classes/initialization.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/initialization.py	(revision 14770)
+++ /issm/trunk-jpl/src/m/classes/initialization.py	(revision 14771)
@@ -69,5 +69,5 @@
 		if (EnthalpyAnalysisEnum() in analyses and md.thermal.isenthalpy) or solution==EnthalpySolutionEnum():
 			md = checkfield(md,'initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices])
-		if HydrologyAnalysisEnum() in analyses:
+		if HydrologyShreveAnalysisEnum() in analyses:
 			md = checkfield(md,'initialization.watercolumn','NaN',1,'size',[md.mesh.numberofvertices])
 		return md
Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m
===================================================================
--- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m	(revision 14770)
+++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m	(revision 14771)
@@ -95,5 +95,5 @@
 	case HydrologySolutionEnum(),
 		numanalyses=3; 
-		analyses=[BedSlopeAnalysisEnum();SurfaceSlopeAnalysisEnum();HydrologyAnalysisEnum()];
+		analyses=[BedSlopeAnalysisEnum();SurfaceSlopeAnalysisEnum();HydrologyShreveAnalysisEnum();HydrologyDCInefficientAnalysisEnum();HydrologyDCEfficientAnalysisEnum()];
 
 	otherwise
Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py
===================================================================
--- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py	(revision 14770)
+++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py	(revision 14771)
@@ -56,5 +56,5 @@
 	elif solutiontype == HydrologySolutionEnum():
 		numanalyses=3 
-		analyses=[BedSlopeAnalysisEnum(),SurfaceSlopeAnalysisEnum(),HydrologyAnalysisEnum()]
+		analyses=[BedSlopeAnalysisEnum(),SurfaceSlopeAnalysisEnum(),HydrologyShreveAnalysisEnum(),HydrologyDCInefficientAnalysisEnum(),HydrologyDCEfficientAnalysisEnum()]
 
 	else: