Downstream rename ert to ecl (equinor#21)

pgdr · web-flow · commit 55739ad79df3 · 2017-04-27T10:19:56.000+02:00
reflect ert.ecl renamed to ecl.ecl

* rename ert-&gt;res in python/python
* ert -&gt; res
* s/ert.geo/ecl.geo/g
* s/ert.sched/ecl.sched/g
* s/ert.util/ecl.util/g
* s/ert.ecl/ecl.ecl/g
* decrease scipy req
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,5 @@ python/lib64
 scratch.sparsebundle
 *.iml
 *.DS_Store
-__ert_lib_path.py
-__ert_lib_info.py
-
+__res_lib_path.py
+__res_lib_info.py
diff --git a/docs/course/config/jobs/snake_oil_diff.py b/docs/course/config/jobs/snake_oil_diff.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 def writeDiff(filename, vector1, vector2):
     with open(filename, "w") as f:
diff --git a/docs/course/config/jobs/snake_oil_npv.py b/docs/course/config/jobs/snake_oil_npv.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 OIL_PRICES = {"2010-01-01": 78.33,
               "2010-02-01": 76.39,
diff --git a/docs/course/config/jobs/snake_oil_simulator.py b/docs/course/config/jobs/snake_oil_simulator.py
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from ert.ecl import EclSum, EclSumTStep
+from ecl.ecl import EclSum, EclSumTStep
 from ert.test import ExtendedTestCase
 
 try:
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -22,17 +22,17 @@ set(PYTHON_INSTALL_PREFIX  "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_M
 foreach( PREFIX_PATH ${CMAKE_PREFIX_PATH} )
    set(tmp_PYTHONPATH "${PREFIX_PATH}/${PYTHON_INSTALL_PREFIX}:$ENV{PYTHONPATH}")
    set(ENV{PYTHONPATH} ${tmp_PYTHONPATH}) 
-   python_package(ert 2.1.0)
-   if (DEFINED PY_ert)
+   python_package(ecl 2.1.0)
+   if (DEFINED PY_ecl)
       break()
    endif()
 endforeach()
 
 
-if (NOT DEFINED PY_ert)
+if (NOT DEFINED PY_ecl)
    message(SEND_ERROR "Existing ert installation not found") 
 endif()
-set( ERT_PYTHONPATH ${PY_ert_PATH} )
+set( ERT_PYTHONPATH ${PY_ecl_PATH} )
 
 #-----------------------------------------------------------------
 # Find an existing cwrap distribution
@@ -59,12 +59,12 @@ endif()
 #-----------------------------------------------------------------
 
 if (ERT_BUILD_GUI)
-   python_package(PyQt4 4.8.0)
-   python_package( matplotlib 1.2.0  )
-   python_package( pandas     0.15.1)
-   python_package( scipy      0.16.1 )
+   python_package(PyQt4      4.8.0)
+   python_package(matplotlib 1.2.0)
+   python_package(pandas     0.15.1)
+   python_package(scipy      0.12.1)
    if(NOT DEFINED PY_PyQt4 OR NOT DEFINED PY_matplotlib OR NOT DEFINED PY_scipy OR NOT DEFINED PY_pandas)
-     message(SEND_ERROR "Cannot build GUI without PyQt4, matplotlib, scipy, and pandas")
+     message(SEND_ERROR "Cannot build GUI without PyQt4, matplotlib, scipy, or pandas")
    endif()
 endif()
 
diff --git a/python/python/ert_gui/about_dialog.py b/python/python/ert_gui/about_dialog.py
@@ -16,7 +16,7 @@
 
 from PyQt4.QtCore import Qt, QSize
 from PyQt4.QtGui import  QDialog, QVBoxLayout, QPushButton, QHBoxLayout, QLabel, QFont
-from ert.util import Version
+from ecl.util import Version
 from ert_gui.ertwidgets import resourceImage
 
 
diff --git a/python/python/ert_gui/ertplot.py b/python/python/ert_gui/ertplot.py
@@ -4,7 +4,7 @@
 from PyQt4.QtGui import QApplication
 import time
 from ert.enkf import EnKFMain
-from ert.util import Version
+from ecl.util import Version
 from ert_gui.ert_splash import ErtSplash
 from ert_gui.ertwidgets import resourceIcon
 from ert_gui.tools.plot.plot_window import PlotWindow
diff --git a/python/python/ert_gui/ertwidgets/models/activerealizationsmodel.py b/python/python/ert_gui/ertwidgets/models/activerealizationsmodel.py
@@ -1,4 +1,4 @@
-from ert.util import BoolVector
+from ecl.util import BoolVector
 from ert_gui.ertwidgets.models.valuemodel import ValueModel
 from ert_gui.ertwidgets.models.ertmodel import getRealizationCount
 
diff --git a/python/python/ert_gui/ertwidgets/models/ertmodel.py b/python/python/ert_gui/ertwidgets/models/ertmodel.py
@@ -2,7 +2,7 @@
 from ert.analysis.enums.analysis_module_options_enum import AnalysisModuleOptionsEnum
 from ert.enkf import RealizationStateEnum, EnkfVarType
 from ert.job_queue import WorkflowRunner
-from ert.util import BoolVector, StringList
+from ecl.util import BoolVector, StringList
 from ert_gui import ERT
 from ert_gui.ertwidgets import showWaitCursorWhileWaiting
 
diff --git a/python/python/ert_gui/gert_main.py b/python/python/ert_gui/gert_main.py
@@ -119,7 +119,7 @@
 
 import ert_gui.ertwidgets
 from ert.enkf import EnKFMain
-from ert.util import Version
+from ecl.util import Version
 from ert_gui.ert_splash import ErtSplash
 from ert_gui.ertwidgets import SummaryPanel, resourceIcon
 from ert_gui.main_window import GertMainWindow
diff --git a/python/python/ert_gui/shell/export.py b/python/python/ert_gui/shell/export.py
@@ -1,5 +1,5 @@
 from __future__ import print_function
-from ert.util import IntVector
+from ecl.util import IntVector
 from ert.enkf.enums import ErtImplType
 from ert.enkf.data import EnkfNode
 from ert_gui.shell import assertConfigLoaded, ErtShellCollection
diff --git a/python/python/ert_gui/shell/results.py b/python/python/ert_gui/shell/results.py
@@ -1,4 +1,4 @@
-from ert.util import BoolVector
+from ecl.util import BoolVector
 from ert_gui.shell import assertConfigLoaded, ErtShellCollection
 from ert_gui.shell.libshell import splitArguments
 
diff --git a/share/workflows/jobs/internal-gui/scripts/export_misfit_data.py b/share/workflows/jobs/internal-gui/scripts/export_misfit_data.py
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 import os
 from ert.enkf import ErtScript, RealizationStateEnum
-from ert.util import BoolVector
+from ecl.util import BoolVector
 
 """
 This job exports misfit data into a chosen file or to the default gen_kw export file (parameters.txt)
diff --git a/share/workflows/jobs/internal-gui/scripts/gen_data_rft_export.py b/share/workflows/jobs/internal-gui/scripts/gen_data_rft_export.py
@@ -5,7 +5,7 @@
 import pandas
 from PyQt4.QtGui import QCheckBox
 
-from ert.ecl.rft import WellTrajectory
+from ecl.ecl.rft import WellTrajectory
 from ert.enkf import ErtPlugin, CancelPluginException
 from ert.enkf import RealizationStateEnum
 from ert.enkf.enums import EnkfObservationImplementationType
diff --git a/test-data/local/snake_oil/jobs/snake_oil_diff.py b/test-data/local/snake_oil/jobs/snake_oil_diff.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 def writeDiff(filename, vector1, vector2):
     with open(filename, "w") as f:
diff --git a/test-data/local/snake_oil/jobs/snake_oil_npv.py b/test-data/local/snake_oil/jobs/snake_oil_npv.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 OIL_PRICES = {"2010-01-01": 78.33,
               "2010-02-01": 76.39,
diff --git a/test-data/local/snake_oil/jobs/snake_oil_simulator.py b/test-data/local/snake_oil/jobs/snake_oil_simulator.py
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from ert.ecl import EclSum, EclSumTStep
+from ecl.ecl import EclSum, EclSumTStep
 from ert.test import ExtendedTestCase
 
 try:
diff --git a/test-data/local/snake_oil_field/jobs/snake_oil_diff.py b/test-data/local/snake_oil_field/jobs/snake_oil_diff.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 def writeDiff(filename, vector1, vector2):
     with open(filename, "w") as f:
diff --git a/test-data/local/snake_oil_field/jobs/snake_oil_npv.py b/test-data/local/snake_oil_field/jobs/snake_oil_npv.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 OIL_PRICES = {"2010-01-01": 78.33,
               "2010-02-01": 76.39,
diff --git a/test-data/local/snake_oil_field/jobs/snake_oil_simulator.py b/test-data/local/snake_oil_field/jobs/snake_oil_simulator.py
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from ert.ecl import EclSum, EclSumTStep
+from ecl.ecl import EclSum, EclSumTStep
 from ert.test import ExtendedTestCase
 
 try:
diff --git a/test-data/local/snake_oil_field/make_data.py b/test-data/local/snake_oil_field/make_data.py
@@ -2,8 +2,8 @@
 import os
 import os.path
 
-from ert.ecl import EclGrid, EclKW, EclTypeEnum
-from ert.util import RandomNumberGenerator
+from ecl.ecl import EclGrid, EclKW, EclTypeEnum
+from ecl.util import RandomNumberGenerator
 
 # This little script is used as a one-shot operation to generate the
 # grid and the corresponding PERMX and PORO fields used for this test
diff --git a/test-data/local/snake_oil_no_data/jobs/snake_oil_diff.py b/test-data/local/snake_oil_no_data/jobs/snake_oil_diff.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 def writeDiff(filename, vector1, vector2):
     with open(filename, "w") as f:
diff --git a/test-data/local/snake_oil_no_data/jobs/snake_oil_npv.py b/test-data/local/snake_oil_no_data/jobs/snake_oil_npv.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from ert.ecl import EclSum
+from ecl.ecl import EclSum
 
 OIL_PRICES = {"2010-01-01": 78.33,
               "2010-02-01": 76.39,
diff --git a/test-data/local/snake_oil_no_data/jobs/snake_oil_simulator.py b/test-data/local/snake_oil_no_data/jobs/snake_oil_simulator.py
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from ert.ecl import EclSum, EclSumTStep
+from ecl.ecl import EclSum, EclSumTStep
 from ert.test import ExtendedTestCase
 
 try:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from ert.util import BoolVector`
	`1`	`+from ecl.util import BoolVector`
`2`	`2`	`from ert_gui.ertwidgets.models.valuemodel import ValueModel`
`3`	`3`	`from ert_gui.ertwidgets.models.ertmodel import getRealizationCount`
`4`	`4`