Changeset 24890


Ignore:
Timestamp:
05/22/20 10:58:21 (5 years ago)
Author:
jdquinn
Message:

CHG: Applied changes from MATLAB -> Python

Location:
issm/trunk-jpl/test/NightlyRun
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/test2002.py

    r24862 r24890  
    4040
    4141#mask:
    42 md.mask = maskpsl()  # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset
    4342mask = gmtmask(md.mesh.lat, md.mesh.long)
    44 
    4543icemask = np.ones((md.mesh.numberofvertices))
    4644pos = np.where(mask == 0)[0]
    … …  
    4947icemask[md.mesh.elements[pos, :].astype(int) - 1] = -1
    5048md.mask.ice_levelset = icemask
    51 md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices))
    52 pos = np.where(md.mask.ice_levelset == 1)
    53 md.mask.ocean_levelset[pos] = 1
     49md.mask.ocean_levelset = -icemask
    5450
    5551#make sure that the ice level set is all inclusive:

  • issm/trunk-jpl/test/NightlyRun/test2003.py

    r24862 r24890  
    4242
    4343#mask:  {{{
    44 md.mask = maskpsl()  # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset
    4544mask = gmtmask(md.mesh.lat, md.mesh.long)
    46 
    4745icemask = np.ones((md.mesh.numberofvertices, ))
    4846pos = np.where(mask == 0)
    … …  
    5250icemask[md.mesh.elements[pos, :] - 1] = -1
    5351md.mask.ice_levelset = icemask
    54 md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices, ))
    55 pos = np.where(md.mask.ice_levelset == 1)
    56 md.mask.ocean_levelset[pos] = 1
     52md.mask.ocean_levelset = -icemask
    5753
    5854#make sure that the ice level set is all inclusive:

  • issm/trunk-jpl/test/NightlyRun/test2010.py

    r24862 r24890  
    4343#}}}
    4444#mask:  {{{
    45 md.mask = maskpsl()  # use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset
    4645mask = gmtmask(md.mesh.lat, md.mesh.long)
    47 
    4846icemask = np.ones((md.mesh.numberofvertices, ))
    4947pos = np.where(mask == 0)
    … …  
    5250icemask[md.mesh.elements[pos, :] - 1] = -1
    5351md.mask.ice_levelset = icemask
    54 md.mask.ocean_levelset = np.zeros((md.mesh.numberofvertices, ))
    55 pos = np.where(md.mask.ice_levelset == 1)
    56 md.mask.ocean_levelset[pos] = 1
     52md.mask.ocean_levelset = -icemask
    5753
    5854#make sure that the ice level set is all inclusive:
Note: See TracChangeset for help on using the changeset viewer.