Changeset 21044


Ignore:
Timestamp:
08/01/16 16:20:53 (9 years ago)
Author:
Mathieu Morlighem
Message:

CHG: trying to fix python test

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

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/test/NightlyRun/test2002.m

    r21001 r21044  
    1515        pos=find(late <-80);
    1616        md.slr.deltathickness(pos)=-100;
    17         %greenlnd
     17        %greenland
    1818        pos=find(late > 70 &  late < 80 & longe>-60 & longe<-30);
    1919        md.slr.deltathickness(pos)=-100;
  • issm/trunk-jpl/test/NightlyRun/test2002.py

    r21001 r21044  
    2020#parameterize slr solution:
    2121#slr loading:  {{{
    22 md.slr.deltathickness=zeros((md.mesh.numberofvertices,1))
     22md.slr.deltathickness=zeros((md.mesh.numberofelements,1))
    2323md.slr.sealevel=zeros((md.mesh.numberofvertices,1))
    2424#antarctica
    25 pos=numpy.nonzero(md.mesh.lat <-80)
     25late=numpy.sum(md.mesh.lat[md.mesh.elements-1],axis=1)/3
     26longe=numpy.sum(md.mesh.long[md.mesh.elements-1],axis=1)/3
     27pos=numpy.nonzero(late <-80)
    2628md.slr.deltathickness[pos]=-100
    27 #greenlnd
    28 pos=numpy.nonzero(logical_and_n(md.mesh.lat > 70,md.mesh.lat < 80,md.mesh.long>-60,md.mesh.long<-30))
     29#greenland
     30pos=numpy.nonzero(logical_and_n(late > 70,late < 80,longe>-60,longe<-30))
    2931md.slr.deltathickness[pos]=-100
    3032
Note: See TracChangeset for help on using the changeset viewer.