Changeset 16318

Timestamp:

10/07/13 16:03:10 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: getting rid of meshdimension

Location:

issm/trunk-jpl/src/m/boundaryconditions

Files:

• SetIceSheetBC.m (modified) (1 diff)
• SetIceSheetBC.py (modified) (1 diff)
• SetIceShelfBC.m (modified) (2 diffs)
• SetIceShelfBC.py (modified) (3 diffs)
• SetMarineIceSheetBC.m (modified) (1 diff)
• SetMarineIceSheetBC.py (modified) (1 diff)

issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.m ¶

@@ -53 +53 @@
 if (length(md.initialization.temperature)==md.mesh.numberofvertices),
         md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1);
-        pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
+        if isprop(md.mesh,'vertexonsurface')
+                pos=find(md.mesh.vertexonsurface);
+                md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
+        end
         if (length(md.basalforcings.geothermalflux)~=md.mesh.numberofvertices),
                 md.basalforcings.geothermalflux=50.*10^-3*ones(md.mesh.numberofvertices,1); %50 mW/m^2

issm/trunk-jpl/src/m/boundaryconditions/SetIceSheetBC.py ¶

@@ -54 +54 @@
         if isinstance(md.initialization.temperature,numpy.ndarray) and numpy.size(md.initialization.temperature,axis=0)==md.mesh.numberofvertices:
                 md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-#               pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
-                pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
-                md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
+                if hasattr(md.mesh,'vertexonsurface'):
+                        pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
+                        md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
                 if not isinstance(md.basalforcings.geothermalflux,numpy.ndarray) or not numpy.size(md.basalforcings.geothermalflux)==md.mesh.numberofvertices:
                         md.basalforcings.geothermalflux=50.*10**-3*numpy.ones((md.mesh.numberofvertices,1))    #50 mW/m^2

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.m ¶

@@ -38 +38 @@
 
 %First find segments that are not completely on the front
-if(md.mesh.dimension==2),
+if strcmp(meshtype(md.mesh),'3D'),
+        numbernodesfront=4;
+elseif strcmp(meshtype(md.mesh),'2Dhorizontal'),
         numbernodesfront=2;
-else 
-        numbernodesfront=4;
+else
+        error('mesh type not supported yet');
 end
 segmentsfront=md.mask.ice_levelset(md.mesh.segments(:,1:numbernodesfront))==0;
@@ -84 +86 @@
 if (length(md.initialization.temperature)==md.mesh.numberofvertices),
         md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1);
-        pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
+        if isprop(md.mesh,'vertexonsurface'),
+                pos=find(md.mesh.vertexonsurface);
+                md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
+        end
         if (length(md.basalforcings.geothermalflux)~=md.mesh.numberofvertices),
                 md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1);

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py ¶

@@ -2 +2 @@
 import numpy
 from ContourToMesh import *
+from MatlabFuncs import *
 
 def SetIceShelfBC(md,icefrontfile=''):
@@ -43 +44 @@
 
         #First find segments that are not completely on the front
-        if md.mesh.dimension==2:
-                numbernodesfront=2
+        if strcmp(md.mesh.meshtype(),'3D'):
+                numbernodesfront=4;
+        elif strcmp(md.mesh.meshtype(),'2Dhorizontal'):
+                numbernodesfront=2;
         else:
-                numbernodesfront=4
+                raise   error('mesh type not supported yet')
         if any(md.mask.ice_levelset<=0):
                 values=md.mask.ice_levelset[md.mesh.segments[:,0:-1]-1]
@@ -93 +96 @@
         if isinstance(md.initialization.temperature,numpy.ndarray) and numpy.size(md.initialization.temperature,axis=0)==md.mesh.numberofvertices:
                 md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-#               pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
-                pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
-                md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
+                if hasattr(md.mesh,'vertexonsurface'):
+                        pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
+                        md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
                 if not isinstance(md.basalforcings.geothermalflux,numpy.ndarray) or not numpy.size(md.basalforcings.geothermalflux,axis=0)==md.mesh.numberofvertices:
                         md.basalforcings.geothermalflux=numpy.zeros((md.mesh.numberofvertices,1))

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m ¶

@@ -102 +102 @@
 if (length(md.initialization.temperature)==md.mesh.numberofvertices),
         md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1);
-        pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
+        if isprop(md.mesh,'vertexonsurface'),
+                pos=find(md.mesh.vertexonsurface);
+                md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
+        end
         if (length(md.basalforcings.geothermalflux)~=md.mesh.numberofvertices),
                 md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1);

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py ¶

@@ -101 +101 @@
         if isinstance(md.initialization.temperature,numpy.ndarray) and numpy.size(md.initialization.temperature,axis=0)==md.mesh.numberofvertices:
                 md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-#               pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
-                pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
-                md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
+                if hasattr(md.mesh,'vertexonsurface'):
+                        pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
+                        md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
                 if not isinstance(md.basalforcings.geothermalflux,numpy.ndarray) or not numpy.size(md.basalforcings.geothermalflux,axis=0)==md.mesh.numberofvertices:
                         md.basalforcings.geothermalflux=numpy.zeros((md.mesh.numberofvertices,1))