From b456b50eb813dcad706cac283fe8f3a24d68aeaf Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 30 Apr 2019 19:12:35 +0200
Subject: [PATCH] Names of NetCDF variables in AVISO files are changed: u to
ugos, v to vgos, lon to longitude, lat to latitude.
Add a test for successive_overlap with periodic grid.
Add snapshot for region 4 at a different date, in input files, for a
new test of successive_overlap.
---
Analysis/plot_snapshot.py | 4 +-
.../extraction_eddies_stdout.txt | 0
.../Region_4/{ => 2006_01_01}/extremum.dbf | Bin
.../Region_4/{ => 2006_01_01}/extremum.shp | Bin
.../Region_4/{ => 2006_01_01}/extremum.shx | Bin
Tests/Input/Region_4/{ => 2006_01_01}/h.nc | Bin 8264 -> 8392 bytes
.../{ => 2006_01_01}/max_speed_contour.dbf | Bin
.../{ => 2006_01_01}/max_speed_contour.shp | Bin
.../{ => 2006_01_01}/max_speed_contour.shx | Bin
.../{ => 2006_01_01}/outermost_contour.dbf | Bin
.../{ => 2006_01_01}/outermost_contour.shp | Bin
.../{ => 2006_01_01}/outermost_contour.shx | Bin
Tests/Input/Region_4/{ => 2006_01_01}/uv.nc | Bin 11864 -> 12056 bytes
.../2006_01_02/dt_region_4_2006_01_02.nc | Bin 0 -> 30532 bytes
.../2006_01_02/extraction_eddies_stdout.txt | 10 +++
Tests/Input/Region_4/2006_01_02/extremum.dbf | Bin 0 -> 498 bytes
Tests/Input/Region_4/2006_01_02/extremum.shp | Bin 0 -> 268 bytes
Tests/Input/Region_4/2006_01_02/extremum.shx | Bin 0 -> 148 bytes
.../Region_4/2006_01_02/max_speed_contour.dbf | Bin 0 -> 366 bytes
.../Region_4/2006_01_02/max_speed_contour.shp | Bin 0 -> 424 bytes
.../Region_4/2006_01_02/max_speed_contour.shx | Bin 0 -> 148 bytes
.../Region_4/2006_01_02/outermost_contour.dbf | Bin 0 -> 410 bytes
.../Region_4/2006_01_02/outermost_contour.shp | Bin 0 -> 2036 bytes
.../Region_4/2006_01_02/outermost_contour.shx | Bin 0 -> 148 bytes
Tests/Input/h_2006_01_01_coarse.nc | Bin 5452 -> 5624 bytes
Tests/Input/huv_2015_11_29.nc | Bin 10596 -> 10668 bytes
.../Input/successive_overlap_periodic_nml.txt | 7 +++
Tests/Input/uv_2006_01_01_coarse.nc | Bin 7240 -> 8180 bytes
Tests/Input/uv_region_1.nc | Bin 13428 -> 13496 bytes
Tests/Input/uv_region_2.nc | Bin 36168 -> 36240 bytes
Tests/short_tests.json | 58 +++++++++++-------
Tests/test_local_extrema.f90 | 8 +--
Tests/test_max_speed_contour_ssh.f90 | 6 +-
Tests/test_mean_speed.f90 | 4 +-
Tests/test_set_max_speed.f90 | 4 +-
derived_types.f90 | 2 +-
extraction_eddies.f90 | 10 +--
read_snapshot.f90 | 2 +-
38 files changed, 73 insertions(+), 42 deletions(-)
rename Tests/Input/Region_4/{ => 2006_01_01}/extraction_eddies_stdout.txt (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/extremum.dbf (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/extremum.shp (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/extremum.shx (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/h.nc (62%)
rename Tests/Input/Region_4/{ => 2006_01_01}/max_speed_contour.dbf (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/max_speed_contour.shp (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/max_speed_contour.shx (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/outermost_contour.dbf (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/outermost_contour.shp (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/outermost_contour.shx (100%)
rename Tests/Input/Region_4/{ => 2006_01_01}/uv.nc (85%)
create mode 100644 Tests/Input/Region_4/2006_01_02/dt_region_4_2006_01_02.nc
create mode 100644 Tests/Input/Region_4/2006_01_02/extraction_eddies_stdout.txt
create mode 100644 Tests/Input/Region_4/2006_01_02/extremum.dbf
create mode 100644 Tests/Input/Region_4/2006_01_02/extremum.shp
create mode 100644 Tests/Input/Region_4/2006_01_02/extremum.shx
create mode 100644 Tests/Input/Region_4/2006_01_02/max_speed_contour.dbf
create mode 100644 Tests/Input/Region_4/2006_01_02/max_speed_contour.shp
create mode 100644 Tests/Input/Region_4/2006_01_02/max_speed_contour.shx
create mode 100644 Tests/Input/Region_4/2006_01_02/outermost_contour.dbf
create mode 100644 Tests/Input/Region_4/2006_01_02/outermost_contour.shp
create mode 100644 Tests/Input/Region_4/2006_01_02/outermost_contour.shx
create mode 100644 Tests/Input/successive_overlap_periodic_nml.txt
diff --git a/Analysis/plot_snapshot.py b/Analysis/plot_snapshot.py
index e10d8a8f..2eebec57 100755
--- a/Analysis/plot_snapshot.py
+++ b/Analysis/plot_snapshot.py
@@ -58,8 +58,8 @@ else:
m_s_iterShapes = reader_m_s.iterShapes()
with netCDF4.Dataset("h.nc") as f:
- longitude = f.variables["lon"][:]
- latitude = f.variables["lat"][:]
+ longitude = f.variables["longitude"][:]
+ latitude = f.variables["latitude"][:]
if args.window:
l = input("llcrnrlon, llcrnrlat, urcrnrlon, urcrnrlat = ? ")\
diff --git a/Tests/Input/Region_4/extraction_eddies_stdout.txt b/Tests/Input/Region_4/2006_01_01/extraction_eddies_stdout.txt
similarity index 100%
rename from Tests/Input/Region_4/extraction_eddies_stdout.txt
rename to Tests/Input/Region_4/2006_01_01/extraction_eddies_stdout.txt
diff --git a/Tests/Input/Region_4/extremum.dbf b/Tests/Input/Region_4/2006_01_01/extremum.dbf
similarity index 100%
rename from Tests/Input/Region_4/extremum.dbf
rename to Tests/Input/Region_4/2006_01_01/extremum.dbf
diff --git a/Tests/Input/Region_4/extremum.shp b/Tests/Input/Region_4/2006_01_01/extremum.shp
similarity index 100%
rename from Tests/Input/Region_4/extremum.shp
rename to Tests/Input/Region_4/2006_01_01/extremum.shp
diff --git a/Tests/Input/Region_4/extremum.shx b/Tests/Input/Region_4/2006_01_01/extremum.shx
similarity index 100%
rename from Tests/Input/Region_4/extremum.shx
rename to Tests/Input/Region_4/2006_01_01/extremum.shx
diff --git a/Tests/Input/Region_4/h.nc b/Tests/Input/Region_4/2006_01_01/h.nc
similarity index 62%
rename from Tests/Input/Region_4/h.nc
rename to Tests/Input/Region_4/2006_01_01/h.nc
index 8b279a4569eb463ea4bd80da623037d7cdc33555..f6f894e9aeac78bc1d593c33f6c19eeff3cc45a9 100644
GIT binary patch
delta 280
zcmX@%aKdqdybMQ9Vo7F6X-X;s1A_<<bLQmdr9%ZK>g&{3gk+Q|I2IHs7+L_4m9eFj
ziK&8-fuW_9LSAxFYF=V)s)BBc0#KI@T&IF=8M**aMPi8#%r3A3WPXNTUNTpBYKnqa
zVxEGbImjkM11n=Ag^2}!H|I0X;N)O4(KFXGVqloe&;6T8C}J}YPcb9!4WNVJ9+=$0
z`<e01<Ql$tQt~=zJ^^wW7=f5+@&sOq$u9iY8P80X5tzlKATxP~Kse)`$pV7M8INqf
IAy~i%0Om$izW@LL
delta 117
zcmX@%c*0?Vya01fVhIBfhyXEjPJZ4*YaK?ujh6%&H$P;Y#mT{;WTI!PXQDK@nfo`B
z;El}<JjINh5n#1IeUtb;GsaB*!Z(joZVgob<i-3y7=0$s5tzj!KWDOqU^t`A<Ozbu
M8C^C<2o>-F0Ga|Kq5uE@
diff --git a/Tests/Input/Region_4/max_speed_contour.dbf b/Tests/Input/Region_4/2006_01_01/max_speed_contour.dbf
similarity index 100%
rename from Tests/Input/Region_4/max_speed_contour.dbf
rename to Tests/Input/Region_4/2006_01_01/max_speed_contour.dbf
diff --git a/Tests/Input/Region_4/max_speed_contour.shp b/Tests/Input/Region_4/2006_01_01/max_speed_contour.shp
similarity index 100%
rename from Tests/Input/Region_4/max_speed_contour.shp
rename to Tests/Input/Region_4/2006_01_01/max_speed_contour.shp
diff --git a/Tests/Input/Region_4/max_speed_contour.shx b/Tests/Input/Region_4/2006_01_01/max_speed_contour.shx
similarity index 100%
rename from Tests/Input/Region_4/max_speed_contour.shx
rename to Tests/Input/Region_4/2006_01_01/max_speed_contour.shx
diff --git a/Tests/Input/Region_4/outermost_contour.dbf b/Tests/Input/Region_4/2006_01_01/outermost_contour.dbf
similarity index 100%
rename from Tests/Input/Region_4/outermost_contour.dbf
rename to Tests/Input/Region_4/2006_01_01/outermost_contour.dbf
diff --git a/Tests/Input/Region_4/outermost_contour.shp b/Tests/Input/Region_4/2006_01_01/outermost_contour.shp
similarity index 100%
rename from Tests/Input/Region_4/outermost_contour.shp
rename to Tests/Input/Region_4/2006_01_01/outermost_contour.shp
diff --git a/Tests/Input/Region_4/outermost_contour.shx b/Tests/Input/Region_4/2006_01_01/outermost_contour.shx
similarity index 100%
rename from Tests/Input/Region_4/outermost_contour.shx
rename to Tests/Input/Region_4/2006_01_01/outermost_contour.shx
diff --git a/Tests/Input/Region_4/uv.nc b/Tests/Input/Region_4/2006_01_01/uv.nc
similarity index 85%
rename from Tests/Input/Region_4/uv.nc
rename to Tests/Input/Region_4/2006_01_01/uv.nc
index 0148d63298deb90e2f43ba7cf23fdb778009e98d..b1080d6a3c259d5171e15ef4bed9381f6b5cd5fc 100644
GIT binary patch
delta 351
zcmcZ+Gb2vT*~N{K0Rp&y6ble@<Rq44mXxNX0@)%!%#>F)c^{wTL}QKmqamfK3XTOu
z3dRNsh89+)rdCEq3PuKomR1UR$wjGoiMgo?x@8KbI;H9P#UNIhP8o<*TBetm%oUPR
z3f63B0n%)2X=Q4Np*ck%CqGXIh||GN0GWXh&;mM2K^Lebu|x;vNU#cIKE$q#F^9Q0
z*i7`y^^6!8Hmh@2GxCXOAbW1|8lF!~B07^7@XiwysR7Dx!YyTBnC#B?ok>(?vIGAt
zCefV9clg7Y#CRr~2pr=Q1BD0+$a|A5gt{m93(n^flK=^U{JGgeNRN?8X~yOZ;SW*(
Dqyb~$
delta 187
zcmbOccOypM*~N{K0Rp&y6bleD=OmVZL_~m?DX$E~WMBef=A8VziPk!dvYQ1M4|8#F
zD4FP)>X|5QzRg|DC?uQ#RsqooHgU25zr^Gg-b+lvIg=y!=5Y$|ftoRyo&P(NNX#UG
zSxh2pCeINFV-oe5{6*jxmuLu31!F0YnEXSid$PaKd@j)lkPyfXn|}!DF)}IM*sLM)
GK?(rI?I>^n
diff --git a/Tests/Input/Region_4/2006_01_02/dt_region_4_2006_01_02.nc b/Tests/Input/Region_4/2006_01_02/dt_region_4_2006_01_02.nc
new file mode 100644
index 0000000000000000000000000000000000000000..aa84356468c5276a13ae10055bccd28204a7cc06
GIT binary patch
literal 30532
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
T(Tl@)=8nU$Cwkr!-S7Va9HaSj
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/extraction_eddies_stdout.txt b/Tests/Input/Region_4/2006_01_02/extraction_eddies_stdout.txt
new file mode 100644
index 00000000..dc741c82
--- /dev/null
+++ b/Tests/Input/Region_4/2006_01_02/extraction_eddies_stdout.txt
@@ -0,0 +1,10 @@
+ &MAIN_NML
+ MIN_AMP = 1.0000000E-03 ,
+ MAX_RADIUS = 2*20,
+ MIN_RADIUS = 25.00000
+ /
+ periodic = F
+ Number of extrema: 6
+ Created shapefile "extremum".
+ Created shapefile "outermost_contour".
+ Created shapefile "max_speed_contour".
diff --git a/Tests/Input/Region_4/2006_01_02/extremum.dbf b/Tests/Input/Region_4/2006_01_02/extremum.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..56243a32ce24479ec4d6bf60eb43be9c05333edb
GIT binary patch
literal 498
zcmaKmO$x#=5QS4jU3mdlF5OrrGx;%>aO+Zv30Np?u|@3dO;W6}h;I=l^S*gAi_3bu
zVvJ?k-oG=Q8SA>+yLk%5Ccueo(Ys4oTlZwqUnX8CowdV1zpQ(AZ=0&<$N6kFe;uw>
zQ@hZO`E&nKRHYqfe)?VOT<Xv7-|V7zj@lRi1R-VUZ~z`1$feeJ)bVqG9F$NAhrlD}
z9fiu^$n89*i4u-JoDe89#XQduq2D#_6`#Faku*~t!7=3|0E8pKZ;E>7;dh<_{>^P)
D=;=X~
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/extremum.shp b/Tests/Input/Region_4/2006_01_02/extremum.shp
new file mode 100644
index 0000000000000000000000000000000000000000..a427cf7ec8b85778df7c391710e7fd930857cfe4
GIT binary patch
literal 268
zcmZQzQ0HR64%%KYGcYhh<R1KwH*f$lAN<#MJ^-fWO(1-KM-ZP702#vtH%s2o0mz4$
z#e^ycHTS*K0iZb01#o>p9Z)yqgXLI|<R1K=Z|nf%1I+}>v7*WuLFC?p-O7d{2lE%u
F9{_yxFj@cr
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/extremum.shx b/Tests/Input/Region_4/2006_01_02/extremum.shx
new file mode 100644
index 0000000000000000000000000000000000000000..18b3d3d9baabf51cb0f01ae3a6428dca3ab13257
GIT binary patch
literal 148
zcmZQzQ0HR64!mA4GcYhh<R1KwH*f$lAN<#MJ^-fWO(1-KM-ZP7Fajz7+2a7E{h)LV
Ll+J?E6(AY_7?2MF
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/max_speed_contour.dbf b/Tests/Input/Region_4/2006_01_02/max_speed_contour.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..7bb1a7ab49ccf04949c56ac9130b9f04a2c16044
GIT binary patch
literal 366
zcmZRMXP07QU|?9tpadk*KsW<KQG9A)d}2{*A_IdTNS2EQRZVem2221f&kHgP38W;J
zq{e6FrKDCs^s^$#ftaZ&DV6x-c@-3N4Gj$R41hoZ$bd2p42%p+OidMlz>uH{Bakv<
ipc$ry<{+kmfu5nMnI)1L#stkUA*cfA7y>RelL7#3qBIHs
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/max_speed_contour.shp b/Tests/Input/Region_4/2006_01_02/max_speed_contour.shp
new file mode 100644
index 0000000000000000000000000000000000000000..8d48f7870581376b90b5a3edaaf21a806a7ac67e
GIT binary patch
literal 424
zcmZQzQ0HR64z9dlW?*22$TjrOHgEtlCpaAd(hGv>3_<(@sm@?Nkck&C0%e(?DnK-h
z4YYxwffzeL2Jk`+08$VB&j-6FVRaGMewh0n{LcsTVe$$ubD-{f09L=iJ_O8nnEMs#
zp8%+Od9Z&H0z9DncohG^{L8=qQxB1M=uUx{9}xytkFXzN9s_3sM4ka+KLZ0K{9x{b
Sxt|5-Cs>$(f&<28gRueYk4!iK
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/max_speed_contour.shx b/Tests/Input/Region_4/2006_01_02/max_speed_contour.shx
new file mode 100644
index 0000000000000000000000000000000000000000..ecb258182986d79930c131bcfb3861192962e308
GIT binary patch
literal 148
zcmZQzQ0HR64!mA4Gcd41<Qn>C8#sWO6PykJ=><V`h9LfdRA(?B$ixebfU-<LYyqY1
RfOG>8AA<5vK<RTJ8UW)Y4DA2_
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/outermost_contour.dbf b/Tests/Input/Region_4/2006_01_02/outermost_contour.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..13052d7d7e0e746c0b2d94f04edcb0ac81cbb1d0
GIT binary patch
literal 410
zcmaJ)OKQU~5EX6OLLe8&N{g<=%xFfkFOhAR#vnnn3B*nyIbLoSja{Wq7kvxqG4J=<
zeQe*2F*oyB-aq&<X6W*<>xbMMvr~1wdiIRtcRft{M#~mR{V8|*L&}#q|F+PS=9I4g
z=|i9P=aJPq^}i@vU}Foob;NC>)S^QlISK)bOb1K)#pnpARcgT@H4Qco56zw+PRPTL
zha!@MhsVzzPbKW<EpQ%yN^RX@iyFr00HkhtkifrNVy6K_Cn44zV&qa)dxC}S9i+NA
AGXMYp
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/outermost_contour.shp b/Tests/Input/Region_4/2006_01_02/outermost_contour.shp
new file mode 100644
index 0000000000000000000000000000000000000000..053f803c4275ef3152a7bee8ad28034c48925f78
GIT binary patch
literal 2036
zcmai#O-NKx6vwZcl2Vy1DiNJm2BDH;W?!^<qXij}iJS0)c}0sh5*P#()Qbp-5GzPU
zsCg^NKqQo+kHrI91>sI17jsbz7lp0@je6bpKj)0TLFmDJ{O0`cIp>~p?p&n~7O732
zytSn~rSi$9gIJwyzFKWpn|$->&!rnewtpoOA^-2mF#?Z$ISp3Cm(x0Y*beQFemDA|
zu*AIh5t|N*5!d@N2(1p{U>zjE?ocyv?FF{CusufH*$!4pBeuPt_MwARBp2fktlGPv
zmt1u~{+t8nVc!s+c%qu)kv}!R7woRRXFcUF@zvy3)>D4o<-d)-*|Y2iwJ@B$|6HYV
zq$mEhiX*ns*tu=+mFY?IZK`9rG4iATl%rod=;t^wu-E!T;)4A<gUl)7S`VylO!4}0
zu*A~AH1U;BY+sJ7w-#2JlVqQ!I{5dQxvyrvV7G=Uuov}o342?wa~kX>>bY(yuz$0O
z_)RzKrSD0w)W-eZ61BgmVUAPnMo%$QevWElrv2En$Czoq-iJ!&ao%5ycxIUD!M)i~
zZ`i%QKB))T4tr&KWabcTE!<^JgWYev#993_CsVEDQ*-?!ohN_dCA3ymXT5Dq&P*=N
zK^f`7cemjTpO0dWL-Xg3mV@2A9Ja^7GOyOa3D(nmyCVr^IxqHOGuU~2i08cpEV=36
zdPJ`VZ-K3jhpg{sJNfsf2EY<u_Gab;`8j8w!|t3u%K6IrB-ncEia+9gJ*0m<#(K#o
zO}x8{^)b{=f4vBnTAK3@_SP)22l1%>qcHii)1{>U`Htfivpxm(R*IM@U-W8|{%i?<
z<34-GHDcR)&XMmOi!?J23aHQ9!w%D<J9r+~^Q3vJs*|{2r%?Jx^C!M_K=WtqJQ;~)
z&LgiUyPB*4JJn<GXa1+zPX2VyHs<7dt|mp(N3hpTb&$Pf)@S7(mcZdUxTQ4TYNQ0d
z-Dl&di>jPU;QlD&BA5@+>R=i7l=*)p?XFd@n}3h{naP{%S-vGN>+>tti@y}u>irS*
zALg=2`~vfv&HIo$Rn1?bwPgc13%FCmdysYJo6>AEb0~43&8+47IomGxb7cKLFiACa
literal 0
HcmV?d00001
diff --git a/Tests/Input/Region_4/2006_01_02/outermost_contour.shx b/Tests/Input/Region_4/2006_01_02/outermost_contour.shx
new file mode 100644
index 0000000000000000000000000000000000000000..894257ddc1a1e5563fed703aadd83500074e1074
GIT binary patch
literal 148
zcmZQzQ0HR64!mA4Gcd41<R1K&H*f$l6@pWo4*=-{x9^*P_zvG39YK6TzzC>d0T5qf
gU|<ANjJJTq2L=YFb3nR*fq^*)NGAa4Z9v)q0Nel(i~s-t
literal 0
HcmV?d00001
diff --git a/Tests/Input/h_2006_01_01_coarse.nc b/Tests/Input/h_2006_01_01_coarse.nc
index f9ee03442f6afe46ec66c447622a1197ca0c8202..3642ae89f0b05357463fdd4d40fac7d85b453fb1 100644
GIT binary patch
delta 302
zcmX@3^+Vgk*~N{Kfq?;pxqz4%h&gle^U^a*N>fsS93T(^Vvd}|5||K39ZN}OE>xO<
z2gui-Xj5N*B&0M|!Lgu7!Pr2-(9Fun+{(m2!N|bS(n=vOxhOR+F*j8~H$?$xybjz7
z1>G`q0icS+5*?U@U<JthjCdmh1G9JoLl8>NPb?}<)yqrfax2=nkCj`8+0WS@=pF_p
zAZ9bsGuJZ$@faAmftUq|kv%v0Jojuq{sN#V+<TKtc&0H4Fihs*-Nz&lF!>DcHzt9I
J%}4k;*Z?=_O>qDK
delta 110
zcmeyNeMU>g*~N{Kfq?;pxqz4%gmd!qfE0ren4MU{FwsDqQE#G0J)`?(7e;n&9&Vrn
u3s^EgZ*n=$Y%abdFr||fc&9P(hfLnVyN`)~$>a*YZ%q7aHW%=BumJ!(o)@<O
diff --git a/Tests/Input/huv_2015_11_29.nc b/Tests/Input/huv_2015_11_29.nc
index 0c201d92a27da680a9b08d9a507226028c5e2e9a..2ef3687c53d63c980a63f14486b439f395762916 100644
GIT binary patch
delta 209
zcmaD7v?h4NXBP8UA*HDbjs-;u#s&(8mR1I)Rz_wDMg~BpLSAxFYF=V)s)BBrLa9z^
zdVVp8Ri;x0WKH&CmD~KEWj5pH*=(EHndEFX2k;d$avWh`U|>!yDw_OW+-5Voz!pZv
z6O;D{&Swmm93%9fv14+K@NC8<n|}ziGcw+pBpS~6V{?S)F-9gOhRF)z$2mKIx>-Q>
zZ2ll_&dAmS<g%7dHk6sS`Lv`oBbTZONFHSS<_}WVjEr+O>&O5#Yp87gB3r->09b`X
A3IG5A
delta 134
zcmZ1z{3K|@XBNhVn{8Q_F>ZduwuPNZ_RHoOe8r56HJf<^zB4j5OlA?9&&V-(iO_#W
zhsjHXXEVlZb`W7_WSlbDLo}Rm!{!B|#~7IucTCO@KhEaBz`(#*I=NOxYO}wD0wbf#
j<^sumjO;3BK;mT(acLDs#*ob=GC*DGcQ)I|6>tLpOM@#A
diff --git a/Tests/Input/successive_overlap_periodic_nml.txt b/Tests/Input/successive_overlap_periodic_nml.txt
new file mode 100644
index 00000000..5a0fd63b
--- /dev/null
+++ b/Tests/Input/successive_overlap_periodic_nml.txt
@@ -0,0 +1,7 @@
+ &MAIN_NML
+ CORNER = 0.000000 , -81.00000 ,
+ STEP = 20.00000 , 18.00000 ,
+ NLON = 18,
+ NLAT = 10,
+ DIST_LIM = 4
+ /
diff --git a/Tests/Input/uv_2006_01_01_coarse.nc b/Tests/Input/uv_2006_01_01_coarse.nc
index c57604c069cf09d8dcbb644379d991eebc206f53..3780d6016e7e6c6cd3d0083f16085146e91a9a6c 100644
GIT binary patch
delta 1057
zcmX?M@x|W5*~N{Kfq?;pxqz4%h&gle^U^a*N>fsS93T(^Vvd}|5||K39ZN}OE>xO<
z2gui-Xj5mwq#RP3s^C~qq+o2IU}$M&U|?lzsbFLPWGdt(7p3MU=B6s>mMN6#l&0qw
zgIHxcWkA+s8%Eg#m^L#jBXcWLV+?I63P5M+z?}xtjV1t8kyxSwb0}B=5+7)Z<i<Vn
z+&avD&i+6bGcW-$n~9#eo)L)0z`zZ}tU!$H{mIX{XY&cl07c;eFu8|k8k69f$tt}2
zIsX79SU`T+{DxPEkxPgL#0UH64X^QJYyQVf;!8Fw2x#!s10@C$jM_htq0hiD(BW@N
GmiGbwIA4DN
delta 138
zcmexjf5Jk=*~N{Kfq?;pxqz4%gmd!qfE0ren4MU{FwsDqQE#G09TQ{N<|&Nw+&tVs
z8CI}te%|E!JhQn36kuv6ckoVQ64)?Vfp0%2P>g}G6i94-!6(GXCCCBdmjQ{%FZhfn
Qn+rT<5?irZMo@zX0L{T0AOHXW
diff --git a/Tests/Input/uv_region_1.nc b/Tests/Input/uv_region_1.nc
index 98570648e0b6c8347ad9656a394bd5835b66dda3..df11254a6ce78b5fc543dbd0e1cdcdcdadc4eb85 100644
GIT binary patch
delta 177
zcmey8u_JRrw0lNKX{v%_L6L&7fr6ohm8qeXsgZ(_fuW_9LSAxFYF=V)s)BBrLa9z^
zdVVp8Ri;x0VwIM~7p10W=I6y5>g6SKZH!T6+}zB#fRlsGM9*B$h=F0VHg^pp<A%vA
zcz!c(nY@H|KI4zcE`0wP8z#H(&u08G`2l}8<DJPC0>?R@FfcH%fQ+APBh)>4vfu*F
W7a$RkHJfdO^cfigHs=U)C;|XX(>g2w
delta 107
zcmdmy`6XjQG^5hSMXHROk1{Ue<ls;;(KFREQQDl(UBk$jGx-hAZ^nYjFL>uOZkgP{
z_n*;batHrx#toBI1i~3-Os)|)&bferfq}6UNK9@J>YjXEZ~^BMkVqMj*xVqb&&bHL
Jd4n*AA^_p#A_o8f
diff --git a/Tests/Input/uv_region_2.nc b/Tests/Input/uv_region_2.nc
index 65c4baac999209d615a8b371edb6290845c31b66..eb0c4d1518c04e59f5201f781014fe66c77453b1 100644
GIT binary patch
delta 182
zcmX>xi)q4arU}vRc_F2#3XTOu3dRNsh89+)Mpj0a3PuKomR1UR$wjGoiMgo?x@8Kb
zI;H9P#UNIhP8o<*S{7fFnx2`T7jLAOm&~;>Mw@YSE8`+g4mJ}#b3G#lhRyoiHH?fq
zCa>Z7&A4as3f_54A`X*1`2I6`O!nZP#U!RP`3ZkG<Cn=c0>?T3FfcH%fGn8oAk;m1
cy5M{+37`lA3&^I;4nq2jj3+i12;Zm#0Gcy81ONa4
delta 112
zcmbO*o9V<XrU}uE8XFgBGj2Z5xPX&`L&-$XRL?|db2)bnBV)njFFd~)OD2EdoyR2n
zWAX&P|BMWiC-Bc=5`8jRM<ASW&Eyt=<D6R<7#J8!fyCqvq3+4|1?O{#?*Ivv0g25W
PLi&u14V!le->3uta7rZN
diff --git a/Tests/short_tests.json b/Tests/short_tests.json
index 6a526fb2..ee4db9b0 100644
--- a/Tests/short_tests.json
+++ b/Tests/short_tests.json
@@ -180,7 +180,7 @@
{
"args": "$compil_prod_dir/extraction_eddies",
"title": "Extraction_eddies_region_4",
- "required": ["$input_dir/Region_4/h.nc", "$input_dir/Region_4/uv.nc"],
+ "required": ["$input_dir/Region_4/2006_01_01/h.nc", "$input_dir/Region_4/2006_01_01/uv.nc"],
"input": "&main_nml /\n",
"description": "Part of the domain has missing values."
},
@@ -204,31 +204,31 @@
"args": "$compil_prod_dir/test_read_eddy",
"required":
[
- ["$input_dir/Region_4/extremum.dbf", "extremum_old.dbf"],
- ["$input_dir/Region_4/extremum.shp", "extremum_old.shp"],
- ["$input_dir/Region_4/extremum.shx", "extremum_old.shx"],
+ ["$input_dir/Region_4/2006_01_01/extremum.dbf", "extremum_old.dbf"],
+ ["$input_dir/Region_4/2006_01_01/extremum.shp", "extremum_old.shp"],
+ ["$input_dir/Region_4/2006_01_01/extremum.shx", "extremum_old.shx"],
[
- "$input_dir/Region_4/max_speed_contour.dbf",
+ "$input_dir/Region_4/2006_01_01/max_speed_contour.dbf",
"max_speed_contour_old.dbf"
],
[
- "$input_dir/Region_4/max_speed_contour.shp",
+ "$input_dir/Region_4/2006_01_01/max_speed_contour.shp",
"max_speed_contour_old.shp"
],
[
- "$input_dir/Region_4/max_speed_contour.shx",
+ "$input_dir/Region_4/2006_01_01/max_speed_contour.shx",
"max_speed_contour_old.shx"
],
[
- "$input_dir/Region_4/outermost_contour.dbf",
+ "$input_dir/Region_4/2006_01_01/outermost_contour.dbf",
"outermost_contour_old.dbf"
],
[
- "$input_dir/Region_4/outermost_contour.shp",
+ "$input_dir/Region_4/2006_01_01/outermost_contour.shp",
"outermost_contour_old.shp"
],
[
- "$input_dir/Region_4/outermost_contour.shx",
+ "$input_dir/Region_4/2006_01_01/outermost_contour.shx",
"outermost_contour_old.shx"
]
],
@@ -238,31 +238,31 @@
"args": "$compil_prod_dir/test_read_snapshot",
"required":
[
- ["$input_dir/Region_4/extremum.dbf", "extremum_old.dbf"],
- ["$input_dir/Region_4/extremum.shp", "extremum_old.shp"],
- ["$input_dir/Region_4/extremum.shx", "extremum_old.shx"],
+ ["$input_dir/Region_4/2006_01_01/extremum.dbf", "extremum_old.dbf"],
+ ["$input_dir/Region_4/2006_01_01/extremum.shp", "extremum_old.shp"],
+ ["$input_dir/Region_4/2006_01_01/extremum.shx", "extremum_old.shx"],
[
- "$input_dir/Region_4/max_speed_contour.dbf",
+ "$input_dir/Region_4/2006_01_01/max_speed_contour.dbf",
"max_speed_contour_old.dbf"
],
[
- "$input_dir/Region_4/max_speed_contour.shp",
+ "$input_dir/Region_4/2006_01_01/max_speed_contour.shp",
"max_speed_contour_old.shp"
],
[
- "$input_dir/Region_4/max_speed_contour.shx",
+ "$input_dir/Region_4/2006_01_01/max_speed_contour.shx",
"max_speed_contour_old.shx"
],
[
- "$input_dir/Region_4/outermost_contour.dbf",
+ "$input_dir/Region_4/2006_01_01/outermost_contour.dbf",
"outermost_contour_old.dbf"
],
[
- "$input_dir/Region_4/outermost_contour.shp",
+ "$input_dir/Region_4/2006_01_01/outermost_contour.shp",
"outermost_contour_old.shp"
],
[
- "$input_dir/Region_4/outermost_contour.shx",
+ "$input_dir/Region_4/2006_01_01/outermost_contour.shx",
"outermost_contour_old.shx"
]
],
@@ -271,7 +271,7 @@
},
{
"args" : ["$compil_prod_dir/test_local_extrema",
- "$input_dir/Region_4/h.nc"],
+ "$input_dir/Region_4/2006_01_01/h.nc"],
"title" : "Local_extrema_missing",
"description": "With input file containing missing values.",
"input" : "f"
@@ -282,9 +282,9 @@
"description": "Overlap of a snapshot with itself.",
"required":
[
- "$input_dir/Region_4/*.dbf",
- "$input_dir/Region_4/*.shx",
- "$input_dir/Region_4/*.shp"
+ "$input_dir/Region_4/2006_01_01/*.dbf",
+ "$input_dir/Region_4/2006_01_01/*.shx",
+ "$input_dir/Region_4/2006_01_01/*.shp"
],
"stdin_filename": "$input_dir/successive_overlap_nml.txt"
},
@@ -337,5 +337,17 @@
["$input_dir/uv_2006_01_01_coarse.nc", "uv.nc"]],
"input": "&main_nml min_amp = 0., MAX_RADIUS = 4, 4/\n",
"description": "Periodic domain."
+ },
+ {
+ "args" : "$compil_prod_dir/test_successive_overlap",
+ "title" : "Successive_overlap_periodic",
+ "description": "Overlap of a snapshot with itself. Global coarse grid.",
+ "required":
+ [
+ "$tests_old_dir/Extraction_eddies_periodic/*.dbf",
+ "$tests_old_dir/Extraction_eddies_periodic/*.shx",
+ "$tests_old_dir/Extraction_eddies_periodic/*.shp"
+ ],
+ "stdin_filename": "$input_dir/successive_overlap_periodic_nml.txt"
}
]
diff --git a/Tests/test_local_extrema.f90 b/Tests/test_local_extrema.f90
index b63d0b18..4882658f 100644
--- a/Tests/test_local_extrema.f90
+++ b/Tests/test_local_extrema.f90
@@ -9,7 +9,7 @@ program test_local_extrema
use jumble, only: new_unit, get_command_arg_dyn
use netcdf, only: nf90_nowrite
use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_get_var, &
- nf95_gw_var, nf95_get_att
+ nf95_gw_var, nf95_get_att, find_coord
use local_extrema_m, only: local_extrema
use write_extr_map_m, only: write_extr_map
@@ -48,11 +48,11 @@ program test_local_extrema
print *, "periodic = ", periodic
print *, "Reading from ", filename, "..."
call nf95_open(filename, nf90_nowrite, ncid)
-
- call nf95_inq_varid(ncid, "lon", varid)
+
+ call find_coord(ncid, std_name = "longitude", varid = varid)
call nf95_gw_var(ncid, varid, longitude)
- call nf95_inq_varid(ncid, "lat", varid)
+ call find_coord(ncid, std_name = "latitude", varid = varid)
call nf95_gw_var(ncid, varid, latitude)
nlon = size(longitude)
diff --git a/Tests/test_max_speed_contour_ssh.f90 b/Tests/test_max_speed_contour_ssh.f90
index aa3669e2..f3d49841 100644
--- a/Tests/test_max_speed_contour_ssh.f90
+++ b/Tests/test_max_speed_contour_ssh.f90
@@ -54,9 +54,11 @@ program test_max_speed_contour_ssh
print *, "Reading from ", velocity_file, "..."
call nf95_open(velocity_file, nf90_nowrite, ncid)
call get_var(periodic = .false., max_rad_lon = 0, values = u, ncid = ncid, &
- nlon = nlon, name = "u", new_fill_value = ieee_value(0., IEEE_QUIET_NAN))
+ nlon = nlon, name = "ugos", &
+ new_fill_value = ieee_value(0., IEEE_QUIET_NAN))
call get_var(periodic = .false., max_rad_lon = 0, values = v, ncid = ncid, &
- nlon = nlon, name = "v", new_fill_value = ieee_value(0., IEEE_QUIET_NAN))
+ nlon = nlon, name = "vgos", &
+ new_fill_value = ieee_value(0., IEEE_QUIET_NAN))
call nf95_close(ncid)
print *, "level = ", max_speed_contour_ssh(ssh(:, :, 1), u, v, ind_extr, &
diff --git a/Tests/test_mean_speed.f90 b/Tests/test_mean_speed.f90
index e454a400..9a3672df 100644
--- a/Tests/test_mean_speed.f90
+++ b/Tests/test_mean_speed.f90
@@ -46,10 +46,10 @@ program test_mean_speed
allocate(u(nlon, nlat), v(nlon, nlat))
- call nf95_inq_varid(ncid, "u", varid)
+ call nf95_inq_varid(ncid, "ugos", varid)
call nf95_get_var(ncid, varid, u)
- call nf95_inq_varid(ncid, "v", varid)
+ call nf95_inq_varid(ncid, "vgos", varid)
call nf95_get_var(ncid, varid, v)
call nf95_close(ncid)
diff --git a/Tests/test_set_max_speed.f90 b/Tests/test_set_max_speed.f90
index 698a09f0..cb06b309 100644
--- a/Tests/test_set_max_speed.f90
+++ b/Tests/test_set_max_speed.f90
@@ -71,10 +71,10 @@ program test_set_max_speed
allocate(u(nlon, nlat), v(nlon, nlat))
- call nf95_inq_varid(ncid, "u", varid)
+ call nf95_inq_varid(ncid, "ugos", varid)
call nf95_get_var(ncid, varid, u)
- call nf95_inq_varid(ncid, "v", varid)
+ call nf95_inq_varid(ncid, "vgos", varid)
call nf95_get_var(ncid, varid, v)
call nf95_close(ncid)
diff --git a/derived_types.f90 b/derived_types.f90
index c82e669a..ffec6925 100644
--- a/derived_types.f90
+++ b/derived_types.f90
@@ -48,7 +48,7 @@ module derived_types
integer, allocatable:: extr_map(:, :)
! (1 - copy:nlon + copy, nlat) if the grid is periodic in
! longitude, else (nlon, nlat). copy can be max_radius(1) or
- ! disy_lim, depending on the program. At a point of extremum SSH:
+ ! dist_lim, depending on the program. At a point of extremum SSH:
! identification number or this extremum. 0 at other points.
integer, allocatable:: ind_extr(:, :) ! (2, number_vis_extr)
diff --git a/extraction_eddies.f90 b/extraction_eddies.f90
index dff093a1..b063fa76 100644
--- a/extraction_eddies.f90
+++ b/extraction_eddies.f90
@@ -130,9 +130,9 @@ program extraction_eddies
call nf95_close(ncid)
call nf95_open("uv.nc", nf90_nowrite, ncid)
- call get_var(periodic, max_radius(1), u, ncid, nlon, name = "u", &
+ call get_var(periodic, max_radius(1), u, ncid, nlon, name = "ugos", &
new_fill_value = ieee_value(0., IEEE_QUIET_NAN))
- call get_var(periodic, max_radius(1), v, ncid, nlon, name = "v", &
+ call get_var(periodic, max_radius(1), v, ncid, nlon, name = "vgos", &
new_fill_value = ieee_value(0., IEEE_QUIET_NAN))
! (We will need quiet NaNs rather the original fill values for u and
! v when we compute the max-speed contours and when we search the
@@ -191,10 +191,10 @@ program extraction_eddies
print *, "Number of extrema:", s%number_vis_extr
CALL shpclose(hshp_extremum)
- print *, 'Created shapefile "extremum_1".'
+ print *, 'Created shapefile "extremum".'
CALL shpclose(hshp_outermost)
- print *, 'Created shapefile "outermost_contour_1".'
+ print *, 'Created shapefile "outermost_contour".'
CALL shpclose(hshp_max_speed)
- print *, 'Created shapefile "max_speed_contour_1".'
+ print *, 'Created shapefile "max_speed_contour".'
end program extraction_eddies
diff --git a/read_snapshot.f90 b/read_snapshot.f90
index 72c4b126..50b2736c 100644
--- a/read_snapshot.f90
+++ b/read_snapshot.f90
@@ -46,7 +46,7 @@ contains
!---------------------------------------------------------------------
- call shp_get_info_03(hshp_extremum, s%number_vis_extr)
+ call shp_get_info_03(hshp_extremum, n_entities = s%number_vis_extr)
allocate(s%list_vis(s%number_vis_extr))
call read_field_indices(hshp_extremum, hshp_outermost, hshp_max_speed)
--
GitLab