psr-factory 5.0.0b19__py3-none-win_amd64.whl → 5.0.0b20__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.
Files changed (10) hide show
  1. psr/execqueue/watcher.py +2 -3
  2. psr/factory/__init__.py +1 -1
  3. psr/factory/api.py +439 -411
  4. psr/factory/factory.dll +0 -0
  5. psr/runner/runner.py +7 -1
  6. {psr_factory-5.0.0b19.dist-info → psr_factory-5.0.0b20.dist-info}/METADATA +1 -1
  7. {psr_factory-5.0.0b19.dist-info → psr_factory-5.0.0b20.dist-info}/RECORD +10 -10
  8. {psr_factory-5.0.0b19.dist-info → psr_factory-5.0.0b20.dist-info}/WHEEL +0 -0
  9. {psr_factory-5.0.0b19.dist-info → psr_factory-5.0.0b20.dist-info}/licenses/LICENSE.txt +0 -0
  10. {psr_factory-5.0.0b19.dist-info → psr_factory-5.0.0b20.dist-info}/top_level.txt +0 -0
psr/factory/factory.dll CHANGED
Binary file
psr/runner/runner.py CHANGED
@@ -369,7 +369,13 @@ def run_hydro_estimation(case_path: Union[str, pathlib.Path], sddp_path: Union[s
369
369
  raise NotImplementedError("Running hydro estimation is only available on Windows")
370
370
  case_path = os.path.abspath(str(case_path))
371
371
  sddp_path = str(sddp_path)
372
- estima_path = os.path.join(sddp_path, "Hidro")
372
+ # get SDDP major version
373
+ major, minor, patch, tag = _get_semver_version(get_sddp_version(sddp_path))
374
+
375
+ if major >= 18:
376
+ estima_path = os.path.join(sddp_path, "models", "estima")
377
+ else:
378
+ estima_path = os.path.join(sddp_path, "Hidro")
373
379
  estima_files = [
374
380
  os.path.join(estima_path, "estima.exe"),
375
381
  os.path.join(estima_path, "estimaen.fmt"),
{psr_factory-5.0.0b19.dist-info → psr_factory-5.0.0b20.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: psr-factory
3
- Version: 5.0.0b19
3
+ Version: 5.0.0b20
4
4
  Summary: PSR database management module.
5
5
  Author-email: "PSR Inc." <psrfactory@psr-inc.com>
6
6
  License-Expression: MIT
{psr_factory-5.0.0b19.dist-info → psr_factory-5.0.0b20.dist-info}/RECORD RENAMED
@@ -15,10 +15,10 @@ psr/execqueue/client.py,sha256=P89Yt76W2GqRXaG_MLsa0kXf0jPp-weBd3aSTRcDzcs,4443
15
15
  psr/execqueue/config.py,sha256=3KVwASOgRlymOSPeabotgBdLVB5sPKnPQ9og2q3LQfw,1418
16
16
  psr/execqueue/db.py,sha256=sNr_StNEgZZQCKcyCWiB1WrQJIhE9UvLUxPA2tWiXGs,8498
17
17
  psr/execqueue/server.py,sha256=nW-Hi5zWHgPeLicASKJND7u6rz6eqwC16k91tUUQPxk,15741
18
- psr/execqueue/watcher.py,sha256=RCjaWCS3jdbcugMk3-hOQCmrKxFzVOm-Wn-SLYBdBgY,5662
19
- psr/factory/__init__.py,sha256=E5_ke-sdZr5-RNQ0YkE6Ia4k_dGMXhJAsi0xnl9RBUw,219
20
- psr/factory/api.py,sha256=OsjFnXgl6ltYtcpDIhvjauGFprVrIaHWPcMgCGJ1C1E,101464
21
- psr/factory/factory.dll,sha256=Ayn-rwrdTP_jM-x8bFXHLEOp30NFB55kkWbarkjVZns,18301440
18
+ psr/execqueue/watcher.py,sha256=7dZZm9TiYVF7SdU0c_6Vq2_SZRobxgcspfBMzKFSsjQ,5637
19
+ psr/factory/__init__.py,sha256=U3v5EwQqxGPlZKxeketQlCVIyCfDnd-bMLE_4zORZIk,219
20
+ psr/factory/api.py,sha256=X2B1ndnZujKg27NKgTbUTKRA1vGETMhRiaK-BhWAoaM,103815
21
+ psr/factory/factory.dll,sha256=r4tG6N1ZuMSxrA0dIMN_EEU06ugxhYLPwl7-_sIlf2Y,18301440
22
22
  psr/factory/factory.pmd,sha256=HryDY8T6vAV5r0W4ytKNPiIYcdn4LexrsVZ5qFYBZ-g,250535
23
23
  psr/factory/factory.pmk,sha256=THhHxBKTBchru3fxTCos-pBAPJJnuug8T2dw0xniDfQ,580185
24
24
  psr/factory/factorylib.py,sha256=rwqu9lucfBhiFECDd5UVuy1K9jIJ54mUfxNPh4JhY4I,28182
@@ -31,10 +31,10 @@ psr/psrfcommon/__init__.py,sha256=WXR560XQllIjtFpWd0jiJEbUAQIyh5-6lwj-42_J95c,20
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
- psr/runner/runner.py,sha256=L_YOCArpkr_O-UJH6aT3K46NlEYT_o7LA1Ldk81BULQ,27326
34
+ psr/runner/runner.py,sha256=hCVH62HAZK_M9YUiHQgqCkMevN17utegjfRIw49MdvM,27542
35
35
  psr/runner/version.py,sha256=mch2Y8anSXGMn9w72Z78PhSRhOyn55EwaoLAYhY4McE,194
36
- psr_factory-5.0.0b19.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
37
- psr_factory-5.0.0b19.dist-info/METADATA,sha256=FibEzT-fEVac6AqnO-y2pXM7tan6URDMUTEk4waReHA,2333
38
- psr_factory-5.0.0b19.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
39
- psr_factory-5.0.0b19.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
40
- psr_factory-5.0.0b19.dist-info/RECORD,,
36
+ psr_factory-5.0.0b20.dist-info/licenses/LICENSE.txt,sha256=N6mqZK2Ft3iXGHj-by_MHC_dJo9qwn0URjakEPys3H4,1089
37
+ psr_factory-5.0.0b20.dist-info/METADATA,sha256=ylKKfSHq12SHTWQbWG4sMMJDVNGs4mNJOEzG_Sr0pzQ,2333
38
+ psr_factory-5.0.0b20.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
39
+ psr_factory-5.0.0b20.dist-info/top_level.txt,sha256=Jb393O96WQk3b5D1gMcrZBLKJJgZpzNjTPoldUi00ck,4
40
+ psr_factory-5.0.0b20.dist-info/RECORD,,