Changeset 17222

Timestamp:

02/05/14 17:14:02 (11 years ago)

Author:

jbondzio

Message:

ADD: IceMaskNodeActivationEnum. Ice mask for activation of nodes now marshalled during initialization of model

Location:

issm/trunk-jpl/src

Files:

• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/mask.m (modified) (1 diff)
• m/classes/mask.py (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -679 +679 @@
         TransientIslevelsetEnum,
         ExtrapolationVariableEnum,
+        IceMaskNodeActivationEnum,
         /*}}}*/
         MaximumNumberOfDefinitionsEnum

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -638 +638 @@
                 case TransientIslevelsetEnum : return "TransientIslevelset";
                 case ExtrapolationVariableEnum : return "ExtrapolationVariable";
+                case IceMaskNodeActivationEnum : return "IceMaskNodeActivation";
                 case MaximumNumberOfDefinitionsEnum : return "MaximumNumberOfDefinitions";
                 default : return "unknown";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -653 +653 @@
               else if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum;
               else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
+              else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
               else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
          else stage=7;

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

@@ -39 +39 @@
                         WriteData(fid,'object',obj,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
+
+                        % get mask of vertices of elements with ice
+                        isice=md.mask.ice_levelset<=0.;
+                        vlist = zeros(md.mesh.numberofvertices,1);
+                        pos=find(sum(isice(md.mesh.elements),2)>0);
+                        vlist(md.mesh.elements(pos,:))=1;
+                        WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
+
                 end % }}}
         end

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

@@ +1 @@
+import numpy
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
@@ -43 +44 @@
                 WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1)
+
+                # get mask of vertices of elements with ice
+                isice=numpy.array(md.mask.ice_levelset<=0.,int)
+                vlist = numpy.zeros((md.mesh.numberofvertices,1), dtype=int)
+                pos=numpy.nonzero(numpy.sum(isice[md.mesh.elements-1],axis=1))[0]
+                vlist[md.mesh.elements[pos,:]-1]=1
+                WriteData(fid,'data',vlist,'enum',IceMaskNodeActivationEnum(),'format','DoubleMat','mattype',1);
         # }}}

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

@@ -630 +630 @@
 def TransientIslevelsetEnum(): return StringToEnum("TransientIslevelset")[0]
 def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0]
+def IceMaskNodeActivationEnum(): return StringToEnum("IceMaskNodeActivation")[0]
 def MaximumNumberOfDefinitionsEnum(): return StringToEnum("MaximumNumberOfDefinitions")[0]