Commits · master · Felix Matt / shyft · GitLab

Jun 16, 2019
- Merge branch 'routing_fine_timestep' into 'master' · 0cef00d9
  Sigbjørn Helset authored Jun 16, 2019
  0cef00d9
- added auto_routing_time_axis property, and logic to select routing time-axis... · ab454876
  Sigbjørn Helset authored Jun 16, 2019
  ab454876
Jun 14, 2019
- adjusted ms vs proj to reflect latest changes in cmake · d578a15c
  Sigbjørn Helset authored Jun 14, 2019
  
  d578a15c
- Merge branch '455-update-names-for-the-energy-market-model' into 'master' · c56b2cd9
  Sigbjørn Helset authored Jun 14, 2019
  c56b2cd9
- Resolve "Update names for the energy market model" · d8d707f5
  Sigbjørn Helset authored Jun 14, 2019
  
  d8d707f5
Jun 12, 2019
- Merge branch '442-add-first-version-of-web-api-for-energy-market-models' into 'master' · fa3eda4e
  Sigbjørn Helset authored Jun 12, 2019
  fa3eda4e
- last version before switch to hybrid approach for the web_api emitter using... · 1c3a17c6
  Sigbjørn Helset authored Jun 12, 2019
  1c3a17c6
Jun 11, 2019
- Merge branch 'tailrace_loss' into 'master' · 107ef6ec
  anybo authored Jun 11, 2019
  107ef6ec
- Fix for issue 454: Energy market model: Power plant tailrace is not handled correctly · 7de56e02
  anybo authored Jun 11, 2019
  
  7de56e02
May 24, 2019
- Merge branch 'boost_py_shared_ptr_fix1' into 'master' · 1acd5edd
  Sigbjørn Helset authored May 24, 2019
  1acd5edd
- First fix for issue !#446 · 15894b3f
  Sigbjørn Helset authored May 24, 2019
  
  15894b3f
May 22, 2019
- Merge branch 'cmake_win_vs2019_u1' into 'master' · 4036eb18
  anybo authored May 22, 2019
  4036eb18
- Fix windows cmake build in vs2019 update 1 (v16.1) · 5b4eba85
  anybo authored May 22, 2019
  
  5b4eba85
May 21, 2019
- Merge branch 'hydro/hotfix_pyproj_workaround' into 'master' · 4449e51d
  Eivind Lyche Melvær authored May 21, 2019
  4449e51d
- workaround for pypro.Proj, not accepting +e=0 in input string · 4c80f122
  Felix Matt authored May 21, 2019 and Eivind Lyche Melvær committed May 21, 2019
  
  4c80f122
May 20, 2019
- Merge branch 'headloss_func' into 'master' · 698d2fb1
  anybo authored May 20, 2019
  698d2fb1
- Waterroute headloss function is now array of xyz · 996031e9
  anybo authored May 20, 2019
  
  996031e9
- Merge branch '441-re-factor-to-use-lru-cache-once-time-series-and-energy-market-srv' into 'master' · 398076f9
  Sigbjørn Helset authored May 20, 2019
  398076f9
- Resolve "refactor lru-cache" · c3aac702
  Sigbjørn Helset authored May 20, 2019
  
  c3aac702
May 16, 2019
- Merge branch 'em_cmake_ext' into 'master' · 03d78612
  Sigbjørn Helset authored May 16, 2019
  03d78612
- Include em core and stm c++ libraries in shyft_core cmake package · a78d1fef
  anybo authored May 16, 2019
  
  a78d1fef
May 15, 2019
- Update to devtoolset 8 · c6f8913d
  Eivind Lyche Melvær authored May 15, 2019
  
  c6f8913d
- updated jenkins-build to use pytest · 604aa9a6
  Sigbjørn Helset authored May 15, 2019
  
  604aa9a6
May 14, 2019
- Merge branch 'em_os' into 'master' · 0348a5cc
  Sigbjørn Helset authored May 14, 2019
  0348a5cc
- Energy_market initial version · c38d52c5
  Sigbjørn Helset authored May 14, 2019
  
  c38d52c5
May 10, 2019
- Merge branch 'winbuild_fix' into 'master' · 0d5d4110
  Sigbjørn Helset authored May 10, 2019
  0d5d4110
- Minor build improvements (silence warnings etc) · 2594bea7
  anybo authored May 10, 2019 and Sigbjørn Helset committed May 10, 2019
  
  2594bea7
May 09, 2019
- Merge branch 'cmake_win' into 'master' · 545c0c9f
  Sigbjørn Helset authored May 09, 2019
  545c0c9f
- Cmake win · 43df003f
  Sigbjørn Helset authored May 09, 2019
  
  43df003f
- Merge branch 'build_scripts' into 'master' · 0abd36b8
  Sigbjørn Helset authored May 09, 2019
  0abd36b8
- Better error handling in build script + fixed URL do data repo · 8ad5f782
  Gitlab Runner CI User authored May 09, 2019
  
  8ad5f782
May 04, 2019
- Merge branch 'b_1_70' into 'master' · 494c9a1c
  Sigbjørn Helset authored May 04, 2019
  494c9a1c
- included support for b 1.70, including new port of beast-server, some minor... · 1e87c94b
  Sigbjørn Helset authored May 04, 2019
  1e87c94b
Apr 27, 2019
- Merge branch 'py_refactor_to_time_series' into 'master' · 2b857eb2
  Sigbjørn Helset authored Apr 27, 2019
  2b857eb2
- changed all internal references to refer to shyft.time_series instead of api... · 19db3e32
  Sigbjørn Helset authored Apr 27, 2019
  19db3e32
- updated doc-strings and support for autodoc for time_series · a585ede3
  Sigbjørn Helset authored Apr 27, 2019
  
  a585ede3
Apr 26, 2019
- Merge branch 'ssl_fix' into 'master' · 53fa8158
  Sigbjørn Helset authored Apr 26, 2019
  53fa8158
- Ssl fix · cfba7cae
  Sigbjørn Helset authored Apr 26, 2019
  
  cfba7cae
Apr 24, 2019
- resolve link/load order on ubuntu ensuring ssl and crypto goes last · cbaa9987
  Sigbjørn Helset authored Apr 24, 2019
  
  cbaa9987
- fixup setup.py to ensure win lib dlls are packaged · 1c24a625
  Sigbjørn Helset authored Apr 24, 2019
  
  1c24a625