Changeset 21409 for issm/trunk-jpl/test/Par/ISMIPF.py

Timestamp:

11/22/16 02:33:00 (8 years ago)

Author:

bdef

Message:

CHG: mooving to real vector initialisation (N) in place of (N,1)

File:

• issm/trunk-jpl/test/Par/ISMIPF.py (modified) (2 diffs)

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

@@ -6 +6 @@
 
 print "      creating thickness"
-md.geometry.surface=-md.mesh.x.reshape(-1,1)*numpy.tan(3.*numpy.pi/180.)
+md.geometry.surface=-md.mesh.x*numpy.tan(3.*numpy.pi/180.)
 #md.geometry.base=md.geometry.surface-1000.
-md.geometry.base=md.geometry.surface-1000.+100.*numpy.exp(-((md.mesh.x.reshape(-1,1)-numpy.max(md.mesh.x)/2.)**2+(md.mesh.y.reshape(-1,1)-numpy.max(md.mesh.y)/2.)**2)/(10000.**2))
+md.geometry.base=md.geometry.surface-1000.+100.*numpy.exp(-((md.mesh.x-numpy.max(md.mesh.x)/2.)**2+(md.mesh.y-numpy.max(md.mesh.y)/2.)**2)/(10000.**2))
 md.geometry.thickness=md.geometry.surface-md.geometry.base
 
 print "      creating drag"
-md.friction.coefficient=numpy.sqrt(md.constants.yts/(2.140373*10**-7*1000.))*numpy.ones((md.mesh.numberofvertices,1))
-md.friction.p=numpy.ones((md.mesh.numberofelements,1))
-md.friction.q=numpy.zeros((md.mesh.numberofelements,1))
+md.friction.coefficient=numpy.sqrt(md.constants.yts/(2.140373*10**-7*1000.))*numpy.ones((md.mesh.numberofvertices))
+md.friction.p=numpy.ones((md.mesh.numberofelements))
+md.friction.q=numpy.zeros((md.mesh.numberofelements))
 
 print "      creating flow law parameter"
-md.materials.rheology_B=1.4734*10**14*numpy.ones((md.mesh.numberofvertices,1))
-md.materials.rheology_n=1.*numpy.ones((md.mesh.numberofelements,1))
+md.materials.rheology_B=1.4734*10**14*numpy.ones((md.mesh.numberofvertices))
+md.materials.rheology_n=1.*numpy.ones((md.mesh.numberofelements))
 md.materials.rheology_law='None'
 
@@ -24 +24 @@
 #Create node on boundary first (because we cannot use mesh)
 md=SetIceSheetBC(md)
-md.stressbalance.spcvx=100.*numpy.ones((md.mesh.numberofvertices,1))
-md.initialization.vx=numpy.zeros((md.mesh.numberofvertices,1))
-md.initialization.vy=numpy.zeros((md.mesh.numberofvertices,1))
-md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
-md.initialization.vel=numpy.zeros((md.mesh.numberofvertices,1))
-md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
-md.initialization.temperature=255.*numpy.ones((md.mesh.numberofvertices,1))
+md.stressbalance.spcvx=100.*numpy.ones((md.mesh.numberofvertices))
+md.initialization.vx=numpy.zeros((md.mesh.numberofvertices))
+md.initialization.vy=numpy.zeros((md.mesh.numberofvertices))
+md.initialization.vz=numpy.zeros((md.mesh.numberofvertices))
+md.initialization.vel=numpy.zeros((md.mesh.numberofvertices))
+md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices))
+md.initialization.temperature=255.*numpy.ones((md.mesh.numberofvertices))
 pos=numpy.nonzero(numpy.logical_or(numpy.logical_or(md.mesh.x==numpy.min(md.mesh.x),md.mesh.x==numpy.max(md.mesh.x)),numpy.logical_or(md.mesh.y==numpy.min(md.mesh.y),md.mesh.y==numpy.max(md.mesh.y))))
-md.balancethickness.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.balancethickness.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices))
 md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos]
-md.masstransport.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.masstransport.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices))
 md.masstransport.spcthickness[pos]=md.geometry.thickness[pos]
-md.thermal.spctemperature=255.*numpy.ones((md.mesh.numberofvertices,1))
-md.basalforcings.geothermalflux=0.4*numpy.ones((md.mesh.numberofvertices,1))
+md.thermal.spctemperature=255.*numpy.ones((md.mesh.numberofvertices))
+md.basalforcings.geothermalflux=0.4*numpy.ones((md.mesh.numberofvertices))
 
 #Parallel options