Improvement and extension of EnKF algorithm (loc)

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

diff --git a/bin/AdaoYacsSchemaCreator.py b/bin/AdaoYacsSchemaCreator.py
index eb3322b31c2188d7b32b00a61680eeaff49fd044..83e47eb3f6eeb3997f2c73162c787ac5090a8610 100644 (file)
--- a/bin/AdaoYacsSchemaCreator.py
+++ b/bin/AdaoYacsSchemaCreator.py
@@ -1,6 +1,6 @@
-#-*-coding:iso-8859-1-*-
+# -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008-2015 EDF R&D
+# Copyright (C) 2008-2020 EDF R&D
 #
 # This file is part of SALOME ADAO module
 #
@@ -20,7 +20,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
 
 import sys
 import os
@@ -31,27 +31,25 @@ 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 optparse import OptionParser
-usage = "usage: %prog [options] config_file yacs_schema_filename"
-version="%prog 0.1"
-my_parser = OptionParser(usage=usage, version=version)
-(options, args) = my_parser.parse_args()
-check_args(args)
+from argparse import ArgumentParser
+usage = "usage: %(prog)s [options] config_file yacs_schema_filename"
+my_parser = ArgumentParser(usage=usage)
+my_parser.add_argument('config_file')
+my_parser.add_argument('yacs_schema_filename')
+args = my_parser.parse_args()
 
-config_file =  args[0]
-yacs_schema_filename =  args[1]
-create_schema(config_file, yacs_schema_filename)
+run.create_schema_from_file(args.config_file, args.yacs_schema_filename)