Changeset 23831

Timestamp:

04/08/19 16:08:02 (6 years ago)

Author:

kruegern

Message:

CHG: added a few minor changes, fixed minor runme bug

Location:

issm/trunk-jpl

Files:

• src/m/classes/geometry.py (modified) (1 diff)
• test/NightlyRun/runme.py (modified) (1 diff)
• test/Par/Pig.py (modified) (2 diffs)

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

@@ -57 +57 @@
                         if solution=='TransientSolution' and md.transient.isgroundingline:
                                 md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                                if np.any(self.bed > self.base):
+                                    md.checkmessage('base<bed on one or more vertex')
+                                pos = np.where(md.mask.groundedice_levelset > 0)
+                                if np.any(np.abs(self.bed[pos]-self.base[pos]>10**-9):
+                                    md.checkmessage('equality base=bed on grounded ice violated')
+                                md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
 
                 return md

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -252 +252 @@
                 args = parser.parse_args()
 
-                md = runme([args.id, args.include_name], [args.exclude, args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs
+                md = runme([args.id, args.include_name], [args.exclude, args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
 
                 exit(md)

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

@@ -18 +18 @@
 surface   = numpy.array(archread('../Data/Pig.arch','surface'))
 thickness = numpy.array(archread('../Data/Pig.arch','thickness'))
+bed       = numpy.array(archread('../Data/Pig.arch','bed'))
 
 md.inversion.vx_obs   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y)[0][:,0]
@@ -24 +25 @@
 md.geometry.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)[0][:,0]
 md.geometry.base=md.geometry.surface-md.geometry.thickness
+md.geometry.bed =md.geometry.base
+pos = np.where(md.mask.groundedice_levelset<0)
+md.geometry.bed[pos] =InterpFromMeshToMesh2d(index,x,y,bed,md.mesh.x[pos],md.mesh.y[pos])
 md.initialization.vx=md.inversion.vx_obs
 md.initialization.vy=md.inversion.vy_obs