source: issm/oecreview/Archive/20545-21336/ISSM-21043-21044.diff@ 21337

Last change on this file since 21337 was 21337, checked in by Mathieu Morlighem, 8 years ago

CHG: added Archive/20545-21336

File size: 1.5 KB
RevLine 
[21337]1Index: ../trunk-jpl/test/NightlyRun/test2002.py
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test2002.py (revision 21043)
4+++ ../trunk-jpl/test/NightlyRun/test2002.py (revision 21044)
5@@ -19,13 +19,15 @@
6
7 #parameterize slr solution:
8 #slr loading: {{{
9-md.slr.deltathickness=zeros((md.mesh.numberofvertices,1))
10+md.slr.deltathickness=zeros((md.mesh.numberofelements,1))
11 md.slr.sealevel=zeros((md.mesh.numberofvertices,1))
12 #antarctica
13-pos=numpy.nonzero(md.mesh.lat <-80)
14+late=numpy.sum(md.mesh.lat[md.mesh.elements-1],axis=1)/3
15+longe=numpy.sum(md.mesh.long[md.mesh.elements-1],axis=1)/3
16+pos=numpy.nonzero(late <-80)
17 md.slr.deltathickness[pos]=-100
18-#greenlnd
19-pos=numpy.nonzero(logical_and_n(md.mesh.lat > 70,md.mesh.lat < 80,md.mesh.long>-60,md.mesh.long<-30))
20+#greenland
21+pos=numpy.nonzero(logical_and_n(late > 70,late < 80,longe>-60,longe<-30))
22 md.slr.deltathickness[pos]=-100
23
24 #elastic loading from love numbers:
25Index: ../trunk-jpl/test/NightlyRun/test2002.m
26===================================================================
27--- ../trunk-jpl/test/NightlyRun/test2002.m (revision 21043)
28+++ ../trunk-jpl/test/NightlyRun/test2002.m (revision 21044)
29@@ -14,7 +14,7 @@
30 longe=sum(md.mesh.long(md.mesh.elements),2)/3;
31 pos=find(late <-80);
32 md.slr.deltathickness(pos)=-100;
33- %greenlnd
34+ %greenland
35 pos=find(late > 70 & late < 80 & longe>-60 & longe<-30);
36 md.slr.deltathickness(pos)=-100;
37
Note: See TracBrowser for help on using the repository browser.