From 585bd37df74316351794a289a147098ede05d9ea Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 21 Sep 2006 10:33:18 +0000 Subject: [PATCH] Merge from MED version 3.2.0 --- doc/MEDMEM/FIELDcreate.cxx | 1 + doc/MEDMEM/FIELDgeneral.cxx | 1 + doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx | 3 +++ doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx | 5 +++++ doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx | 3 +++ doc/MEDMEM/MESHINGexample.cxx | 3 +++ doc/MEDMEM/MESHconnectivities.cxx | 3 +++ doc/MEDMEM/MESHcoordinates.cxx | 3 +++ doc/html/INPUT/doxyfile | 2 +- doc/html/INPUT/sources/static/tree.js | 2 +- doc/salome/tui/MED/doxyfile | 2 +- doc/salome/tui/MED/sources/static/tree.js | 2 +- 12 files changed, 26 insertions(+), 4 deletions(-) diff --git a/doc/MEDMEM/FIELDcreate.cxx b/doc/MEDMEM/FIELDcreate.cxx index e94b17b78..d8375e073 100644 --- 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 120cef911..18c021037 100644 --- 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 fca94088d..b7017228d 100644 --- 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 b8c110ad2..e90b6030a 100644 --- 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 87ed74393..270eacbc2 100644 --- 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 2ec7a16ee..07c943a02 100644 --- 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 2964ff9f8..6a0f40cfe 100644 --- 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 18edd0328..e52eaaa00 100644 --- 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 2282b8201..6e7f69462 100755 --- 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 ac711932d..7cdc19393 100755 --- a/doc/html/INPUT/sources/static/tree.js +++ b/doc/html/INPUT/sources/static/tree.js @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.2.2.9 ", "", "") +foldersTree = gFld("SALOME v.2.0.0 ", "", "") 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 7d0f9834e..1bba3b632 100755 --- 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 9b339e280..d410052c4 100755 --- a/doc/salome/tui/MED/sources/static/tree.js +++ b/doc/salome/tui/MED/sources/static/tree.js @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.2.2.9 ", "", "") +foldersTree = gFld("SALOME v.2.1.0 ", "", "") insDoc(foldersTree, gLnk("Main Page", "", "main.html")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) -- 2.39.2