Changeset 20910


Ignore:
Timestamp:
07/14/16 10:07:53 (9 years ago)
Author:
bdef
Message:

CHG:fixing and/or harmonizing wrappers calls

Location:
issm/trunk-jpl/src/m
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

    r19527 r20910  
    2626                if not os.path.exists(icefrontfile):
    2727                        raise IOError("SetIceShelfBC error message: ice front file '%s' not found." % icefrontfile)
    28                 [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
     28                nodeinsideicefront=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
    2929                nodeonicefront=numpy.logical_and(md.mesh.vertexonboundary,nodeinsideicefront.reshape(-1))
    3030        else:

  • issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py

    r19527 r20910  
    2828                if not os.path.exists(icefrontfile):
    2929                        raise IOError("SetMarineIceSheetBC error message: ice front file '%s' not found." % icefrontfile)
    30                 [incontour,dum]=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
     30                incontour=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
    3131                vertexonicefront=numpy.logical_and(md.mesh.vertexonboundary,incontour.reshape(-1))
    3232        else:

  • issm/trunk-jpl/src/m/classes/adinversion.py

    r20896 r20910  
    7373                        return
    7474
    75                 if not IssmConfig('_HAVE_M1QN3_'):
     75                if not IssmConfig('_HAVE_M1QN3_')[0]:
    7676                        md = checkmessage(md,['M1QN3 has not been installed, ISSM needs to be reconfigured and recompiled with AD'])
    7777

  • issm/trunk-jpl/src/m/classes/dependent.py

    r20002 r20910  
    4444                        #process the file and retrieve segments
    4545                        mesh=options.getfieldvalue('mesh')
    46                         self.segments=MeshProfileIntersection(mesh.elements,mesh.x,mesh.y,self.exp)
     46                        self.segments=MeshProfileIntersection(mesh.elements,mesh.x,mesh.y,self.exp)[0]
    4747        # }}}
    4848        def __repr__(self):    # {{{

  • issm/trunk-jpl/src/m/classes/model.py

    r20785 r20910  
    395395                #recreate segments
    396396                if md1.mesh.__class__.__name__=='mesh2d':
    397                         [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices)
    398                         [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)
     397                        md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices)[0]
     398                        md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)[0]
    399399                        md2.mesh.segments=contourenvelope(md2)
    400400                        md2.mesh.vertexonboundary=numpy.zeros(numberofvertices2,bool)
    … …  
    402402                else:
    403403                        #First do the connectivity for the contourenvelope in 2d
    404                         [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d)
    405                         [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity)
     404                        md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d)[0]
     405                        md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity)[0]
    406406                        segments=contourenvelope(md2)
    407407                        md2.mesh.vertexonboundary=numpy.zeros(numberofvertices2/md2.mesh.numberoflayers,bool)
    … …  
    409409                        md2.mesh.vertexonboundary=numpy.tile(md2.mesh.vertexonboundary,md2.mesh.numberoflayers)
    410410                        #Then do it for 3d as usual
    411                         [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices)
    412                         [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)
     411                        md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices)[0]
     412                        md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity)[0]
    413413
    414414                #Boundary conditions: Dirichlets on new boundary

  • issm/trunk-jpl/src/m/classes/taoinversion.py

    r20896 r20910  
    9090
    9191                #minimization algorithm
    92                 PETSCMAJOR = IssmConfig('_PETSC_MAJOR_')
    93                 PETSCMINOR = IssmConfig('_PETSC_MINOR_')
     92                PETSCMAJOR = IssmConfig('_PETSC_MAJOR_')[0]
     93                PETSCMINOR = IssmConfig('_PETSC_MINOR_')[0]
    9494                if(PETSCMAJOR>3 or (PETSCMAJOR==3 and PETSCMINOR>=5)):
    9595                        self.algorithm = 'blmvm';
    … …  
    122122                if not self.control:
    123123                        return md
    124                 if not IssmConfig('_HAVE_TAO_'):
     124                if not IssmConfig('_HAVE_TAO_')[0]:
    125125                        md = checkmessage(md,['TAO has not been installed, ISSM needs to be reconfigured and recompiled with TAO'])
    126126
    … …  
    141141
    142142
    143                 PETSCMAJOR = IssmConfig('_PETSC_MAJOR_')
    144                 PETSCMINOR = IssmConfig('_PETSC_MINOR_')
     143                PETSCMAJOR = IssmConfig('_PETSC_MAJOR_')[0]
     144                PETSCMINOR = IssmConfig('_PETSC_MINOR_')[0]
    145145                if(PETSCMAJOR>3 or (PETSCMAJOR==3 and PETSCMINOR>=5)):
    146146                        md = checkfield(md,'fieldname','inversion.algorithm','values',{'blmvm','cg','lmvm'})

  • issm/trunk-jpl/src/m/classes/toolkits.py

    r20045 r20910  
    4848
    4949                #Convert analysis from enum to string
    50                 [analysis]=EnumToString(analysis)
     50                analysis=EnumToString(analysis)[0]
    5151
    5252                #Create dynamic property if property does not exist yet

  • issm/trunk-jpl/src/m/geometry/FlagElements.py

    r17480 r20910  
    4747                        else:
    4848                                #ok, flag elements
    49                                 [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3].copy(),md.mesh.x,md.mesh.y,region,'element',1)
     49                                flag=ContourToMesh(md.mesh.elements[:,0:3].copy(),md.mesh.x,md.mesh.y,region,'element',1)
    5050                                flag=flag.astype(bool)
    5151

  • issm/trunk-jpl/src/m/interp/SectionValues.py

    r19865 r20910  
    127127
    128128                #Interpolation of data on specified points
    129                 data_interp=InterpFromMeshToMesh3d(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,data,X3,Y3,Z3,npy.nan)
     129                data_interp=InterpFromMeshToMesh3d(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,data,X3,Y3,Z3,npy.nan)[0]
    130130       
    131131                #build outputs

  • issm/trunk-jpl/src/m/mesh/bamg.py

    r20907 r20910  
    9393                        #Checks that all holes are INSIDE the principle domain outline
    9494                        if i:
    95                                 flags=ContourToNodes(domaini['x'],domaini['y'],domainfile,0)
     95                                flags=ContourToNodes(domaini['x'],domaini['y'],domainfile,0)[0]
    9696                                if numpy.any(numpy.logical_not(flags)):
    9797                                        raise RuntimeError("bamg error message: All holes should be strictly inside the principal domain")
    … …  
    119119
    120120                                #detect whether all points of the rift are inside the domain
    121                                 flags=ContourToNodes(rifti['x'],rifti['y'],domain[0],0)
     121                                flags=ContourToNodes(rifti['x'],rifti['y'],domain[0],0)[0]
    122122                                if numpy.all(numpy.logical_not(flags)):
    123123                                        raise RuntimeError("one rift has all its points outside of the domain outline")
    … …  
    231231
    232232                        #only keep those inside
    233                         flags=ContourToNodes(track[:,0],track[:,1],domainfile,0)
     233                        flags=ContourToNodes(track[:,0],track[:,1],domainfile,0)[0]
    234234                        track=track[numpy.nonzero(flags),:]
    235235
    … …  
    251251
    252252                        #only keep those inside
    253                         flags=ContourToNodes(requiredvertices[:,0],requiredvertices[:,1],domainfile,0)
     253                        flags=ContourToNodes(requiredvertices[:,0],requiredvertices[:,1],domainfile,0)[0]
    254254                        requiredvertices=requiredvertices[numpy.nonzero(flags)[0],:]
    255255                        #Add all points to bamg_geometry
    … …  
    313313
    314314        #call Bamg
    315         [bamgmesh_out,bamggeom_out]=BamgMesher(bamg_mesh.__dict__,bamg_geometry.__dict__,bamg_options)
     315        bamgmesh_out,bamggeom_out=BamgMesher(bamg_mesh.__dict__,bamg_geometry.__dict__,bamg_options)
    316316
    317317        # plug results onto model

  • issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py

    r17558 r20910  
    2222
    2323        #Call MEX file
    24         [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct]=TriMeshProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers)
     24        md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct=TriMeshProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers)
    2525        md.mesh.elements=md.mesh.elements.astype(int)
    2626        md.mesh.x=md.mesh.x.reshape(-1)
    … …  
    4444
    4545        #In case we have rifts that open up the domain outline, we need to open them:
    46         [flags,dum]=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,domainoutline,'node',0)
     46        flags=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,domainoutline,'node',0)
    4747        found=0
    4848        for rift in md.rifts.riftstruct:

  • issm/trunk-jpl/src/m/mesh/squaremesh.py

    r18005 r20910  
    7171
    7272        #Now, build the connectivity tables for this mesh.
    73         [md.mesh.vertexconnectivity]=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices)
    74         [md.mesh.elementconnectivity]=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)
     73        md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices)[0]
     74        md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)[0]
    7575
    7676        return md

  • issm/trunk-jpl/src/m/mesh/triangle.py

    r17558 r20910  
    4545        #Mesh using TriMesh
    4646        md.mesh=mesh2d()
    47         [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers]=TriMesh(domainname,riftname,area)
     47        md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers=TriMesh(domainname,riftname,area)
    4848        md.mesh.elements=md.mesh.elements.astype(int)
    4949        md.mesh.segments=md.mesh.segments.astype(int)
    … …  
    5757
    5858        #Now, build the connectivity tables for this mesh.
    59         [md.mesh.vertexconnectivity] = NodeConnectivity(md.mesh.elements, md.mesh.numberofvertices)
    60         [md.mesh.elementconnectivity] = ElementConnectivity(md.mesh.elements, md.mesh.vertexconnectivity)
     59        md.mesh.vertexconnectivity = NodeConnectivity(md.mesh.elements, md.mesh.numberofvertices)[0]
     60        md.mesh.elementconnectivity = ElementConnectivity(md.mesh.elements, md.mesh.vertexconnectivity)[0]
    6161
    6262        return md

  • issm/trunk-jpl/src/m/parameterization/contourenvelope.py

    r17687 r20910  
    4141        #Computing connectivity
    4242        if numpy.size(md.mesh.vertexconnectivity,axis=0)!=md.mesh.numberofvertices and numpy.size(md.mesh.vertexconnectivity,axis=0)!=md.mesh.numberofvertices2d:
    43                 [md.mesh.vertexconnectivity]=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices)
     43                md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices)[0]
    4444        if numpy.size(md.mesh.elementconnectivity,axis=0)!=md.mesh.numberofelements and numpy.size(md.mesh.elementconnectivity,axis=0)!=md.mesh.numberofelements2d:
    45                 [md.mesh.elementconnectivity]=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)
     45                md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity)[0]
    4646
    4747        #get nodes inside profile

  • issm/trunk-jpl/src/m/parameterization/setmask.py

    r17868 r20910  
    6464                        raise IOError("setmask error message: ice domain file '%s' not found." % icedomainfile)
    6565                #use contourtomesh to set ice values inside ice domain
    66                 [vertexinsideicedomain,elementinsideicedomain]=ContourToMesh(elements,x,y,icedomainfile,'node',1)
     66                vertexinsideicedomain,elementinsideicedomain=ContourToMesh(elements,x,y,icedomainfile,'node',1)
    6767                md.mask.ice_levelset[numpy.nonzero(vertexinsideicedomain)[0]] = -1.
    6868        else:

  • issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py

    r20900 r20910  
    6060
    6161                if not isinstance(md.private.solution,(str,unicode)):
    62                         [md.private.solution]=EnumToString(md.private.solution)
     62                        md.private.solution=EnumToString(md.private.solution)[0]
    6363                md=postqmu(md)
    6464                os.chdir('..')

  • issm/trunk-jpl/src/m/solve/solve.py

    r20120 r20910  
    8787        if solutionenum == FlaimSolutionEnum():
    8888                md=flaim_sol(md,options)
    89                 [md.private.solution]=EnumToString(solutionenum)
     89                md.private.solution=EnumToString(solutionenum)[0]
    9090                return md
    9191
Note: See TracChangeset for help on using the changeset viewer.