Commit 8a138780 authored by Anthony Schrapffer's avatar Anthony Schrapffer
Browse files

Small changes in Merge (undefined upstream area + Merge index)

parent 5ff97240
...@@ -148,6 +148,7 @@ class AllStations : ...@@ -148,6 +148,7 @@ class AllStations :
self.hist = hist self.hist = hist
# #
FillValue = 1.0e+20 FillValue = 1.0e+20
FillValueInt = -999
self.nbmonth = len(dates) self.nbmonth = len(dates)
# Maximum options for original data # Maximum options for original data
if self.mergersource is not None : if self.mergersource is not None :
...@@ -254,7 +255,7 @@ class AllStations : ...@@ -254,7 +255,7 @@ class AllStations :
area=out.createVariable('area', 'f', ('stations',)) area=out.createVariable('area', 'f', ('stations',))
area.units="km^2" area.units="km^2"
area.long_name="Catchment Area" area.long_name="Catchment Area"
altitude=out.createVariable('altitude', 'f', ('stations',)) altitude=out.createVariable('altitude', 'f', ('stations',), fill_value=FillValueInt)
altitude.units="m" altitude.units="m"
altitude.long_name="Altitude of Station" altitude.long_name="Altitude of Station"
# #
...@@ -582,8 +583,7 @@ def stnnbchecker(C) : ...@@ -582,8 +583,7 @@ def stnnbchecker(C) :
if regstnnb.shape[0] < 1 : if regstnnb.shape[0] < 1 :
t = reg[i]*100000+subreg[i]*1000 t = reg[i]*100000+subreg[i]*1000
else : else :
regnum = np.min(regstnnb) t = np.min(regstnnb)-1
t= regnum - 1
if not any(stnnb == t) : if not any(stnnb == t) :
stnnb[i] = t stnnb[i] = t
C.stations[i].Number = stnnb[i] C.stations[i].Number = stnnb[i]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment