psr-factory 5.0.0b12__py3-none-win_amd64.whl → 5.0.0b14__py3-none-win_amd64.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- psr/cloud/cloud.py +2 -2
- psr/cloud/version.py +1 -1
- psr/execqueue/server.py +1 -1
- psr/execqueue/watcher.py +7 -3
- psr/factory/__init__.py +1 -1
- psr/factory/factory.dll +0 -0
- psr/factory/factory.pmd +18 -39
- psr/factory/factory.pmk +90 -91
- psr/factory/libcurl-x64.dll +0 -0
- psr/factory/samples/__init__.py +2 -0
- psr/factory/samples/sddp_case01.py +3 -3
- psr/factory/samples/sddp_case21.py +3 -3
- {psr_factory-5.0.0b12.dist-info → psr_factory-5.0.0b14.dist-info}/METADATA +2 -1
- {psr_factory-5.0.0b12.dist-info → psr_factory-5.0.0b14.dist-info}/RECORD +17 -17
- {psr_factory-5.0.0b12.dist-info → psr_factory-5.0.0b14.dist-info}/WHEEL +0 -0
- {psr_factory-5.0.0b12.dist-info → psr_factory-5.0.0b14.dist-info}/licenses/LICENSE.txt +0 -0
- {psr_factory-5.0.0b12.dist-info → psr_factory-5.0.0b14.dist-info}/top_level.txt +0 -0
psr/cloud/cloud.py
CHANGED
@@ -162,8 +162,8 @@ class Client:
|
|
162
162
|
self._logger.info(
|
163
163
|
"Using Python client for PSR Cloud. Some features may not be available."
|
164
164
|
)
|
165
|
-
|
166
|
-
|
165
|
+
else:
|
166
|
+
self._console_path_setup(**kwargs)
|
167
167
|
|
168
168
|
self._credentials_setup(**kwargs)
|
169
169
|
|
psr/cloud/version.py
CHANGED
psr/execqueue/server.py
CHANGED
@@ -76,7 +76,7 @@ def run_cloud_case(execution_id: str, case_path: str):
|
|
76
76
|
name="LSEG Server "+ execution_id,
|
77
77
|
data_path=case_path,
|
78
78
|
program="SDDP",
|
79
|
-
program_version = "17.2.
|
79
|
+
program_version = "17.2.12",
|
80
80
|
execution_type="Default",
|
81
81
|
memory_per_process_ratio='2:1',
|
82
82
|
price_optimized=False,
|
psr/execqueue/watcher.py
CHANGED
@@ -12,7 +12,7 @@ SERVER_URL = os.getenv("SERVER_URL", "http://127.0.0.1:5000")
|
|
12
12
|
WATCH_DIR = os.getenv("WATCH_DIR")
|
13
13
|
PROCESSED_DIR = os.getenv("PROCESSED_DIR")
|
14
14
|
RESULTS_DIR = os.getenv("RESULTS_DIR", "results")
|
15
|
-
SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "
|
15
|
+
SLEEP_SECONDS = int(os.getenv("WATCHER_SLEEP", "30"))
|
16
16
|
DB_PATH = os.getenv("WATCHER_DB_PATH", "watcher.sqlite")
|
17
17
|
|
18
18
|
|
@@ -74,7 +74,7 @@ def _check_and_download_results():
|
|
74
74
|
for row in rows:
|
75
75
|
record_id, filename, cloud_upload_id = row
|
76
76
|
status = execqueue.get_execution_status(cloud_upload_id, SERVER_URL, cloud_execution=True, return_status_id=True)
|
77
|
-
if status == "5" or status == 5:
|
77
|
+
if status == "5" or status == 5:
|
78
78
|
files = execqueue.get_results(cloud_upload_id, SERVER_URL, cloud_execution=True)
|
79
79
|
if files:
|
80
80
|
base_filename = os.path.splitext(filename)[0]
|
@@ -88,6 +88,10 @@ def _check_and_download_results():
|
|
88
88
|
cursor.execute("UPDATE processed_files SET downloaded=1 WHERE id=?", (record_id,))
|
89
89
|
conn.commit()
|
90
90
|
logging.info(f"Results of {cloud_upload_id} downloaded to {download_path}")
|
91
|
+
elif status == "4" or status == 4:
|
92
|
+
logging.info(f"Execution {cloud_upload_id} is finished with errors.")
|
93
|
+
cursor.execute("UPDATE processed_files SET downloaded=4 WHERE id=?", (record_id,))
|
94
|
+
conn.commit()
|
91
95
|
conn.close()
|
92
96
|
|
93
97
|
|
@@ -116,8 +120,8 @@ if __name__ == "__main__":
|
|
116
120
|
|
117
121
|
while True:
|
118
122
|
try:
|
119
|
-
_process_zip_files()
|
120
123
|
_check_and_download_results()
|
124
|
+
_process_zip_files()
|
121
125
|
|
122
126
|
except Exception as e:
|
123
127
|
logging.error(f"Watcher error: {e}", exc_info=True)
|
psr/factory/__init__.py
CHANGED
psr/factory/factory.dll
CHANGED
Binary file
|
psr/factory/factory.pmd
CHANGED
@@ -3113,7 +3113,7 @@ DEFINE_MODEL MODL:Xpress_Controls_Keywords
|
|
3113
3113
|
PARM INTEGER PREPROBING
|
3114
3114
|
PARM INTEGER PREDOMCOL
|
3115
3115
|
PARM INTEGER PREDOMROW
|
3116
|
-
PARM INTEGER
|
3116
|
+
PARM INTEGER HEUREMPHASIS
|
3117
3117
|
PARM INTEGER MAXNODE
|
3118
3118
|
PARM REAL MIPTOL
|
3119
3119
|
PARM REAL MIPABSSTOP
|
@@ -3272,6 +3272,7 @@ DEFINE_MODEL MODL:Optmain_Options
|
|
3272
3272
|
PARM INTEGER NCVR
|
3273
3273
|
PARM INTEGER WSVF
|
3274
3274
|
PARM INTEGER WSLX
|
3275
|
+
PARM INTEGER RFPR
|
3275
3276
|
END_MODEL
|
3276
3277
|
|
3277
3278
|
//--------------------------------------------------------------------------------------------------
|
@@ -4120,8 +4121,6 @@ DEFINE_MODEL MODL:SDDP_V10.2_Sistema
|
|
4120
4121
|
VECTOR REAL CoefVariation DIM(block) INDEX DateCoefVariation
|
4121
4122
|
|
4122
4123
|
MERGE_MODEL Sddp_Georeference
|
4123
|
-
|
4124
|
-
PARM REFERENCE SystemDistributedGeneration PSRTimeSeries
|
4125
4124
|
END_MODEL
|
4126
4125
|
|
4127
4126
|
//--------------------------------------------------------------------------------------------------
|
@@ -4228,8 +4227,6 @@ DEFINE_MODEL MODL:SDDP_V10.2_SegmentoDemanda
|
|
4228
4227
|
VETOR REAL HourDemandPrice INDEX DataHourDemandPrice
|
4229
4228
|
|
4230
4229
|
VETOR REAL HourDemandScen
|
4231
|
-
|
4232
|
-
PARM REFERENCE DemandTimeSeriesTest PSRTimeSeries
|
4233
4230
|
END_MODEL
|
4234
4231
|
|
4235
4232
|
//--------------------------------------------------------------------------------------------------
|
@@ -4384,7 +4381,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Termica
|
|
4384
4381
|
DIMENSION reserve_price
|
4385
4382
|
|
4386
4383
|
PARM INTEGER ComT
|
4387
|
-
PARM INTEGER ThermalType
|
4384
|
+
PARM INTEGER ThermalType DEFAULT 0
|
4388
4385
|
|
4389
4386
|
VETOR DATE Data @addyear_modification
|
4390
4387
|
VETOR DATE DataCesp
|
@@ -4711,9 +4708,6 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
|
|
4711
4708
|
VETOR DATE LGC_Data @chronological @addyear_chronological
|
4712
4709
|
VETOR REAL LGC_MonthlyPremium INDEX LGC_Data
|
4713
4710
|
|
4714
|
-
PARM REFERENCE MinimumGenerationTimeSeries PSRTimeSeries
|
4715
|
-
PARM REFERENCE MaintenanceScheduleTimeSeries PSRTimeSeries
|
4716
|
-
|
4717
4711
|
END_MODEL
|
4718
4712
|
//--------------------------------------------------------------------------------------------------
|
4719
4713
|
// Modelo para Geracao nao despachavel
|
@@ -5855,6 +5849,14 @@ DEFINE_MODEL MODL:SDDP_Line
|
|
5855
5849
|
VECTOR REAL CostFromTo DIM(block) INDEX DateCostFromTo
|
5856
5850
|
VECTOR DATE DateCostToFrom @addyear_chronological
|
5857
5851
|
VECTOR REAL CostToFrom DIM(block) INDEX DateCostToFrom
|
5852
|
+
|
5853
|
+
PARM INTEGER MaxSecondaryReserveUnit
|
5854
|
+
PARM INTEGER HasMaxSecondaryReserve
|
5855
|
+
VETOR DATE DataMaxSecondaryReserve @chronological @addyear_chronological
|
5856
|
+
VETOR REAL MaxSecondaryReserve DIM(block) INDEX DataMaxSecondaryReserve
|
5857
|
+
PARM INTEGER HasPriceSecondaryReserve
|
5858
|
+
VETOR DATE DataPriceSecondaryReserve @chronological @addyear_chronological
|
5859
|
+
VETOR REAL PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
|
5858
5860
|
|
5859
5861
|
MERGE_MODEL MODL:SDDP_Asset
|
5860
5862
|
END_MODEL
|
@@ -6447,35 +6449,6 @@ DEFINE_MODEL MODL:SDDP_CircuitSum
|
|
6447
6449
|
END_MODEL
|
6448
6450
|
|
6449
6451
|
|
6450
|
-
//----------------------------------------------------------------------
|
6451
|
-
// Time Series Template model
|
6452
|
-
//----------------------------------------------------------------------
|
6453
|
-
DEFINE_MODEL MODL:SDDP_TimeSeriesTemplate
|
6454
|
-
DIMENSION columns
|
6455
|
-
|
6456
|
-
VECTOR STRING Names DIM(columns)
|
6457
|
-
|
6458
|
-
VECTOR DATE DateStart
|
6459
|
-
VECTOR DATE DateEnd INTERVAL DateStart
|
6460
|
-
VECTOR REAL Values DIM(columns) INDEX DateStart
|
6461
|
-
|
6462
|
-
END_MODEL
|
6463
|
-
//----------------------------------------------------------------------
|
6464
|
-
// Time Series Instance model
|
6465
|
-
//----------------------------------------------------------------------
|
6466
|
-
DEFINE_MODEL MODL:SDDP_TimeSeries
|
6467
|
-
VECTOR DATE DateDefault
|
6468
|
-
VECTOR REAL Default INDEX DateDefault
|
6469
|
-
|
6470
|
-
VECTOR DATE DateGain
|
6471
|
-
VECTOR REAL Gain INDEX DateGain
|
6472
|
-
|
6473
|
-
VECTOR DATE Date
|
6474
|
-
VECTOR REAL Offset INDEX Date
|
6475
|
-
VECTOR REAL Min INDEX Date
|
6476
|
-
VECTOR REAL Max INDEX Date
|
6477
|
-
END_MODEL
|
6478
|
-
|
6479
6452
|
//--------------------------------------
|
6480
6453
|
//--- Modelo para a Carga de Barra ---
|
6481
6454
|
//--------------------------------------
|
@@ -6505,7 +6478,7 @@ DEFINE_MODEL MODL:TSL_Configuration
|
|
6505
6478
|
PARM STRING MainTurbinePath
|
6506
6479
|
PARM STRING MERRAPath
|
6507
6480
|
|
6508
|
-
VECTOR REFERENCE SelectedGndStations
|
6481
|
+
VECTOR REFERENCE SelectedGndStations PSRElement
|
6509
6482
|
|
6510
6483
|
// --- time series flags---
|
6511
6484
|
PARM INTEGER TimeSeriesExecutionFlag
|
@@ -6524,6 +6497,8 @@ DEFINE_MODEL MODL:TSL_GndPlant
|
|
6524
6497
|
PARM REAL DCACRatio
|
6525
6498
|
PARM REAL SystemLosses
|
6526
6499
|
PARM INTEGER UseAzimuth
|
6500
|
+
PARM INTEGER BifacialPanelFlag DEFAULT 0
|
6501
|
+
PARM REAL BifacialityFactor DEFAULT 0.7
|
6527
6502
|
|
6528
6503
|
// --- Eolic ---
|
6529
6504
|
PARM REAL Height
|
@@ -6569,6 +6544,10 @@ DEFINE_MODEL MODL:TSL_TemperaturePoint
|
|
6569
6544
|
PARM INTEGER Type
|
6570
6545
|
END_MODEL
|
6571
6546
|
|
6547
|
+
DEFINE_MODEL MODL:TSL_DlrStation
|
6548
|
+
PARM INTEGER Id
|
6549
|
+
END_MODEL
|
6550
|
+
|
6572
6551
|
DEFINE_MODEL MODL:TSL_Climate_Configuration
|
6573
6552
|
PARM STRING ClimateModel
|
6574
6553
|
|
psr/factory/factory.pmk
CHANGED
@@ -12158,7 +12158,7 @@ DEFINE_MASK CSVDATA SDDP_v17.4_cbattery
|
|
12158
12158
|
|
12159
12159
|
DEFINE_HEADER
|
12160
12160
|
$version=2
|
12161
|
-
!Code,Name,Bus,Existing,Emin,Emax,Einic,Pmax,ChargeEffic,DischargeEffic,RegTime,
|
12161
|
+
!Code,Name,Bus,Existing,Emin,Emax,Einic,Pmax,ChargeEffic,DischargeEffic,RegTime,FlagInterStage,ChargeRamp,DischargeRamp,O&MType,O&MCost,RegType,ControlledBusCode,ReactivePowerControlType,MinReactivePower,MaxReactivePower,ReactivePowerFactor,GenDev,MaxDev,DevOpt
|
12162
12162
|
END_HEADER
|
12163
12163
|
|
12164
12164
|
DEFINE_DATA
|
@@ -15338,97 +15338,7 @@ END_DATA
|
|
15338
15338
|
|
15339
15339
|
END_MASK
|
15340
15340
|
//---------------------------------------------------------------------
|
15341
|
-
DEFINE_MASK CSVDATA SDDP_timeseriesdatatable
|
15342
15341
|
|
15343
|
-
DEFINE_HEADER
|
15344
|
-
$version=1
|
15345
|
-
!code,name,filepath
|
15346
|
-
END_HEADER
|
15347
|
-
|
15348
|
-
DEFINE_DATA
|
15349
|
-
Code INTEGER 1
|
15350
|
-
Name STRING 2
|
15351
|
-
FilePath STRING 3
|
15352
|
-
END_DATA
|
15353
|
-
END_MASK
|
15354
|
-
//---------------------------------------------------------------------
|
15355
|
-
DEFINE_MASK CSVDATA SDDP_timeseriesinstance
|
15356
|
-
|
15357
|
-
DEFINE_HEADER
|
15358
|
-
$version=1
|
15359
|
-
!class,code,name,id,index,timeseries,datatable,column
|
15360
|
-
END_HEADER
|
15361
|
-
|
15362
|
-
DEFINE_DATA
|
15363
|
-
ElementClass INTEGER 1
|
15364
|
-
ElementCode INTEGER 2
|
15365
|
-
ElementName STRING 3
|
15366
|
-
ElementId STRING 4
|
15367
|
-
ElementIndex INTEGER 5
|
15368
|
-
TimeSeries STRING 6
|
15369
|
-
DataTable STRING 7
|
15370
|
-
Column STRING 8
|
15371
|
-
END_DATA
|
15372
|
-
END_MASK
|
15373
|
-
//---------------------------------------------------------------------
|
15374
|
-
DEFINE_MASK CSVDATA SDDP_timeseriesdefault
|
15375
|
-
|
15376
|
-
DEFINE_HEADER
|
15377
|
-
$version=1
|
15378
|
-
!class,code,name,id,index,timeseries,date,default
|
15379
|
-
END_HEADER
|
15380
|
-
|
15381
|
-
DEFINE_DATA
|
15382
|
-
ElementClass INTEGER 1
|
15383
|
-
ElementCode INTEGER 2
|
15384
|
-
ElementName STRING 3
|
15385
|
-
ElementId STRING 4
|
15386
|
-
ElementIndex INTEGER 5
|
15387
|
-
TimeSeries STRING 6
|
15388
|
-
DateDefault DATE 7 DD/MM/YYYY AUTOSET
|
15389
|
-
Default REAL 8 AUTOSET
|
15390
|
-
END_DATA
|
15391
|
-
END_MASK
|
15392
|
-
//---------------------------------------------------------------------
|
15393
|
-
DEFINE_MASK CSVDATA SDDP_timeseriesgain
|
15394
|
-
|
15395
|
-
DEFINE_HEADER
|
15396
|
-
$version=1
|
15397
|
-
!class,code,name,id,index,timeseries,date,gain
|
15398
|
-
END_HEADER
|
15399
|
-
|
15400
|
-
DEFINE_DATA
|
15401
|
-
ElementClass INTEGER 1
|
15402
|
-
ElementCode INTEGER 2
|
15403
|
-
ElementName STRING 3
|
15404
|
-
ElementId STRING 4
|
15405
|
-
ElementIndex INTEGER 5
|
15406
|
-
TimeSeries STRING 6
|
15407
|
-
DateGain DATE 7 DD/MM/YYYY AUTOSET
|
15408
|
-
Gain REAL 8 AUTOSET
|
15409
|
-
END_DATA
|
15410
|
-
END_MASK
|
15411
|
-
//---------------------------------------------------------------------
|
15412
|
-
DEFINE_MASK CSVDATA SDDP_timeseriesproperties
|
15413
|
-
|
15414
|
-
DEFINE_HEADER
|
15415
|
-
$version=1
|
15416
|
-
!class,code,name,id,index,timeseries,date,offset,min,max
|
15417
|
-
END_HEADER
|
15418
|
-
|
15419
|
-
DEFINE_DATA
|
15420
|
-
ElementClass INTEGER 1
|
15421
|
-
ElementCode INTEGER 2
|
15422
|
-
ElementName STRING 3
|
15423
|
-
ElementId STRING 4
|
15424
|
-
ElementIndex INTEGER 5
|
15425
|
-
TimeSeries STRING 6
|
15426
|
-
DateProperty DATE 7 DD/MM/YYYY AUTOSET
|
15427
|
-
Offset REAL 8 AUTOSET
|
15428
|
-
Min REAL 9 AUTOSET
|
15429
|
-
Max REAL 10 AUTOSET
|
15430
|
-
END_DATA
|
15431
|
-
END_MASK
|
15432
15342
|
//---------------------------------------------------------------------
|
15433
15343
|
DEFINE_MASK CSVDATA SDDP_georeference_system
|
15434
15344
|
|
@@ -18028,6 +17938,44 @@ $version=1
|
|
18028
17938
|
END_HEADER
|
18029
17939
|
END_MASK
|
18030
17940
|
|
17941
|
+
DEFINE_MASK CSVDATA SDDP_circ_res_sharing_me
|
17942
|
+
|
17943
|
+
DEFINE_HEADER
|
17944
|
+
$version=1
|
17945
|
+
!Code,Year,Block,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10,Value11,Value12
|
17946
|
+
END_HEADER
|
17947
|
+
|
17948
|
+
DEFINE_MACRO
|
17949
|
+
VAR B 1,12
|
17950
|
+
END_MACRO
|
17951
|
+
|
17952
|
+
DEFINE_DATA
|
17953
|
+
Code INTEGER,1
|
17954
|
+
Year INTEGER,2
|
17955
|
+
Block INTEGER,3
|
17956
|
+
Value($(B)) REAL,4+($(B))
|
17957
|
+
END_DATA
|
17958
|
+
END_MASK
|
17959
|
+
|
17960
|
+
DEFINE_MASK CSVDATA SDDP_circ_res_sharing_se
|
17961
|
+
|
17962
|
+
DEFINE_HEADER
|
17963
|
+
$version=1
|
17964
|
+
!Code,Year,Block,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10,Value11,Value12,(...),Value52
|
17965
|
+
END_HEADER
|
17966
|
+
|
17967
|
+
DEFINE_MACRO
|
17968
|
+
VAR B 1,52
|
17969
|
+
END_MACRO
|
17970
|
+
|
17971
|
+
DEFINE_DATA
|
17972
|
+
Code INTEGER,1
|
17973
|
+
Year INTEGER,2
|
17974
|
+
Block INTEGER,3
|
17975
|
+
Value($(B)) REAL,4+($(B))
|
17976
|
+
END_DATA
|
17977
|
+
END_MASK
|
17978
|
+
|
18031
17979
|
//---------------------------------------------------------------------
|
18032
17980
|
//---------------------------------------------------------------------
|
18033
17981
|
DEFINE_MASK ROWDATA SDDP_v10.3_cloads
|
@@ -18478,6 +18426,8 @@ END_BLOCK
|
|
18478
18426
|
|
18479
18427
|
END_MASK
|
18480
18428
|
|
18429
|
+
|
18430
|
+
|
18481
18431
|
//---------------------------------------------------------------------
|
18482
18432
|
//---------------------------------------------------------------------
|
18483
18433
|
DEFINE_MASK CSVDATA TSL_rps
|
@@ -18551,6 +18501,55 @@ END_DATA
|
|
18551
18501
|
|
18552
18502
|
END_MASK
|
18553
18503
|
|
18504
|
+
//---------------------------------------------------------------------
|
18505
|
+
//---------------------------------------------------------------------
|
18506
|
+
DEFINE_MASK CSVDATA TSL_dlrstation
|
18507
|
+
|
18508
|
+
DEFINE_HEADER
|
18509
|
+
!ID_TSLDATA,StationCode,StationName
|
18510
|
+
END_HEADER
|
18511
|
+
DEFINE_DATA
|
18512
|
+
Id INTEGER,1
|
18513
|
+
Code INTEGER,2
|
18514
|
+
Name STRING,3
|
18515
|
+
|
18516
|
+
END_DATA
|
18517
|
+
|
18518
|
+
END_MASK
|
18519
|
+
|
18520
|
+
//---------------------------------------------------------------------
|
18521
|
+
//---------------------------------------------------------------------
|
18522
|
+
DEFINE_MASK CSVDATA TSL_gndrps_v2
|
18523
|
+
|
18524
|
+
DEFINE_HEADER
|
18525
|
+
$version=2
|
18526
|
+
cod,sis,name,StationCode,StationName,Traking,Tilt,Azimuth,Height,Turbine,Profile,DownsFlag,DensityCorrectionFlag,DensityCorrection,DCACRatio,SystemLosses,OptmizedAzimuth,BifacialPanelFlag,BifacialityFactor
|
18527
|
+
END_HEADER
|
18528
|
+
DEFINE_DATA
|
18529
|
+
Code INTEGER,1
|
18530
|
+
SystemCode INTEGER,2
|
18531
|
+
Name STRING,3
|
18532
|
+
StationCode INTEGER,4
|
18533
|
+
StationName STRING,5
|
18534
|
+
Traking INTEGER,6 AUTOSET(model.parm("Traking"))
|
18535
|
+
Tilt REAL,7 AUTOSET(model.parm("Tilt"))
|
18536
|
+
Azimuth REAL,8 AUTOSET(model.parm("Azimuth"))
|
18537
|
+
Height REAL,9 AUTOSET(model.parm("Height"))
|
18538
|
+
Turbine STRING,10
|
18539
|
+
Profile STRING,11
|
18540
|
+
DownscalingFlag INTEGER,12 AUTOSET(model.parm("DownscalingFlag"))
|
18541
|
+
DensityCorrectionFlag INTEGER,13 AUTOSET(model.parm("DownscalingFlag"))
|
18542
|
+
DensityCorrection REAL,14 AUTOSET(model.parm("DownscalingFlag"))
|
18543
|
+
DCACRatio REAL,15 AUTOSET(model.parm("DCACRatio"))
|
18544
|
+
SystemLosses REAL,16 AUTOSET(model.parm("SystemLosses"))
|
18545
|
+
UseAzimuth INTEGER,17 AUTOSET(model.parm("UseAzimuth"))
|
18546
|
+
BifacialPanelFlag INTEGER,18 AUTOSET(model.parm("BifacialPanelFlag"))
|
18547
|
+
BifacialityFactor REAL,19 AUTOSET(model.parm("BifacialityFactor"))
|
18548
|
+
|
18549
|
+
END_DATA
|
18550
|
+
|
18551
|
+
END_MASK
|
18552
|
+
|
18554
18553
|
//---------------------------------------------------------------------
|
18555
18554
|
//---------------------------------------------------------------------
|
18556
18555
|
DEFINE_MASK CSVDATA TSL_ceolcstgrid
|
psr/factory/libcurl-x64.dll
CHANGED
Binary file
|
psr/factory/samples/__init__.py
CHANGED
@@ -5,11 +5,11 @@ import os
|
|
5
5
|
import psr.factory
|
6
6
|
|
7
7
|
|
8
|
-
def
|
8
|
+
def _get_case_path() -> str:
|
9
9
|
return os.path.join(os.path.splitext(os.path.basename(__file__))[0], "")
|
10
10
|
|
11
11
|
|
12
|
-
def create_case01(legacy: bool) -> psr.factory.Study:
|
12
|
+
def create_case01(legacy: bool = False) -> psr.factory.Study:
|
13
13
|
blocks = 1
|
14
14
|
model = "SDDP" if not legacy else "SDDP17"
|
15
15
|
# Create a study object and define its basic settings.
|
@@ -155,7 +155,7 @@ def create_case01(legacy: bool) -> psr.factory.Study:
|
|
155
155
|
|
156
156
|
|
157
157
|
if __name__ == "__main__":
|
158
|
-
case_path =
|
158
|
+
case_path = _get_case_path()
|
159
159
|
os.makedirs(case_path, exist_ok=True)
|
160
160
|
print("Creating example case... ", end="")
|
161
161
|
study = create_case01(False)
|
@@ -5,11 +5,11 @@ import os
|
|
5
5
|
import psr.factory
|
6
6
|
|
7
7
|
|
8
|
-
def
|
8
|
+
def _get_case_path() -> str:
|
9
9
|
return os.path.join(os.path.splitext(os.path.basename(__file__))[0], "")
|
10
10
|
|
11
11
|
|
12
|
-
def create_case21(legacy: bool) -> psr.factory.Study:
|
12
|
+
def create_case21(legacy: bool = False) -> psr.factory.Study:
|
13
13
|
# Create a study object and define its basic settings.
|
14
14
|
blocks = 1
|
15
15
|
model = "SDDP" if not legacy else "SDDP17"
|
@@ -232,7 +232,7 @@ def create_case21(legacy: bool) -> psr.factory.Study:
|
|
232
232
|
|
233
233
|
|
234
234
|
if __name__ == "__main__":
|
235
|
-
case_path =
|
235
|
+
case_path = _get_case_path()
|
236
236
|
os.makedirs(case_path, exist_ok=True)
|
237
237
|
print("Creating example case... ", end="")
|
238
238
|
study = create_case21(False)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: psr-factory
|
3
|
-
Version: 5.0.
|
3
|
+
Version: 5.0.0b14
|
4
4
|
Summary: PSR database management module.
|
5
5
|
Author-email: "PSR Inc." <psrfactory@psr-inc.com>
|
6
6
|
License-Expression: MIT
|
@@ -48,6 +48,7 @@ Requires-Dist: requests; extra == "execqueue-server"
|
|
48
48
|
Provides-Extra: all
|
49
49
|
Requires-Dist: pandas; extra == "all"
|
50
50
|
Requires-Dist: polars; extra == "all"
|
51
|
+
Requires-Dist: psutil; extra == "all"
|
51
52
|
Requires-Dist: zeep; extra == "all"
|
52
53
|
Requires-Dist: filelock; extra == "all"
|
53
54
|
Requires-Dist: pefile; extra == "all"
|
@@ -3,38 +3,38 @@ psr/apps/apps.py,sha256=V8Ewht7P1I-3sSkV3dnbxbLjF2slxPjcmtzmVaLjiNY,6746
|
|
3
3
|
psr/apps/version.py,sha256=vs459L6JsatAkUxna7BNG-vMCaXpO1Ye8c1bmkEx4U4,194
|
4
4
|
psr/cloud/__init__.py,sha256=inZMwG7O9Fca9hg1BhqYObOYtTTJOkpuTIuXnkHJZkI,246
|
5
5
|
psr/cloud/aws.py,sha256=ro8kBNVxpGDXgZ5haceqX-MAD-0F5KFDJJ4M6rRvwS8,9915
|
6
|
-
psr/cloud/cloud.py,sha256
|
6
|
+
psr/cloud/cloud.py,sha256=DyekYGxUP2PeEwd0eJvRaWlelrYvRgAWRDYf01H3cks,59141
|
7
7
|
psr/cloud/data.py,sha256=oDJyzcNsA7aAYi_qJKCUjCeGZvN-25E8KjZ-5RamNLE,4160
|
8
8
|
psr/cloud/desktop.py,sha256=JFroCMEFV1Nz3has74n7OVrGCg2lS7Ev5bcjdw2hRxY,2980
|
9
9
|
psr/cloud/log.py,sha256=Dvhz1enIWlFWeaRK7JAAuZVPfODgoEIRNcHEmbEliyQ,1366
|
10
10
|
psr/cloud/status.py,sha256=vcI4B9S6wCt9maT5NNrVwYaEgGIvy6kkC1UVpJjYbtw,3607
|
11
11
|
psr/cloud/tempfile.py,sha256=1IOeye0eKWnmBynK5K5FMWiTaEVhn4GbQ8_y0THEva0,3893
|
12
|
-
psr/cloud/version.py,sha256=
|
12
|
+
psr/cloud/version.py,sha256=jwq5nQsan38iZF0lj5GFK7l9EIe4aSF1NzdcupAfHP4,192
|
13
13
|
psr/cloud/xml.py,sha256=ac2lyflOQm8khPvJn0zmI26I4sfUDY6A_OTsxzbMQEs,1896
|
14
14
|
psr/execqueue/client.py,sha256=hAhoFPL6xu-o1wtoTtkTp-LCqHdXUohTbCyt9nXkdrQ,4724
|
15
15
|
psr/execqueue/config.py,sha256=3KVwASOgRlymOSPeabotgBdLVB5sPKnPQ9og2q3LQfw,1418
|
16
16
|
psr/execqueue/db.py,sha256=0pH5ksXChz6PR_GQs6OPokK3zVkY1-OZRAqYbVIEh9k,8281
|
17
|
-
psr/execqueue/server.py,sha256=
|
18
|
-
psr/execqueue/watcher.py,sha256=
|
19
|
-
psr/factory/__init__.py,sha256=
|
17
|
+
psr/execqueue/server.py,sha256=jhpSFFTTeTTOp5XrH_sHhRmjnZtRIMkJYxr_OkTyWjY,13932
|
18
|
+
psr/execqueue/watcher.py,sha256=q9ceq119OW-gEnEt5aAvbiGHtN8H3c0s-j2H_1rCXII,5060
|
19
|
+
psr/factory/__init__.py,sha256=9fKZAK3rOarrwrFHwW34OI8ZwrS_34HFbsQhx8ak0RE,219
|
20
20
|
psr/factory/api.py,sha256=S7xoNxSKkyPEGtOLa_jBah59Edn39_wtoVQUrwrA6uk,100481
|
21
|
-
psr/factory/factory.dll,sha256=
|
22
|
-
psr/factory/factory.pmd,sha256=
|
23
|
-
psr/factory/factory.pmk,sha256=
|
21
|
+
psr/factory/factory.dll,sha256=qktXDYWJYT3wF8rIi7hYZ19_n_B1Yf6WlkihL4_xAyY,18265936
|
22
|
+
psr/factory/factory.pmd,sha256=zXLD1yi0iI70nPGKziPLeIF3zO2mntOaozPttOdQXE8,243119
|
23
|
+
psr/factory/factory.pmk,sha256=gq-J-fLkAwbsC1e6B93butoxH_1v4pYVB9kJaFWVYYc,579698
|
24
24
|
psr/factory/factorylib.py,sha256=-8wOx9h5oys0ZbG12OptwjzJVrgc48AgiAkBJJPKfio,27829
|
25
|
-
psr/factory/libcurl-x64.dll,sha256=
|
25
|
+
psr/factory/libcurl-x64.dll,sha256=E3rWQwQR-0-CxqJMpTF3PRS-P_6I-9so2hOTzRfKbMA,5317968
|
26
26
|
psr/factory/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
27
|
-
psr/factory/samples/__init__.py,sha256=
|
28
|
-
psr/factory/samples/sddp_case01.py,sha256=
|
29
|
-
psr/factory/samples/sddp_case21.py,sha256
|
27
|
+
psr/factory/samples/__init__.py,sha256=xxOch5Fokzjy571a6OHD87FWM17qKgvfcbr8xn-n36I,80
|
28
|
+
psr/factory/samples/sddp_case01.py,sha256=eLhtOAS2STl9-H7Nr5VUG4ATO0bVcn-CJtCn3Rf-vpI,5044
|
29
|
+
psr/factory/samples/sddp_case21.py,sha256=Eymn3q0uyaGSmZaTr0Yk2q9yf1-enqdoUFXPwuQ1YOk,8807
|
30
30
|
psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,200
|
31
31
|
psr/psrfcommon/psrfcommon.py,sha256=NABM5ahvyfSizDC9c0Vu9dVK1pD_vOzIGFHL1oz2E1o,1464
|
32
32
|
psr/psrfcommon/tempfile.py,sha256=5S13wa2DCLYTUdwbLm_KMBRnDRJ0WDlu8GO2BmZoNdg,3939
|
33
33
|
psr/runner/__init__.py,sha256=kI9HDX-B_LMQJUHHylFHas2rNpWfNNa0pZXoIvX_Alw,230
|
34
34
|
psr/runner/runner.py,sha256=L_YOCArpkr_O-UJH6aT3K46NlEYT_o7LA1Ldk81BULQ,27326
|
35
35
|
psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
|
36
|
-
psr_factory-5.0.
|
37
|
-
psr_factory-5.0.
|
38
|
-
psr_factory-5.0.
|
39
|
-
psr_factory-5.0.
|
40
|
-
psr_factory-5.0.
|
36
|
+
psr_factory-5.0.0b14.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
|
37
|
+
psr_factory-5.0.0b14.dist-info/METADATA,sha256=RYlnuurU-13P2hU5JG1tvsdv_6LAkHTlIjGv30D1TPw,2333
|
38
|
+
psr_factory-5.0.0b14.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
|
39
|
+
psr_factory-5.0.0b14.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
|
40
|
+
psr_factory-5.0.0b14.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|