@@ -248,18 +248,20 @@ def __init__(self, model: Model):
248
248
ErrMessage = 'assume default for Initial Timestep Count (5)' ,
249
249
ToolTipText = 'The number of timesteps in the first ~3 hours of model'
250
250
)
251
- self .final_timestep_count = self .ParameterDict [self .final_timestep_count .Name ] = intParameter (
251
+ self .final_timestep_count = self .ParameterDict [self .final_timestep_count .Name ] = floatParameter (
252
252
'SBT Final Timestep Count' ,
253
253
DefaultValue = 70 ,
254
- AllowableRange = [5 , 1000 ],
254
+ Min = 5 ,
255
+ Max = 1000 ,
255
256
UnitType = Units .NONE ,
256
257
ErrMessage = 'assume default for Final Timestep Count 70)' ,
257
258
ToolTipText = 'The number of timesteps after the first ~3 hours of model'
258
259
)
259
- self .initial_final_timestep_transition = self .ParameterDict [self .initial_final_timestep_transition .Name ] = intParameter (
260
+ self .initial_final_timestep_transition = self .ParameterDict [self .initial_final_timestep_transition .Name ] = floatParameter (
260
261
'SBT Initial to Final Timestep Transition' ,
261
262
DefaultValue = 9900 ,
262
- AllowableRange = [1 , 40_000_000 ],
263
+ Min = 1 ,
264
+ Max = 40_000_000 ,
263
265
UnitType = Units .TIME ,
264
266
PreferredUnits = TimeUnit .SECOND ,
265
267
CurrentUnits = TimeUnit .SECOND ,
@@ -1098,7 +1100,7 @@ def Calculate_Uloop(self, model):
1098
1100
initial_times = np .linspace (0 , self .initial_final_timestep_transition .value , self .initial_timestep_count .value )
1099
1101
initial_time_interval = initial_times [1 ] - initial_times [0 ]
1100
1102
final_start = self .initial_final_timestep_transition .value + initial_time_interval
1101
- final_times = np .logspace (np .log10 (final_start ), np .log10 (model .surfaceplant .plant_lifetime .value * 365 * 24 * 3600 ), self .final_timestep_count .value )
1103
+ final_times = np .logspace (np .log10 (final_start ), np .log10 (model .surfaceplant .plant_lifetime .value * 365 * 24 * 3600 ), int ( self .final_timestep_count .value ) )
1102
1104
times = np .concatenate ([initial_times , final_times ])
1103
1105
# Note 1: When providing a variable injection temperature or flow rate, a finer time grid should be considered.
1104
1106
# Below is one with long term time steps of about 36 days.
0 commit comments