Improvement and extension of EnKF algorithm (loc)

[modules/adao.git] / bin / AdaoYacsSchemaCreator.py

diff --git a/bin/AdaoYacsSchemaCreator.py b/bin/AdaoYacsSchemaCreator.py
index eb5af254a191bda249a043e14fd95ec864400e1a..83e47eb3f6eeb3997f2c73162c787ac5090a8610 100644 (file)
--- a/bin/AdaoYacsSchemaCreator.py
+++ b/bin/AdaoYacsSchemaCreator.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008-2018 EDF R&D
+# Copyright (C) 2008-2020 EDF R&D
 #
 # This file is part of SALOME ADAO module
 #
@@ -31,18 +31,18 @@ logging.basicConfig(level=logging.WARNING, format='%(levelname)-8s %(message)s')
 logging.debug("-- Starting AdaoYacsSchemaCreator --")
 
 # Check some basics variables
-if "ADAO_ROOT_DIR" not in os.environ:
-  logging.fatal("You have to define ADAO_ROOT_DIR")
-  sys.exit(1)
+if "ADAO_ENGINE_ROOT_DIR" not in os.environ:
+    logging.fatal("You have to define ADAO_ENGINE_ROOT_DIR")
+    sys.exit(1)
 
 try:
-  from daYacsSchemaCreator.run import *
-  from daYacsSchemaCreator.help_methods import *
-except:
-  logging.fatal("Import of ADAO python modules failed !" +
-                "\n add ADAO python installation directory in your PYTHONPATH")
-  traceback.print_exc()
-  sys.exit(1)
+    import adao
+    from daYacsSchemaCreator import run
+except ImportError as e:
+    logging.fatal("\n  Import of YACS schema creator module failed, the error message is:\n" +
+                  "\n  %s\n"%(e,) +
+                  "\n  Add its installation directory in your PYTHONPATH.\n")
+    sys.exit(1)
 
 # Parse arguments
 from argparse import ArgumentParser
@@ -52,4 +52,4 @@ my_parser.add_argument('config_file')
 my_parser.add_argument('yacs_schema_filename')
 args = my_parser.parse_args()
 
-create_schema(args.config_file, args.yacs_schema_filename)
+run.create_schema_from_file(args.config_file, args.yacs_schema_filename)