Changeset 16170


Ignore:
Timestamp:
09/18/13 13:26:10 (12 years ago)
Author:
cborstad
Message:

BUG: numpy handle needed to call zeros function. Also cleaned up the import * commands since we're almost always only importing a single function within a module of the same name.

Location:
issm/trunk-jpl/test/Par
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/Par/79North.py

    r16167 r16170  
    22import inspect
    33import netCDF4
    4 from numpy import *
    5 from verbose import *
     4import numpy
     5from verbose import verbose
    66from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
    7 from paterson import *
    8 from SetMarineIceSheetBC import *
     7from paterson import paterson
     8from SetMarineIceSheetBC import SetMarineIceSheetBC
    99
    1010#Start defining model parameters here
    … …  
    3434
    3535#Damage
    36 md.damage.D=zeros((md.mesh.numberofvertices,1))
     36md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    3737
    3838#Friction
    … …  
    4343
    4444#Ice shelf melting and surface mass balance
    45 md.basalforcings.melting_rate=zeros((md.mesh.numberofvertices,1))
     45md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
    4646md.basalforcings.melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
    4747md.surfaceforcings.mass_balance=15*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/ISMIPA.py

    r16167 r16170  
    11import numpy
    2 from SetIceSheetBC import *
     2from SetIceSheetBC import SetIceSheetBC
    33
    44#Ok, start defining model parameters here
    … …  
    2020
    2121#Damage
    22 md.damage.D=zeros((md.mesh.numberofvertices,1))
     22md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2323
    2424print "      boundary conditions for stressbalance model"

  • issm/trunk-jpl/test/Par/ISMIPB.py

    r16167 r16170  
    11import numpy
    2 from SetIceSheetBC import *
     2from SetIceSheetBC import SetIceSheetBC
    33
    44#Ok, start defining model parameters here
    … …  
    2020
    2121#Damage
    22 md.damage.D=zeros((md.mesh.numberofvertices,1))
     22md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2323
    2424print "      boundary conditions for stressbalance model"

  • issm/trunk-jpl/test/Par/ISMIPC.py

    r16167 r16170  
    11import numpy
    2 from SetIceSheetBC import *
     2from SetIceSheetBC import SetIceSheetBC
    33
    44#Ok, start defining model parameters here
    … …  
    2121
    2222#Damage
    23 md.damage.D=zeros((md.mesh.numberofvertices,1))
     23md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2424
    2525print "      boundary conditions for stressbalance model:"

  • issm/trunk-jpl/test/Par/ISMIPD.py

    r16167 r16170  
    11import numpy
    2 from SetIceSheetBC import *
     2from SetIceSheetBC import SetIceSheetBC
    33
    44#Ok, start defining model parameters here
    … …  
    2020
    2121#Damage
    22 md.damage.D=zeros((md.mesh.numberofvertices,1))
     22md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2323
    2424print "      boundary conditions for stressbalance model:"

  • issm/trunk-jpl/test/Par/ISMIPE.py

    r16167 r16170  
    11import numpy
    22import netCDF4
    3 from SetIceSheetBC import *
     3from SetIceSheetBC import SetIceSheetBC
    44
    55#Ok, start defining model parameters here
    … …  
    3232
    3333#Damage
    34 md.damage.D=zeros((md.mesh.numberofvertices,1))
     34md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    3535
    3636print "      boundary conditions for stressbalance model:"

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

    r16167 r16170  
    11import numpy
    2 from SetIceSheetBC import *
     2from SetIceSheetBC import SetIceSheetBC
    33
    44#Ok, start defining model parameters here
    … …  
    2222
    2323#Damage
    24 md.damage.D=zeros((md.mesh.numberofvertices,1))
     24md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2525
    2626print "      boundary conditions for stressbalance model"

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

    r16167 r16170  
    22import inspect
    33import netCDF4
    4 from numpy import *
    5 from verbose import *
     4import numpy
     5from verbose import verbose
    66from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
    7 from paterson import *
    8 from SetMarineIceSheetBC import *
     7from paterson import paterson
     8from SetMarineIceSheetBC import SetMarineIceSheetBC
    99
    1010#Start defining model parameters here
    … …  
    2828md.initialization.vx=md.inversion.vx_obs
    2929md.initialization.vy=md.inversion.vy_obs
    30 md.initialization.vz=zeros((md.mesh.numberofvertices,1))
    31 md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
     30md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
     31md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
    3232
    3333#Materials
    … …  
    3838
    3939#Damage
    40 md.damage.D=zeros((md.mesh.numberofvertices,1))
     40md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    4141
    4242#Friction

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

    r16167 r16170  
    11import numpy
    2 from SetMarineIceSheetBC import *
     2from SetMarineIceSheetBC import SetMarineIceSheetBC
    33
    44#Ok, start defining model parameters here
    … …  
    2525
    2626#Damage
    27 md.damage.D=zeros((md.mesh.numberofvertices,1))
     27md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2828
    2929print "      creating surface mass balance"

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

    r16167 r16170  
    33import copy
    44import inspect
    5 from paterson import *
    6 from verbose import *
     5from paterson import paterson
     6from verbose import paterson
    77
    88#Start defining model parameters here
    … …  
    6969
    7070#Damage
    71 md.damage.D=zeros((md.mesh.numberofvertices,1))
     71md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    7272
    7373#Surface mass balance and basal melting

  • issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py

    r16167 r16170  
    11import numpy
    2 from SetMarineIceSheetBC import *
     2from SetMarineIceSheetBC import SetMarineIceSheetBC
    33
    44print "      creating thickness"
    … …  
    2929
    3030#Damage
    31 md.damage.D=zeros((md.mesh.numberofvertices,1))
     31md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    3232
    3333print "      creating surface mass balance"

  • issm/trunk-jpl/test/Par/SquareEISMINT.py

    r16167 r16170  
    11import numpy
    2 from SetMarineIceSheetBC import *
     2from SetMarineIceSheetBC import SetMarineIceSheetBC
    33
    44#Ok, start defining model parameters here
    … …  
    3030
    3131#Damage
    32 md.damage.D=zeros((md.mesh.numberofvertices,1))
     32md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    3333
    3434print "      creating surface mass balance"

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.py

    r16167 r16170  
    33import numpy
    44import inspect
    5 from verbose import *
     5from verbose import verbose
    66from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
    7 from paterson import *
    8 from SetIceSheetBC import *
     7from paterson import paterson
     8from SetIceSheetBC import SetIceSheetBC
    99
    1010#Start defining model parameters here
    … …  
    4141
    4242#Damage
    43 md.damage.D=zeros((md.mesh.numberofvertices,1))
     43md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    4444
    4545#Friction

  • issm/trunk-jpl/test/Par/SquareSheetShelf.py

    r16167 r16170  
    22import inspect
    33import netCDF4
    4 from numpy import *
    5 from verbose import *
     4import numpy
     5from verbose import verbose
    66from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
    7 from paterson import *
    8 from SetMarineIceSheetBC import *
     7from paterson import paterson
     8from SetMarineIceSheetBC import SetMarineIceSheetBC
    99
    1010#Start defining model parameters here
    … …  
    3535[md.initialization.vx]  = InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
    3636[md.initialization.vy]  = InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
    37 md.initialization.vz=zeros((md.mesh.numberofvertices,1))
    38 md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
     37md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
     38md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
    3939
    4040#Materials
    … …  
    4444
    4545#Damage
    46 md.damage.D=zeros((md.mesh.numberofvertices,1))
     46md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    4747
    4848#Accumulation and melting

  • issm/trunk-jpl/test/Par/SquareShelf.py

    r16167 r16170  
    22import inspect
    33import netCDF4
    4 from numpy import *
    5 from verbose import *
     4import numpy
     5from verbose import verbose
    66from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
    7 from paterson import *
    8 from SetIceShelfBC import *
     7from paterson import paterson
     8from SetIceShelfBC import SetIceShelfBC
    99
    1010#Start defining model parameters here
    … …  
    3939[md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
    4040[md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
    41 md.initialization.vz=zeros((md.mesh.numberofvertices,1))
    42 md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
     41md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
     42md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
    4343
    4444#dbg - begin
    … …  
    6060
    6161#Damage
    62 md.damage.D=zeros((md.mesh.numberofvertices,1))
     62md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    6363
    6464#Friction

  • issm/trunk-jpl/test/Par/SquareShelf2.py

    r16167 r16170  
    22import inspect
    33import netCDF4
    4 from numpy import *
    5 from verbose import *
     4import numpy
     5from verbose import verbose
    66from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
    7 from paterson import *
    8 from SetIceShelfBC import *
     7from paterson import paterson
     8from SetIceShelfBC import SetIceShelfBC
    99
    1010#Start defining model parameters here
    … …  
    3939[md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
    4040[md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
    41 md.initialization.vz=zeros((md.mesh.numberofvertices,1))
    42 md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
     41md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
     42md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
    4343
    4444#dbg - begin
    … …  
    6060
    6161#Damage
    62 md.damage.D=zeros((md.mesh.numberofvertices,1))
     62md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    6363
    6464#Friction

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.py

    r16167 r16170  
    33import numpy
    44import inspect
    5 from verbose import *
     5from verbose import verbose
    66from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
    7 from paterson import *
    8 from SetIceShelfBC import *
     7from paterson import paterson
     8from SetIceShelfBC import SetIceShelfBC
    99
    1010#Start defining model parameters here
    … …  
    4141
    4242#Damage
    43 md.damage.D=zeros((md.mesh.numberofvertices,1))
     43md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    4444
    4545#Surface mass balance and basal melting

  • issm/trunk-jpl/test/Par/SquareThermal.py

    r16167 r16170  
    11import numpy
    2 from paterson import *
    3 from SetMarineIceSheetBC import *
     2from paterson import paterson
     3from SetMarineIceSheetBC import SetMarineIceSheetBC
    44
    55#Ok, start defining model parameters here
    … …  
    3232
    3333#Damage
    34 md.damage.D=zeros((md.mesh.numberofvertices,1))
     34md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    3535
    3636print "      creating surface mass balance"
Note: See TracChangeset for help on using the changeset viewer.