23582: [CEA] Rename MED module to FIELDS

diff --git a/bin/appliskel/salome_tester/salome_instance.py b/bin/appliskel/salome_tester/salome_instance.py
index 3653d14a94e0c11d89ec52ac20508c169ebe9a3f..5710ff5b9346dc8fed85d2546ce84745108c4fcf 100644 (file)
--- a/bin/appliskel/salome_tester/salome_instance.py
+++ b/bin/appliskel/salome_tester/salome_instance.py
@@ -22,7 +22,7 @@ import os
 
 # Example of args:
 #      args=["--gui", "--show-desktop=1", "--splash=0"]
-#      args=["--terminal","--modules=MED,PARAVIS,GUI"]
+#      args=["--terminal","--modules=FIELDS,PARAVIS,GUI"]
 class SalomeInstance(object):
 
   def __init__(self):
@@ -71,7 +71,7 @@ class SalomeInstance(object):
     else:
       sys.argv += ["--terminal"]
       #sys.argv += ["--shutdown-servers=1"]
-      #sys.argv += ["--modules=MED,PARAVIS,GUI"]
+      #sys.argv += ["--modules=FIELDS,PARAVIS,GUI"]
       pass
 
     import setenv

diff --git a/doc/README.cluster-CCRT b/doc/README.cluster-CCRT
index 05ec0f71e22f7fbf32f61571b5c2a36854b66b88..11e9fabc06d242168dbe2dc8e8396b4ca210b454 100644 (file)
--- a/doc/README.cluster-CCRT
+++ b/doc/README.cluster-CCRT
@@ -46,20 +46,20 @@ Examples
 Sans IHM sans execution de script python (for interactive testing and developing) :
 ---------------------------------------------
 
-runSalome --terminal --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
+runSalome --terminal --modules=KERNEL,FIELDS,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
 Sans IHM avec execution de script(s) python :
 ---------------------------------------------
 
-runSalome --terminal=CALCULATOR_TEST --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST --modules=KERNEL,FIELDS,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM --modules=KERNEL,FIELDS,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,FIELDS,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM,CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST_WITHOUTIHM,CALCULATOR_TEST_STUDY_WITHOUTIHM --modules=KERNEL,FIELDS,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 
-runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
+runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,FIELDS,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall --logger
 after the import of CALCULATOR_TEST, killall will be executed.
 
 
@@ -72,7 +72,7 @@ Create a shell file "runSalome.batch" with for example :
 #BSUB -n 10
 #BSUB -o runSalome.log%J
 #BSUB -c 0:10
-runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,MED,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall
+runSalome --terminal=CALCULATOR_TEST,killall --modules=KERNEL,FIELDS,CALCULATOR,COMPONENT --containers=cpp,python --standalone=registry,study,moduleCatalog,cppContainer --killall
 exit
 
 Queue for execution that file (here runSalome.batch) :

diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl
index 8c02315aab0b892f1e7ca0278b363b4bc366404d..52a3f0df01b0a4e63803877707d665e90f347f8d 100644 (file)
--- a/idl/SALOME_Component.idl
+++ b/idl/SALOME_Component.idl
@@ -35,7 +35,7 @@
 
 /*! \brief
 This is a package of interfaces used for connecting new components to %SALOME
-application. It also contains a set of interfaces used for management of %MED
+application. It also contains a set of interfaces used for management of %FIELDS
 component in %SALOME application.
 */
 module Engines

diff --git a/src/KERNEL_PY/salome_test.py b/src/KERNEL_PY/salome_test.py
index 4c4c05110c2e0c75c31f833b4801ab8c4480bc2d..17fbfb0a965d98c41ff49ef15057ea8b3b1e4ccc 100755 (executable)
--- a/src/KERNEL_PY/salome_test.py
+++ b/src/KERNEL_PY/salome_test.py
@@ -22,7 +22,7 @@
 #
 
 print()
-print("Perform quick test of the application by loading of the GEOM, SMESH, MED, PARAVIS")
+print("Perform quick test of the application by loading of the GEOM, SMESH, FIELDS, PARAVIS")
 print("components and doing some operation within the components.")
 print()
 
@@ -306,7 +306,7 @@ if salome.hasDesktop():
 print()
 
 print("======================================================================")
-print("           %d. Test Med " % step); step+=1
+print("           %d. Test Fields " % step); step+=1
 print("======================================================================")
 
 import medcalc
@@ -315,11 +315,11 @@ from medcalc.fieldproxy import FieldProxy
 
 medcalc.medconsole.setConsoleGlobals(globals())
 try:
-    med_root=os.environ["MED_ROOT_DIR"]
+    med_root=os.environ["FIELDS_ROOT_DIR"]
 except KeyError as e:
-    raise RuntimeError("MED_ROOT_DIR should be defined to load the test data")
+    raise RuntimeError("FIELDS_ROOT_DIR should be defined to load the test data")
 
-filepath = os.path.join(med_root,"share","salome","resources","med","medcalc_testfiles","smallmesh_varfield.med")
+filepath = os.path.join(med_root,"share","salome","resources","fields","medcalc_testfiles","smallmesh_varfield.med")
 medcalc.medio.LoadDataSource(filepath)
 fieldHandlerList = medcalc.medevents.dataManager.getFieldHandlerList()
 

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
index b12bec2b125f315ba8f3a723559d4268800188a5..855030cbfc8a740a1d1f3a3c2fd7bfe7a497053f 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
@@ -444,7 +444,10 @@ void SALOME_ModuleCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
               _aModule.type = MESH ;
             else if((aType.compare("MED") == 0) ||
                     (aType.compare("Med") == 0) ||
-                    (aType.compare("med") == 0))
+                    (aType.compare("med") == 0) ||
+                    (aType.compare("FIELDS") == 0) ||
+                    (aType.compare("Fields") == 0) ||
+                    (aType.compare("fields") == 0))
               _aModule.type = Med ;
             else if((aType.compare("GEOM") == 0) ||
                     (aType.compare("Geom") == 0) ||