Changeset 16852

Timestamp:

11/21/13 11:27:06 (11 years ago)

Author:

bdef

Message:

CHG: Adding an element active mask for the EPL

Location:

issm/trunk-jpl/src/m

Files:

• enum/EnumDefinitions.py (modified) (1 diff)
• enum/HydrologydcMaskEplactiveEltEnum.m (added)
• enum/HydrologydcMaskEplactiveNodeEnum.m (added)
• shp/Shp2Exp.m (modified) (1 diff)

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -110 +110 @@
 def HydrologydcWaterCompressibilityEnum(): return StringToEnum("HydrologydcWaterCompressibility")[0]
 def HydrologydcSpceplHeadEnum(): return StringToEnum("HydrologydcSpceplHead")[0]
-def HydrologydcMaskEplactiveEnum(): return StringToEnum("HydrologydcMaskEplactive")[0]
+def HydrologydcMaskEplactiveNodeEnum(): return StringToEnum("HydrologydcMaskEplactiveNode")[0]
+def HydrologydcMaskEplactiveEltEnum(): return StringToEnum("HydrologydcMaskEplactiveElt")[0]
 def HydrologydcEplCompressibilityEnum(): return StringToEnum("HydrologydcEplCompressibility")[0]
 def HydrologydcEplPorosityEnum(): return StringToEnum("HydrologydcEplPorosity")[0]

issm/trunk-jpl/src/m/shp/Shp2Exp.m

@@ -28 +28 @@
                         exp(end).closed=1;
                         exp(end).name=num2str(shp(i).id);
+                elseif strcmpi(shp(i).Geometry,'Point'),
+                                x=shp(i).X; y=shp(i).Y;
+
+                                exp(end+1).x=x;
+                                exp(end).y=y;
+                                exp(end).nods=length(x);
+                                exp(end).density=1;
+                                exp(end).closed=1;
+                                %exp(end).name=num2str(shp(i).id);
                 end
         end