Changeset 13070


Ignore:
Timestamp:
08/16/12 15:28:33 (13 years ago)
Author:
jschierm
Message:

CHG: Test updates for python.

Location:
issm/trunk-jpl/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/test/NightlyRun/test101.py

    r12889 r13070  
    1414md=setflowequation(md,'macayeal','all')
    1515md.cluster=generic('name',oshostname(),'np',3)
    16 md.diagnostic.requested_outputs=StressTensorEnum
    17 md=solve(md,DiagnosticSolutionEnum)
     16md.diagnostic.requested_outputs=StressTensorEnum()
     17md=solve(md,DiagnosticSolutionEnum())
    1818
    1919#Fields and tolerances to track changes
  • issm/trunk-jpl/test/Par/SquareShelfConstrained.py

    r12853 r13070  
    22from verbose import *
    33import scipy.io as matio
    4 import InterpFromMeshToMesh2d as im
    5 from   paterson import  *
     4from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
     5from paterson import  *
    66from SetIceShelfBC import *
    77import inspect
     8import os.path
    89
    910#Start defining model parameters here
     
    2930index=reshape(index.T,(len(index),3),order='F')
    3031
    31 md.initialization.vx = im.InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)
    32 md.initialization.vy = im.InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
     32[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)
     33[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
    3334md.initialization.vz = zeros(md.mesh.numberofvertices)
    3435md.initialization.pressure = zeros(md.mesh.numberofvertices)
     
    6263#Change name so that no tests have the same name
    6364if len(inspect.stack()) > 2:
    64     md.miscellaneous.name = inspect.stack()[2][1].split('.')[0]
     65        md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0]
    6566
Note: See TracChangeset for help on using the changeset viewer.