Changeset 16005

Timestamp:

08/29/13 08:09:10 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing grounding line in py

Location:

issm/trunk-jpl

Files:

• src/m/classes/groundingline.py (modified) (1 diff)
• test/Par/RoundSheetShelf.py (modified) (3 diffs)

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

@@ -47 +47 @@
                         if numpy.any(numpy.isnan(md.geometry.bathymetry)):
                                 md.checkmessage("requesting grounding line migration, but bathymetry is absent!")
-                        pos=numpy.nonzero(md.mask.groundedice_levelset>0.)
+                        pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
                         if any(numpy.abs(md.geometry.bed[pos]-md.geometry.bathymetry[pos])>10**-10):
                                 md.checkmessage("bathymetry not equal to bed on grounded ice!")
-                        pos=numpy.nonzero(md.mask.groundedice_levelset<0.)
+                        pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0]
                         if any(md.geometry.bathymetry[pos]-md.geometry.bed[pos]>10**-9):
                                 md.checkmessage("bathymetry superior to bed on floating ice!")

issm/trunk-jpl/test/Par/RoundSheetShelf.py

@@ -20 +20 @@
 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
 
-pos=numpy.nonzero(md.mask.vertexongroundedice)
+pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
 md.geometry.bed[pos]=md.geometry.bed[pos]-300.*(radius[pos]-(rad-shelfextent))/(rad-shelfextent)
 md.geometry.surface=md.geometry.bed+md.geometry.thickness
@@ -71 +71 @@
 md.surfaceforcings.mass_balance=-10.*numpy.ones((md.mesh.numberofvertices,1))
 md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
-pos=numpy.nonzero(md.mask.vertexonfloatingice)
+pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
 md.basalforcings.melting_rate[pos]=10.
 md.basalforcings.geothermalflux=numpy.ones((md.mesh.numberofvertices,1))
@@ -104 +104 @@
 md.groundingline.migration='AgressiveMigration'
 md.geometry.bathymetry=copy.deepcopy(md.geometry.bed)
-pos=numpy.nonzero(md.mask.vertexonfloatingice)
+pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0]
 md.geometry.bathymetry[pos]=md.geometry.bed[pos]-900.