@@ -45,9 +45,11 @@ def get_param(params, name, default):
4545
4646def check_valid_params (params , valid_params ):
4747 # Invalid parameter handling
48- for param in params :
49- if param not in valid_params :
50- raise KeyError (f"Parameter { param } is not supported" )
48+ for key in params :
49+ if key not in valid_params :
50+ raise KeyError (f"Parameter { key } is not supported" )
51+ if key in ["kV" , "BasekV" ] and params [key ] < 0 :
52+ raise ValueError ("KV cannot be less than 0" )
5153
5254def make_load_node (load_params , load_type , count ):
5355 """
@@ -73,8 +75,6 @@ def make_load_node(load_params, load_type, count):
7375 setattr (load , attr , get_param (load_params , attr , random_param (load_type_param )))
7476 load .Daily = 'default'
7577
76- if (load .kV ) < 0 :
77- raise ValueError ("Cannot have negative voltage in load" )
7878 return load
7979
8080def make_source_node (source_params , source_type ):
@@ -101,9 +101,6 @@ def make_source_node(source_params, source_type):
101101 for imp in ["R0" , "R1" , "X0" , "X1" ]:
102102 setattr (source , imp , get_param (source_params , imp , defaults .IMPEDANCE ))
103103
104- if (source .BasekV ) < 0 :
105- raise ValueError ("Cannot have negative voltage in source" )
106-
107104 return source
108105
109106def make_pv (load_node , params , num_panels , count ):
@@ -122,8 +119,6 @@ def make_pv(load_node, params, num_panels, count):
122119 pv .Phases = get_param (params , "phases" , defaults .PHASES )
123120 pv .kV = get_param (params , "kV" , random_param (defaults .SOLAR_PANEL_BASE_KV ) * num_panels )
124121 # todo: inverter capacity?
125- if (pv .kV ) < 0 :
126- raise ValueError ("Cannot have negative voltage for PVsystem" )
127122
128123def make_generator (params , gen_type , count ):
129124 """
@@ -142,7 +137,4 @@ def make_generator(params, gen_type, count):
142137 generator .Phases = get_param (params , "phases" , defaults .PHASES )
143138 for attr in ["kV" , "kW" ]:
144139 gen_type_param = GENERATOR_CONFIGURATIONS [gen_type_obj ][attr ]
145- setattr (generator , attr , get_param (params , attr , random_param (gen_type_param )))
146-
147- if (generator .kV ) < 0 :
148- raise ValueError ("Cannot have negative voltage in generatorsource" )
140+ setattr (generator , attr , get_param (params , attr , random_param (gen_type_param )))
0 commit comments