Used searchsorted(,'right') in sampling.

c-h-david · Sep 19, 2021 · 85d2541 · 85d2541
1 parent 580ada3
commit 85d2541
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/rrr_anl_spl_mod.py b/src/rrr_anl_spl_mod.py
@@ -347,11 +347,10 @@
           ZS_spl_tim=ZV_time3[0]+JS_cyc*ZS_cyc_tim+ZS_mea_tim
           if (ZS_spl_tim<=ZV_time3[IS_time3-1]+ZS_TauR):
                #Here we're copying the value for each of the sampled river IDs
-               JS_time3=numpy.searchsorted(ZV_time1,ZS_spl_tim,side='left')-1
-               #JS_time3=numpy.searchsorted(ZV_time1,ZS_spl_tim,side='right')-1
-               #if JS_time3<0 or JS_time3>IS_time3-1:
-               #     print('ERROR: Unexpected JS_time3 value: '+str(JS_time3))
-               #     raise SystemExit(22)
+               JS_time3=numpy.searchsorted(ZV_time1,ZS_spl_tim,side='right')-1
+               if JS_time3<0 or JS_time3>IS_time3-1:
+                    print('ERROR: Unexpected JS_time3 value: '+str(JS_time3))
+                    raise SystemExit(22)
                IV_ids=ZH_mea_tim[ZS_mea_tim]
                IV_idx1=[IH_hsh1[IS_ids] for IS_ids in IV_ids]
                # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -