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

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

@@ -10 +10 @@
 
 #Start defining model parameters here
-x=md.mesh.x.reshape(-1,1)
-y=md.mesh.y.reshape(-1,1)
+x=md.mesh.x
+y=md.mesh.y
 xmin, xmax = min(x), max(x)
 ymin, ymax = min(y), max(y)
@@ -33 +33 @@
 #Mask
 md.mask.ice_levelset=x - alpha*Lx
-md.mask.groundedice_levelset= numpy.ones((md.mesh.numberofvertices,1))
+md.mask.groundedice_levelset= numpy.ones((md.mesh.numberofvertices))
 
 #Initial velocity 
-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))
 
 #Materials
-md.initialization.temperature=(273.15-5.)*numpy.ones((md.mesh.numberofvertices,1))
-md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1))
-md.initialization.watercolumn=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.temperature=(273.15-5.)*numpy.ones((md.mesh.numberofvertices))
+md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices))
+md.initialization.watercolumn=numpy.zeros((md.mesh.numberofvertices))
 md.materials.rheology_B=paterson(md.initialization.temperature)
-md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
+md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements))
 
 #Thermal
 md.thermal.isenthalpy=False
-md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
+md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices))
 
 #Groundingline
@@ -56 +56 @@
 
 #Surface mass balance and basal melting
-md.smb.mass_balance=0.3*numpy.ones((md.mesh.numberofvertices,1))
+md.smb.mass_balance=0.3*numpy.ones((md.mesh.numberofvertices))
 md.basalforcings.groundedice_melting_rate=md.smb.mass_balance
 md.basalforcings.floatingice_melting_rate=md.smb.mass_balance
 
 #Friction
-md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices,1))
+md.friction.coefficient=20.*numpy.ones((md.mesh.numberofvertices))
 md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
-md.friction.p=numpy.ones((md.mesh.numberofelements,1))
-md.friction.q=numpy.ones((md.mesh.numberofelements,1))
+md.friction.p=numpy.ones((md.mesh.numberofelements))
+md.friction.q=numpy.ones((md.mesh.numberofelements))
 
 #Transient
@@ -82 +82 @@
 
 #Masstransport
-md.calving.calvingrate=0.*numpy.ones((md.mesh.numberofvertices,1))
-md.calving.meltingrate=0.*numpy.ones((md.mesh.numberofvertices,1))
-md.levelset.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.calving.calvingrate=0.*numpy.ones((md.mesh.numberofvertices))
+md.calving.meltingrate=0.*numpy.ones((md.mesh.numberofvertices))
+md.levelset.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices))
 md.masstransport.stabilization=1.