Changeset 21409 for issm/trunk-jpl/test/Par/RoundSheetEISMINT.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/RoundSheetEISMINT.py (modified) (2 diffs)

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

@@ -4 +4 @@
 #Ok, start defining model parameters here
 print "      creating thickness"
-md.geometry.thickness=10.*numpy.ones((md.mesh.numberofvertices,1))
-md.geometry.base=numpy.zeros((md.mesh.numberofvertices,1))
+md.geometry.thickness=10.*numpy.ones((md.mesh.numberofvertices))
+md.geometry.base=numpy.zeros((md.mesh.numberofvertices))
 md.geometry.surface=md.geometry.base+md.geometry.thickness
 
 print "      creating drag"
-md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices,1)) 
-md.friction.p=numpy.ones((md.mesh.numberofelements,1))
-md.friction.q=numpy.ones((md.mesh.numberofelements,1))
+md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices)) 
+md.friction.p=numpy.ones((md.mesh.numberofelements))
+md.friction.q=numpy.ones((md.mesh.numberofelements))
 
 print "      creating temperatures"
 tmin=238.15    #K
 st=1.67*10**-2/1000.    #k/m
-radius=numpy.sqrt((md.mesh.x)**2+(md.mesh.y)**2).reshape(-1,1)
+radius=numpy.sqrt((md.mesh.x)**2+(md.mesh.y)**2)
 md.initialization.temperature=tmin+st*radius
-md.basalforcings.geothermalflux=4.2*10**-2*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.geothermalflux=4.2*10**-2*numpy.ones((md.mesh.numberofvertices))
 
 print "      creating flow law parameter"
-md.materials.rheology_B=6.81*10**7*numpy.ones((md.mesh.numberofvertices,1))    #to have the same B as the analytical solution 
-md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
+md.materials.rheology_B=6.81*10**7*numpy.ones((md.mesh.numberofvertices))    #to have the same B as the analytical solution 
+md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements))
 
 print "      creating surface mass balance"
@@ -32 +32 @@
 print "      creating velocities"
 constant=0.3
-md.inversion.vx_obs=constant/2.*md.mesh.x.reshape(-1,1)*(md.geometry.thickness)**-1
-md.inversion.vy_obs=constant/2.*md.mesh.y.reshape(-1,1)*(md.geometry.thickness)**-1
+md.inversion.vx_obs=constant/2.*md.mesh.x*(md.geometry.thickness)**-1
+md.inversion.vy_obs=constant/2.*md.mesh.y*(md.geometry.thickness)**-1
 md.inversion.vel_obs=numpy.sqrt((md.inversion.vx_obs)**2+(md.inversion.vy_obs)**2)
-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.pressure=numpy.zeros((md.mesh.numberofvertices,1))
+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.pressure=numpy.zeros((md.mesh.numberofvertices))
 
 #Deal with boundary conditions: