Changeset 17523

Timestamp:

03/24/14 11:03:04 (11 years ago)

Author:

bdef

Message:

CHG: adding an initialization value for the epl thickness

Location:

issm/trunk-jpl/src

Files:

• c/analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• m/classes/initialization.m (modified) (4 diffs)
• m/classes/model.m (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -56 +56 @@
         iomodel->FetchDataToInput(elements,HydrologydcEplInitialThicknessEnum);
         iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum);
-        
-        elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum);
+        iomodel->FetchDataToInput(elements,HydrologydcEplThicknessEnum);
+        
+        //      elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum);
 
 }/*}}}*/

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

@@ -15 +15 @@
                 sediment_head = NaN;
                 epl_head      = NaN;
+                epl_thickness = NaN;
                 watercolumn   = NaN;
         end
@@ -73 +74 @@
                                 if isa(md.hydrology,'hydrologydc'),
                                         if md.hydrology.isefficientlayer==1,
-                                                md = checkfield(md,'fieldname','initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices 1]);
+                                                md = checkfield(md,'fieldname', ...
+                                                                                                                'initialization.epl_head','NaN',1,'size',[md.mesh.numberofvertices 1]);
+                                                md = checkfield(md,'fieldname','initialization.epl_thickness','NaN',1,'size',[md.mesh.numberofvertices 1]);
                                         end
                                 end
@@ -90 +93 @@
                         fielddisplay(obj,'sediment_head','sediment water head of subglacial system [m]');
                         fielddisplay(obj,'epl_head','epl water head of subglacial system [m]');
+                        fielddisplay(obj,'epl_thickness','epl layer thickness [m]');
                         fielddisplay(obj,'watercolumn','thickness of subglacial water [m]');
 
@@ -105 +109 @@
                         WriteData(fid,'data',obj.sediment_head,'format','DoubleMat','mattype',1,'enum',SedimentHeadEnum);
                         WriteData(fid,'data',obj.epl_head,'format','DoubleMat','mattype',1,'enum',EplHeadEnum);
+                        WriteData(fid,'data',obj.epl_thickness,'format','DoubleMat','mattype',1,'enum',HydrologydcEplThicknessEnum);
                         WriteData(fid,'data',obj.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum);
 

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

@@ -693 +693 @@
       if ~isnan(md.initialization.sediment_head),md.initialization.sediment_head=project3d(md,'vector',md.initialization.sediment_head,'type','node','layer',1);end;
       if ~isnan(md.initialization.epl_head),md.initialization.epl_head=project3d(md,'vector',md.initialization.epl_head,'type','node','layer',1);end;
+      if ~isnan(md.initialization.epl_thickness),md.initialization.epl_thickness=project3d(md,'vector',md.initialization.epl_thickness,'type','node','layer',1);end;
 
                         %bedinfo and surface info