Changeset 14771

Timestamp:

04/26/13 15:34:46 (12 years ago)

Author:

bdef

Message:

NEW: split HydrologyDC in 2 sub analyses, and removed HydrologyAnalsysEnum

Location:

issm/trunk-jpl/src/m

Files:

• classes/hydrologydc.m (modified) (2 diffs)
• classes/hydrologyshreve.m (modified) (1 diff)
• classes/hydrologyshreve.py (modified) (1 diff)
• classes/initialization.m (modified) (1 diff)
• classes/initialization.py (modified) (1 diff)
• consistency/ismodelselfconsistent.m (modified) (1 diff)
• consistency/ismodelselfconsistent.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/hydrologydc.m

@@ -49 +49 @@
                         
                 %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 +106 @@
                         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 % }}}

issm/trunk-jpl/src/m/classes/hydrologyshreve.m

@@ -40 +40 @@
 
                         %Early return
-                        if ~ismember(HydrologyAnalysisEnum(),analyses), return; end
+                        if ~ismember(HydrologyShreveAnalysisEnum(),analyses)
+                                return;
+                        end
 
                         md = checkfield(md,'hydrology.spcwatercolumn','forcing',1);

issm/trunk-jpl/src/m/classes/hydrologyshreve.py

@@ -54 +54 @@
 
                 #Early return
-                if HydrologyAnalysisEnum() not in analyses:
+                if HydrologyShreveAnalysisEnum() not in analyses:
                         return md
 

issm/trunk-jpl/src/m/classes/initialization.m

@@ -57 +57 @@
                                 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

issm/trunk-jpl/src/m/classes/initialization.py

@@ -69 +69 @@
                 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

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

@@ -95 +95 @@
         case HydrologySolutionEnum(),
                 numanalyses=3; 
-                analyses=[BedSlopeAnalysisEnum();SurfaceSlopeAnalysisEnum();HydrologyAnalysisEnum()];
+                analyses=[BedSlopeAnalysisEnum();SurfaceSlopeAnalysisEnum();HydrologyShreveAnalysisEnum();HydrologyDCInefficientAnalysisEnum();HydrologyDCEfficientAnalysisEnum()];
 
         otherwise

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py

@@ -56 +56 @@
         elif solutiontype == HydrologySolutionEnum():
                 numanalyses=3 
-                analyses=[BedSlopeAnalysisEnum(),SurfaceSlopeAnalysisEnum(),HydrologyAnalysisEnum()]
+                analyses=[BedSlopeAnalysisEnum(),SurfaceSlopeAnalysisEnum(),HydrologyShreveAnalysisEnum(),HydrologyDCInefficientAnalysisEnum(),HydrologyDCEfficientAnalysisEnum()]
 
         else: