Rename and inline forward model scripts

In order to reduce startup time of forward model scripts, we avoid importing from ert in them.
equinor · Oct 31, 2022 · a9000cf · a9000cf
1 parent 15b1b51
commit a9000cf
Show file tree

Hide file tree

Showing 91 changed files with 1,155 additions and 1,047 deletions.
diff --git a/ci/jenkins/testkomodo-ERT.sh b/ci/jenkins/testkomodo-ERT.sh
@@ -1,8 +1,8 @@
 copy_test_files () {
     cp -r ${CI_SOURCE_ROOT}/tests ${CI_TEST_ROOT}
 
-    #ert
     ln -s ${CI_SOURCE_ROOT}/test-data ${CI_TEST_ROOT}/test-data
+    ln -s ${CI_SOURCE_ROOT}/src ${CI_TEST_ROOT}/src
 
     # Trick ERT to find a fake source root
     mkdir ${CI_TEST_ROOT}/.git

diff --git a/ci/jenkins/testkomodo-libres-pytest.sh b/ci/jenkins/testkomodo-libres-pytest.sh
@@ -2,15 +2,10 @@ copy_test_files () {
     cp -r ${CI_SOURCE_ROOT}/tests ${CI_TEST_ROOT}
     ln -s ${CI_SOURCE_ROOT}/test-data ${CI_TEST_ROOT}/test-data
 
-    # Trick to find a fake source root
-    mkdir ${CI_TEST_ROOT}/.git
-
-    mkdir -p ${CI_TEST_ROOT}/src/clib/res/fm/rms
-    ln -s ${CI_SOURCE_ROOT}/ert/_c_wrappers/fm/rms/rms_config.yml ${CI_TEST_ROOT}/src/clib/res/fm/rms/rms_config.yml
-    ln -s {$CI_SOURCE_ROOT,$CI_TEST_ROOT}/src/clib/lib
-    ln -s {$CI_SOURCE_ROOT,$CI_TEST_ROOT}/src/clib/bin
+    ln -s ${CI_SOURCE_ROOT}/src ${CI_TEST_ROOT}/src
 
-    ln -s ${CI_SOURCE_ROOT}/share ${CI_TEST_ROOT}/share
+    # Trick ERT to find a fake source root
+    mkdir ${CI_TEST_ROOT}/.git
 
     # Keep pytest configuration:
     ln -s ${CI_SOURCE_ROOT}/pyproject.toml ${CI_TEST_ROOT}/pyproject.toml

diff --git a/ci/jenkins/testkomodo-repeat-flaky.sh b/ci/jenkins/testkomodo-repeat-flaky.sh
@@ -1,16 +1,12 @@
 copy_test_files () {
     cp -r ${CI_SOURCE_ROOT}/tests ${CI_TEST_ROOT}
-
-    #ert
     ln -s ${CI_SOURCE_ROOT}/test-data ${CI_TEST_ROOT}/test-data
 
+    ln -s ${CI_SOURCE_ROOT}/src ${CI_TEST_ROOT}/src
+
     # Trick ERT to find a fake source root
     mkdir ${CI_TEST_ROOT}/.git
 
-    # clib
-    mkdir -p ${CI_TEST_ROOT}/src/clib/res/fm/rms
-    ln -s ${CI_SOURCE_ROOT}/src/ert/_c_wrappers/fm/rms/rms_config.yml ${CI_TEST_ROOT}/src/clib/res/fm/rms/rms_config.yml
-
     # Keep pytest configuration:
     ln -s ${CI_SOURCE_ROOT}/pyproject.toml ${CI_TEST_ROOT}/pyproject.toml
 }

diff --git a/ci/jenkins/testkomodo.sh b/ci/jenkins/testkomodo.sh
@@ -1,23 +1,14 @@
 copy_test_files () {
     cp -r ${CI_SOURCE_ROOT}/tests ${CI_TEST_ROOT}
-
-    #ert
     ln -s ${CI_SOURCE_ROOT}/test-data ${CI_TEST_ROOT}/test-data
 
+    ln -s ${CI_SOURCE_ROOT}/src ${CI_TEST_ROOT}/src
+
     # Trick ERT to find a fake source root
     mkdir ${CI_TEST_ROOT}/.git
 
-    # clib
-    mkdir -p ${CI_TEST_ROOT}/src/clib/res/fm/rms
-    ln -s ${CI_SOURCE_ROOT}/src/ert/_c_wrappers/fm/rms/rms_config.yml ${CI_TEST_ROOT}/src/clib/res/fm/rms/rms_config.yml
-    ln -s {$CI_SOURCE_ROOT,$CI_TEST_ROOT}/src/clib/lib
-    ln -s {$CI_SOURCE_ROOT,$CI_TEST_ROOT}/src/clib/bin
-
-    ln -s ${CI_SOURCE_ROOT}/share ${CI_TEST_ROOT}/share
-
     # Keep pytest configuration:
     ln -s ${CI_SOURCE_ROOT}/pyproject.toml ${CI_TEST_ROOT}/pyproject.toml
-
 }
 
 install_test_dependencies () {

diff --git a/src/ert/_c_wrappers/fm/ecl/__init__.py b/src/ert/_c_wrappers/fm/ecl/__init__.py
diff --git a/src/ert/_c_wrappers/fm/ecl/script.py b/src/ert/_c_wrappers/fm/ecl/script.py
diff --git a/src/ert/_c_wrappers/fm/rms/__init__.py b/src/ert/_c_wrappers/fm/rms/__init__.py
diff --git a/src/ert/_c_wrappers/fm/rms/rms_config.py b/src/ert/_c_wrappers/fm/rms/rms_config.py
diff --git a/src/ert/_c_wrappers/fm/shell/__init__.py b/src/ert/_c_wrappers/fm/shell/__init__.py