Merge from MED version 3.2.0

diff --git a/doc/MEDMEM/FIELDcreate.cxx b/doc/MEDMEM/FIELDcreate.cxx
index e94b17b788150447eb4b8011b0ba7fdd55f94b0c..d8375e07308c55992cb53521b5f0442bbaa39eca 100644 (file)
--- a/doc/MEDMEM/FIELDcreate.cxx
+++ b/doc/MEDMEM/FIELDcreate.cxx
@@ -3,6 +3,7 @@ using namespace std;
 #include "MEDMEM_Field.hxx"
 
 using namespace MEDMEM;
+using namespace MED_EN ;
 
 int main (int argc, char ** argv) {
 

diff --git a/doc/MEDMEM/FIELDgeneral.cxx b/doc/MEDMEM/FIELDgeneral.cxx
index 120cef911c249d28546252317aec71a68898054e..18c0210376eacf2462e21a126ac03abe148b1037 100644 (file)
--- a/doc/MEDMEM/FIELDgeneral.cxx
+++ b/doc/MEDMEM/FIELDgeneral.cxx
@@ -3,6 +3,7 @@ using namespace std;
 #include "MEDMEM_Field.hxx"
 
 using namespace MEDMEM;
+using namespace MED_EN ;
 
 int main (int argc, char ** argv) {
 

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx
index fca94088d3595301b040b429c0eef3acb06bbea2..b7017228d5f29dd300c2629285f0234f1f883949 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx
@@ -5,6 +5,9 @@
 #include "MEDMEM_Mesh.hxx"
 #include "MEDMEM_Med.hxx"
 
+using namespace MEDMEM ;
+using namespace MED_EN ;
+
 main () {
   
   const char * fileName  = "pointe.med";

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx
index b8c110ad29a2a85f9d136436b0451164cea55f9e..e90b6030a60d0e96dfc5ff6b4e10019a2216abd0 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx
@@ -4,6 +4,11 @@
 #include "MEDMEM_Field.hxx"
 #include "MEDMEM_Mesh.hxx"
 #include "MEDMEM_Med.hxx"
+#include "MEDMEM_MedMedDriver.hxx"
+#include "MEDMEM_MedMeshDriver.hxx"
+
+using namespace MEDMEM ;
+using namespace MED_EN ;
 
 main () {
   

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx
index 87ed743930442c4ac94a8a95db0b099c096912f7..270eacbc22ff31247d5d4db2a0bf6bc9e0eb81b3 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx
@@ -5,6 +5,9 @@
 #include "MEDMEM_Mesh.hxx"
 #include "MEDMEM_Med.hxx"
 
+using namespace MEDMEM ;
+using namespace MED_EN ;
+
 main () {
   
   const char * fileName   = "pointe.med";

diff --git a/doc/MEDMEM/MESHINGexample.cxx b/doc/MEDMEM/MESHINGexample.cxx
index 2ec7a16ee350a74cfa8844b2b177645acc2ff638..07c943a02d5b5266ddd0ae92bc893ad29da6b28d 100644 (file)
--- a/doc/MEDMEM/MESHINGexample.cxx
+++ b/doc/MEDMEM/MESHINGexample.cxx
@@ -1,6 +1,9 @@
 #include "MEDMEM_Meshing.hxx"
 #include "MEDMEM_Group.hxx"
 
+using namespace MEDMEM ;
+using namespace MED_EN ;
+
 using namespace std;
 
 int main (int argc, char ** argv) {

diff --git a/doc/MEDMEM/MESHconnectivities.cxx b/doc/MEDMEM/MESHconnectivities.cxx
index 2964ff9f8e6737a195bad7cdf1463637f9067c1b..6a0f40cfee550d00415f76cdb80330cd4f82803d 100644 (file)
--- a/doc/MEDMEM/MESHconnectivities.cxx
+++ b/doc/MEDMEM/MESHconnectivities.cxx
@@ -1,6 +1,9 @@
 #include "MEDMEM_Mesh.hxx"
 #include "MEDMEM_CellModel.hxx"
 
+using namespace MEDMEM ;
+using namespace MED_EN ;
+
 int main (int argc, char ** argv) {
 
   const string MedFile = "pointe.med" ;

diff --git a/doc/MEDMEM/MESHcoordinates.cxx b/doc/MEDMEM/MESHcoordinates.cxx
index 18edd03289c4fa37e5e98add7aedccfc6b3fceeb..e52eaaa0007b1f6b4fe65b682870bf6746810976 100644 (file)
--- a/doc/MEDMEM/MESHcoordinates.cxx
+++ b/doc/MEDMEM/MESHcoordinates.cxx
@@ -1,5 +1,8 @@
 #include "MEDMEM_Mesh.hxx"
 
+using namespace MEDMEM ;
+using namespace MED_EN ;
+
 int main (int argc, char ** argv) {
 
   const string MedFile = "pointe.med" ;

diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 2282b820183392a55a2458cf9c61c22de0b31c7f..6e7f69462d0d9362bf7f77ee8cb3ab3589f3895c 100755 (executable)
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - MED - v.2.2.9"
+PROJECT_NAME           = "SALOME - MED - v.2.0.0"
 PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/html/INPUT/sources/static/tree.js b/doc/html/INPUT/sources/static/tree.js
index ac711932d1d3f913a3d1c4d352cd3a7273ee03a8..7cdc193934ff9e1f3d7492d500a9eb057a75121b 100755 (executable)
--- a/doc/html/INPUT/sources/static/tree.js
+++ b/doc/html/INPUT/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.2.2.9 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.2.0.0 </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))

diff --git a/doc/salome/tui/MED/doxyfile b/doc/salome/tui/MED/doxyfile
index 7d0f9834e70d0eb655c984482a052028d4d5fef0..1bba3b632ccff05dc5cb7760728b22d6be60c912 100755 (executable)
--- a/doc/salome/tui/MED/doxyfile
+++ b/doc/salome/tui/MED/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - MED - v.2.2.9"
+PROJECT_NAME           = "SALOME - MED - v.2.1.0"
 PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/salome/tui/MED/sources/static/tree.js b/doc/salome/tui/MED/sources/static/tree.js
index 9b339e2805997c2a32d69e740b96c173a3392e42..d410052c45e8d38984fb7644d176ae759ce395dc 100755 (executable)
--- a/doc/salome/tui/MED/sources/static/tree.js
+++ b/doc/salome/tui/MED/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.2.2.9 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.2.1.0 </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))