Changeset 21280

Timestamp:

10/17/16 02:43:38 (8 years ago)

Author:

bdef

Message:

BUG: fixing extrusion issues

Location:

issm/trunk-jpl/src/m/classes

Files:

• hydrologydc.m (modified) (6 diffs)
• hydrologydc.py (modified) (1 diff)

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

@@ -37 +37 @@
   end
         methods
-                function self = extrude(self,md) % {{{
+    % {{{ function self = extrude(self,md) 
+                function self = extrude(self,md) 
                         self.spcsediment_head=project3d(md,'vector',self.spcsediment_head,'type','node','layer',1);
-                        self.mask_eplactive_node=project3d(md,'vector',self.mask_eplactive_node,'type','node','layer',1);
                         self.sediment_transmitivity=project3d(md,'vector',self.sediment_transmitivity,'type','node','layer',1);
                         self.basal_moulin_input=project3d(md,'vector',self.basal_moulin_input,'type','node','layer',1);
                         if(self.isefficientlayer==1);
                                 self.spcepl_head=project3d(md,'vector',self.spcepl_head,'type','node','layer',1);
-                        end
-                end % }}}
+        self.mask_eplactive_node=project3d(md,'vector',self.mask_eplactive_node,'type','node','layer',1);
+                        end
+                end 
+    % }}}
                 % {{{ function self = hydrologydc(varargin) 
                 function self = hydrologydc(varargin) 
@@ -64 +66 @@
                 end % }}}
                 % {{{ function self = setdefaultparameters(self) 
+
                 function self = setdefaultparameters(self) 
 
@@ -92 +95 @@
                         self.eplflip_lock             = 0;
                 end 
+
                 % }}}
                 % {{{ function md = checkconsistency(self,md,solution,analyses) 
+
                 function md = checkconsistency(self,md,solution,analyses) 
                         %Early return
@@ -138 +143 @@
                         end
                 end 
+
                 % }}}
                 % {{{ function disp(self)
+
                 function disp(self) 
                         disp(sprintf('   hydrology Dual Porous Continuum Equivalent parameters:'));
@@ -186 +193 @@
 
                 end 
+
                 % }}}
                 % {{{ function marshall(self,prefix,md,fid) 
+
                 function marshall(self,prefix,md,fid) 
                         WriteData(fid,prefix,'name','md.hydrology.model','data',1,'format','Integer');
@@ -225 +234 @@
                         end
                 end 
+
                 % }}}
         end

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

@@ -96 +96 @@
         def extrude(self,md): # {{{
                 self.spcsediment_head=project3d(md,'vector',self.spcsediment_head,'type','node','layer',1)
-                self.spcepl_head=project3d(md,'vector',self.spcepl_head,'type','node','layer',1)
-                self.mask_eplactive_node=project3d(md,'vector',self.mask_eplactive_node,'type','node','layer',1)
                 self.sediment_transmitivity=project3d(md,'vector',self.sediment_transmitivity,'type','node','layer',1)
                 self.basal_moulin_input=project3d(md,'vector',self.basal_moulin_input,'type','node','layer',1)
                 if self.isefficientlayer==1 :
                         self.spcepl_head=project3d(md,'vector',self.spcepl_head,'type','node','layer',1)
+                        self.mask_eplactive_node=project3d(md,'vector',self.mask_eplactive_node,'type','node','layer',1)
                 return self
         #}}}