Changeset 18578

Timestamp:

10/06/14 12:19:38 (10 years ago)

Author:

bdef

Message:

BUG:fixing colapsing of hydro

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.m (modified) (1 diff)
• model.py (modified) (5 diffs)

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

@@ -211 +211 @@
                         if ~isnan(md.initialization.vz),md.initialization.vz=DepthAverage(md,md.initialization.vz);end;
                         if ~isnan(md.initialization.vel),md.initialization.vel=DepthAverage(md,md.initialization.vel);end;
-                        if ~isnan(md.initialization.temperature),       md.initialization.temperature=DepthAverage(md,md.initialization.temperature);end;
+                        if ~isnan(md.initialization.temperature),md.initialization.temperature=DepthAverage(md,md.initialization.temperature);end;
                         if ~isnan(md.initialization.pressure),md.initialization.pressure=project2d(md,md.initialization.pressure,1);end;
-
+                        if ~isnan(md.initialization.sediment_head),md.initialization.sediment_head=project2d(md,md.initialization.sediment_head,1);end;
+                        if ~isnan(md.initialization.epl_head),md.initialization.epl_head=project2d(md,md.initialization.epl_head,1);end;
+                        if ~isnan(md.initialization.epl_thickness),md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1);end;
                         %gia
                         if ~isnan(md.gia.mantle_viscosity), md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1); end

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

@@ -30 +30 @@
 from groundingline import groundingline
 from hydrologyshreve import hydrologyshreve
+from hydrologydc import hydrologydc
 from masstransport import masstransport
 from thermal import thermal
@@ -80 +81 @@
 
                 self.balancethickness = balancethickness()
-                self.stressbalance       = stressbalance()
+                self.stressbalance    = stressbalance()
                 self.groundingline    = groundingline()
                 self.hydrology        = hydrologyshreve()
-                self.masstransport       = masstransport()
+                self.masstransport    = masstransport()
                 self.thermal          = thermal()
                 self.steadystate      = steadystate()
@@ -128 +129 @@
                         'steadystate',\
                         'transient',\
-                                  'gia',\
+                        'gia',\
                         'autodiff',\
                         'flaim',\
@@ -615 +616 @@
                 if not numpy.any(numpy.isnan(md.initialization.watercolumn)):
                         md.initialization.watercolumn=project3d(md,'vector',md.initialization.watercolumn,'type','node')
-
+                if not numpy.any(numpy.isnan(md.initialization.sediment_head)):
+                        md.initialization.sediment_head=project3d(md,'vector',md.initialization.sediment_head,'type','node','layer',1)
+                if not numpy.any(numpy.isnan(md.initialization.epl_head)):
+                        md.initialization.epl_head=project3d(md,'vector',md.initialization.epl_head,'type','node','layer',1)
+                if not numpy.any(numpy.isnan(md.initialization.epl_thickness)):
+                        md.initialization.epl_thickness=project3d(md,'vector',md.initialization.epl_thickness,'type','node','layer',1)
 
                 #bedinfo and surface info
@@ -653 +659 @@
                 md.stressbalance.loadingforce=project3d(md,'vector',md.stressbalance.loadingforce,'type','node')
                 md.masstransport.calvingrate=project3d(md,'vector',md.masstransport.calvingrate,'type','node')
+
+                # Hydrologydc variables
+                if hasattr(md.hydrology,'hydrologydc'):
+                        md.hydrology.spcsediment_head=project3d(md,'vector',md.hydrology.spcsediment_head,'type','node','layer',1)
+                        md.hydrology.spcepl_head=project3d(md,'vector',md.hydrology.spcepl_head,'type','node','layer',1)
+                        md.hydrology.mask_eplactive_node=project3d(md,'vector',md.hydrology.mask_eplactive_node,'type','node','layer',1)
+                        md.hydrology.sediment_transmitivity=project3d(md,'vector',md.hydrology.sediment_transmitivity,'type','node','layer',1)
+                        md.hydrology.basal_moulin_input=project3d(md,'vector',md.hydrology.basal_moulin_input,'type','node','layer',1)
 
                 #connectivity