Disable usage of eclrun until csh-komodo-fix in place

equinor · Aug 17, 2020 · da904d1 · da904d1
1 parent faec0bb
commit da904d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 213 deletions.
diff --git a/python/res/fm/ecl/script.py b/python/res/fm/ecl/script.py
@@ -15,24 +15,16 @@ def run(config, argv):
     options = parser.parse_args(argv)
 
     eclrun_config = EclrunConfig(config, options.version)
-    if eclrun_config.can_use_eclrun():
-        run = EclRun(
-            options.ecl_case,
-            None,
-            num_cpu=options.num_cpu,
-            check_status=not options.ignore_errors,
-        )
-        run.runEclipse(eclrun_config=eclrun_config)
+
+    if options.num_cpu > 1:
+        sim = config.mpi_sim(version=options.version)
     else:
-        if options.num_cpu > 1:
-            sim = config.mpi_sim(version=options.version)
-        else:
-            sim = config.sim(version=options.version)
+        sim = config.sim(version=options.version)
 
-        run = EclRun(
-            options.ecl_case,
-            sim,
-            num_cpu=options.num_cpu,
-            check_status=not options.ignore_errors,
-        )
-        run.runEclipse()
+    run = EclRun(
+        options.ecl_case,
+        sim,
+        num_cpu=options.num_cpu,
+        check_status=not options.ignore_errors,
+    )
+    run.runEclipse()
diff --git a/python/tests/res/fm/test_ecl_run_new.py b/python/tests/res/fm/test_ecl_run_new.py