all good

faizan90 · Nov 25, 2019 · 5bb69e1 · 5bb69e1
1 parent bd0c5da
commit 5bb69e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/models/opts/hbv_opt.pyx b/models/opts/hbv_opt.pyx
@@ -1060,6 +1060,6 @@ cpdef dict hbv_opt(args):
         out_dict['curr_obj_vals'] = np.asarray(curr_obj_vals)
 
     else:
-        with gil: raise NotImplementedError
+        raise NotImplementedError
 
     return out_dict
diff --git a/templates/config_hydmodeling_template_h5.ini b/templates/config_hydmodeling_template_h5.ini
@@ -23,9 +23,8 @@ out_wat_ids_file=${HYD_ANSYS:out_pre_proc_dir}/watersheds_id_modif.txt
 
 [CREATE_STM_RELS]
 # prcss_cats_list is cat nos seperated by commas
-#prcss_cats_list=420;427;454;3421;3465;3470
-prcss_cats_list=427
-hyd_mod_dir=${main_dir}/test_residual_q_14
+prcss_cats_list=420;427;454;3421;3465;3470
+hyd_mod_dir=${main_dir}/test_residual_q_19
 cats_prcssed_file=${hyd_mod_dir}/cats_prcssed_df.csv
 stms_prcssed_file=${hyd_mod_dir}/stms_prcssed_df.csv
 watershed_field_name=DN
@@ -57,12 +56,12 @@ time_fmt=%Y-%m-%d %H:%M:%S
 sim_dates=1961-06-01;1970-05-30
 
 #calibration and validation time
-calib_dates=1996-09-01;1999-08-31
+calib_dates=1966-09-01;2015-12-31
 valid_dates=1961-09-01;1966-08-31
 
 kfolds=1
 
-route_type=1
+route_type=0
 use_obs_flow_flag=False
 use_res_cat_runoff_flag=False
 
@@ -75,7 +74,7 @@ obj_ftn_wts=1.0;0.0;0.0;0.0
 run_as_lump_flag=True
 
 use_resampled_obj_ftns_flag=False
-discharge_resampling_freq=W
+discharge_resampling_freq=M
 
 ft_beg_freq=2D
 ft_beg_freq_inc_flag=True
@@ -95,10 +94,8 @@ k_ul=1e-5;0.5
 k_d=1e-5;0.5
 k_ll=1e-5;0.3
 exp=0.01;10.0
-#musk_lag=1e-6;2.0
-#musk_wt=1e-6;0.3
-musk_lag=1e-4;1.0
-musk_wt=1e-4;0.3
+musk_lag=1e-6;2.0
+musk_wt=1e-6;0.3
 
 [PLOT_OPT_RES]
 plot_full_sim_flag=True