Salome HOME
update resources
authorCédric Aguerre <cedric.aguerre@edf.fr>
Mon, 30 Nov 2015 17:01:17 +0000 (18:01 +0100)
committerCédric Aguerre <cedric.aguerre@edf.fr>
Tue, 1 Dec 2015 10:16:33 +0000 (11:16 +0100)
28 files changed:
medtool/doc/user/doxygen/doxfiles/appendix/install.dox
medtool/resources/CMakeLists.txt
medtool/resources/Mesh3D_10_2d1.med [new file with mode: 0644]
medtool/resources/Mesh3D_10_2d2.med [new file with mode: 0644]
medtool/resources/Mesh3D_11.med [new file with mode: 0644]
medtool/resources/poly3D.med [new file with mode: 0644]
medtool/resources/polygones.med [new file with mode: 0644]
medtool/resources/square1_split [new file with mode: 0644]
medtool/resources/square1_split1.med [new file with mode: 0644]
medtool/resources/square1_split2.med [new file with mode: 0644]
medtool/resources/square1_split3.med [new file with mode: 0644]
medtool/resources/square2_split [new file with mode: 0644]
medtool/resources/square2_split1.med [new file with mode: 0644]
medtool/resources/square2_split2.med [new file with mode: 0644]
medtool/src/MEDLoader/Test/MEDLoaderTest.cxx
medtool/src/ParaMEDMEMTest/ParaMEDMEMTest.cxx
resources/Mesh3D_10_2d1.med [deleted file]
resources/Mesh3D_10_2d2.med [deleted file]
resources/Mesh3D_11.med [deleted file]
resources/poly3D.med [deleted file]
resources/polygones.med [deleted file]
resources/square1_split [deleted file]
resources/square1_split1.med [deleted file]
resources/square1_split2.med [deleted file]
resources/square1_split3.med [deleted file]
resources/square2_split [deleted file]
resources/square2_split1.med [deleted file]
resources/square2_split2.med [deleted file]

index d2374d51e613fe0a42fcf13ba139711878d282a2..5386739c5d2a4ed787497a0dfe3936bda829f8a0 100644 (file)
@@ -5,38 +5,39 @@
 The install procedure of the %MED SALOME module can handle a variety of configurations
 to suit the needs of its user. Instructions for configuring and
 installing the module can be found here.
+Partitioning and parallel functionalities are optional.
 
-The libraries in SALOME MED can be configured in several manners so that it can run inside or outside the Salome platform.
-Also, partitioning and parallel functionalities are optional.
-
-The sources of the library are located in the \a MED_SRC directory.
+Assume that the library sources are located in \a MEDCOUPLING_SRC directory. Build and install directories are MEDCOUPLING_BUILD and MEDCOUPLING_INSTALL, respectively.
 The first step consists in preparing the CMake build precedure :
 \verbatim
-mkdir MED_BUILD
-cd ${MED_BUILD}
-cmake -DCMAKE_BUILD_TYPE=<Mode> -DCMAKE_INSTALL_PREFIX=`pwd`/../MED_INSTALL ../<MED_SRC>
+mkdir <MEDCOUPLING_BUILD>
+cd <MEDCOUPLING_BUILD>
+cmake -DCMAKE_BUILD_TYPE=<Mode> -DCMAKE_INSTALL_PREFIX=<MEDCOUPLING_INSTALL> <MEDCOUPLING_SRC>
 \endverbatim
 
 , where <Mode> is build mode (Release or Debug).
 
-This will create SALOME MED libraries with link to the SALOME Kernel.
-Sometimes, if it is desirable to have a standalone version of the library to be used independently from SALOME, use :
+This will configure the library without splitting functionalities. The \ref parallel "parallel functionalities" will be compiled if an MPI version has been found.
+
+The following options can be useful to configure MEDCoupling :
+- \a -DMEDTOOL_MED_PARTITIONER_METIS=ON enables metis graph library in MEDPartitioner,
+- \a -DMEDTOOL_MED_PARTITIONER_PARMETIS=ON enables parmetis graph library in MEDPartitioner,
+- \a -DMEDTOOL_MED_PARTITIONER_SCOTCH=ON enables scotch graph library in MEDPartitioner,
+- \a -DMEDTOOL_MED_MICROMED=ON build MED with MED file dependancy,
+- \a -DMEDTOOL_MED_ENABLE_PYTHON=ON builds PYTHON bindings,
+- \a -DMEDTOOL_MED_ENABLE_PARTITIONER builds MEDPartitioner,
+- \a -DMEDTOOL_MED_ENABLE_RENUMBER builds Renumber,
+- \a -DMEDTOOL_USE_MPI=ON uses MPI containers.
+
+According to set options and compilation environment, user may need to define some <prerequisite>_ROOT_DIR variables. For example if in SALOME environment:
 \verbatim
-mkdir MED_BUILD
-cd ${MED_BUILD}
-cmake -DCMAKE_BUILD_TYPE=<Mode> -DCMAKE_INSTALL_PREFIX=`pwd`/../MED_INSTALL _DSALOME_MED_STANDALONE=ON ../<MED_SRC>
+export MEDFILE_ROOT_DIR=${MED3HOME}
+export METIS_ROOT_DIR=$METISDIR
+export SCOTCH_ROOT_DIR=$SCOTCHDIR
+export BOOST_ROOT_DIR=$BOOST_ROOT
+export GRAPHVIZ_ROOT_DIR=$GRAPHVIZHOME
+export CPPUNIT_ROOT_DIR=$CPPUNIT_ROOT
 \endverbatim
 
-This will configure the library without splitting functionalities. The 
-\ref parallel "parallel functionalities" will be compiled if an MPI version has been found.
-
-The following options can be useful to configure SALOME MED :
-- \a -DSALOME_MED_PARTITIONER_METIS=ON enables metis graph library in MEDPartitioner,
-- \a -DSALOME_MED_PARTITIONER_PARMETIS=ON enables parmetis graph library in MEDPartitioner,
-- \a -DSALOME_MED_PARTITIONER_SCOTCH=ON enables scotch graph library in MEDPartitioner,
-- \a -DSALOME_MED_MICROMED=ON build MED with MED file dependancy,
-- \a -DSALOME_MED_ENABLE_PYTHON=ON builds PYTHON bindings,
-- \a -DSALOME_MED_ENABLE_PARTITIONER builds MEDPartitioner,
-- \a -DSALOME_MED_ENABLE_RENUMBER builds Renumber,
-- \a -DSALOME_USE_MPI=ON uses MPI containers.
+If using MPI, the PARMETIS_ROOT_DIR variable should be set.
 */
index e891af65c585b2ba52de4fc7bb699a2af8d01c1a..549b4ea55468ad8e844f2392dbe78fee3fd2de1b 100644 (file)
@@ -124,9 +124,9 @@ SET(MED_RESOURCES_FILES
   #Old_maillage_chemvalIV_cas1_40elts.med
   #pointe_nomorereadable21.med
   pointe.med
-  #poly3D.med
+  poly3D.med
   #polyedres.med
-  #polygones.med
+  polygones.med
   #recoll_bord.med
   #test19.med
   # test_2D.med
@@ -180,18 +180,18 @@ SET(MED_RESOURCES_FILES
   MovedHexaBox2.med
   BoxTetra2.med
   square1.med
-  square1_split
-  square1_split1.med
-  square1_split2.med
-  square1_split3.med
+  square1_split
+  square1_split1.med
+  square1_split2.med
+  square1_split3.med
   square2.med
-  square2_split
-  square2_split1.med
-  square2_split2.med
+  square2_split
+  square2_split1.med
+  square2_split2.med
   # testStructCart3D.med
-  Mesh3D_10_2d1.med
-  Mesh3D_10_2d2.med
-  Mesh3D_11.med
+  Mesh3D_10_2d1.med
+  Mesh3D_10_2d2.med
+  Mesh3D_11.med
   Pol1.fig
   Pol2.fig
   Pol3.fig
diff --git a/medtool/resources/Mesh3D_10_2d1.med b/medtool/resources/Mesh3D_10_2d1.med
new file mode 100644 (file)
index 0000000..508781d
Binary files /dev/null and b/medtool/resources/Mesh3D_10_2d1.med differ
diff --git a/medtool/resources/Mesh3D_10_2d2.med b/medtool/resources/Mesh3D_10_2d2.med
new file mode 100644 (file)
index 0000000..071d4a3
Binary files /dev/null and b/medtool/resources/Mesh3D_10_2d2.med differ
diff --git a/medtool/resources/Mesh3D_11.med b/medtool/resources/Mesh3D_11.med
new file mode 100644 (file)
index 0000000..5088b55
Binary files /dev/null and b/medtool/resources/Mesh3D_11.med differ
diff --git a/medtool/resources/poly3D.med b/medtool/resources/poly3D.med
new file mode 100644 (file)
index 0000000..5a42c3f
Binary files /dev/null and b/medtool/resources/poly3D.med differ
diff --git a/medtool/resources/polygones.med b/medtool/resources/polygones.med
new file mode 100644 (file)
index 0000000..0782b00
Binary files /dev/null and b/medtool/resources/polygones.med differ
diff --git a/medtool/resources/square1_split b/medtool/resources/square1_split
new file mode 100644 (file)
index 0000000..c6a1bce
--- /dev/null
@@ -0,0 +1,6 @@
+#MED Fichier V 2.3 
+# 
+3 
+Mesh_2 1 Mesh_2_1 localhost /home/vb144235/resources/square1_split1.med 
+Mesh_2 2 Mesh_2_2 localhost /home/vb144235/resources/square1_split2.med 
+Mesh_2 3 Mesh_2_3 localhost /home/vb144235/resources/square1_split3.med 
diff --git a/medtool/resources/square1_split1.med b/medtool/resources/square1_split1.med
new file mode 100644 (file)
index 0000000..c3ec2b8
Binary files /dev/null and b/medtool/resources/square1_split1.med differ
diff --git a/medtool/resources/square1_split2.med b/medtool/resources/square1_split2.med
new file mode 100644 (file)
index 0000000..42e0777
Binary files /dev/null and b/medtool/resources/square1_split2.med differ
diff --git a/medtool/resources/square1_split3.med b/medtool/resources/square1_split3.med
new file mode 100644 (file)
index 0000000..c77d068
Binary files /dev/null and b/medtool/resources/square1_split3.med differ
diff --git a/medtool/resources/square2_split b/medtool/resources/square2_split
new file mode 100644 (file)
index 0000000..bad1d1a
--- /dev/null
@@ -0,0 +1,5 @@
+#MED Fichier V 2.3 
+# 
+2 
+Mesh_3 1 Mesh_3_1 localhost /home/vb144235/resources/square2_split1.med 
+Mesh_3 2 Mesh_3_2 localhost /home/vb144235/resources/square2_split2.med 
diff --git a/medtool/resources/square2_split1.med b/medtool/resources/square2_split1.med
new file mode 100644 (file)
index 0000000..4979572
Binary files /dev/null and b/medtool/resources/square2_split1.med differ
diff --git a/medtool/resources/square2_split2.med b/medtool/resources/square2_split2.med
new file mode 100644 (file)
index 0000000..109f250
Binary files /dev/null and b/medtool/resources/square2_split2.med differ
index 0eb08c20600419725568319291807e3889fd27f8..d502eb118761900371f1a9536207c4e45064fea1 100644 (file)
@@ -1150,16 +1150,16 @@ std::string MEDLoaderTest::getResourceFile( const std::string& filename ) const
 {
   std::string resourceFile = "";
 
-  if ( getenv("top_srcdir") ) {
-    // we are in 'make test' step
-    resourceFile = getenv("top_srcdir");
-    resourceFile += "/resources/";
+  if ( getenv("MEDTOOL_ROOT_DIR") ) {
+    // use MEDTOOL_ROOT_DIR env.var
+    resourceFile = getenv("MEDTOOL_ROOT_DIR");
+    resourceFile += "/share/resources/med/";
   }
-  else if ( getenv("MED_ROOT_DIR") ) {
-    // use MED_ROOT_DIR env.var
-    resourceFile = getenv("MED_ROOT_DIR");
-    resourceFile += "/share/salome/resources/med/";
+  else {
+    resourceFile = get_current_dir_name();
+    resourceFile += "/../../../resources/";
   }
+
   resourceFile += filename;
   return resourceFile;
 }
index 42899d94a7869dc5b96e4e8fd6733193d21df3f9..4a18a8c08525c23c0615c61ab79e3be1ec4ad2cb 100644 (file)
 #include <unistd.h>
 #endif
 
-//================================================================================
-/*!
- * \brief Get path to the resources file.
- *
- * When running 'make test' source file is taken from MED_SRC/resources folder.
- * Otherwise, file is searched in ${MED_ROOT_DIR}/share/salome/resources/med folder.
- * 
- * \param filename name of the resource file (should not include a path)
- * \return full path to the resource file
- */
-//================================================================================
-
 std::string ParaMEDMEMTest::getResourceFile( const std::string& filename )
 {
   std::string resourceFile = "";
 
-  if ( getenv("top_srcdir") ) {
-    // we are in 'make test' step
-    resourceFile = getenv("top_srcdir");
-    resourceFile += "/resources/";
+  if ( getenv("MEDTOOL_ROOT_DIR") ) {
+    // use MEDTOOL_ROOT_DIR env.var
+    resourceFile = getenv("MEDTOOL_ROOT_DIR");
+    resourceFile += "/share/resources/med/";
   }
-  else if ( getenv("MED_ROOT_DIR") ) {
-    // use MED_ROOT_DIR env.var
-    resourceFile = getenv("MED_ROOT_DIR");
-    resourceFile += "/share/salome/resources/med/";
+  else {
+    resourceFile = get_current_dir_name();
+    resourceFile += "/../../resources/";
   }
+
   resourceFile += filename;
   return resourceFile;
 }
@@ -92,7 +80,7 @@ std::string ParaMEDMEMTest::getTmpDirectory()
 
 //================================================================================
 /*!
- * \brief Creates a copy of source file (if source file is specified) 
+ * \brief Creates a copy of source file (if source file is specified)
  * in the temporary directory and returns a path to the tmp file
  *
  * \param tmpfile name of the temporary file (without path)
diff --git a/resources/Mesh3D_10_2d1.med b/resources/Mesh3D_10_2d1.med
deleted file mode 100644 (file)
index 508781d..0000000
Binary files a/resources/Mesh3D_10_2d1.med and /dev/null differ
diff --git a/resources/Mesh3D_10_2d2.med b/resources/Mesh3D_10_2d2.med
deleted file mode 100644 (file)
index 071d4a3..0000000
Binary files a/resources/Mesh3D_10_2d2.med and /dev/null differ
diff --git a/resources/Mesh3D_11.med b/resources/Mesh3D_11.med
deleted file mode 100644 (file)
index 5088b55..0000000
Binary files a/resources/Mesh3D_11.med and /dev/null differ
diff --git a/resources/poly3D.med b/resources/poly3D.med
deleted file mode 100644 (file)
index 5a42c3f..0000000
Binary files a/resources/poly3D.med and /dev/null differ
diff --git a/resources/polygones.med b/resources/polygones.med
deleted file mode 100644 (file)
index 0782b00..0000000
Binary files a/resources/polygones.med and /dev/null differ
diff --git a/resources/square1_split b/resources/square1_split
deleted file mode 100644 (file)
index c6a1bce..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#MED Fichier V 2.3 
-# 
-3 
-Mesh_2 1 Mesh_2_1 localhost /home/vb144235/resources/square1_split1.med 
-Mesh_2 2 Mesh_2_2 localhost /home/vb144235/resources/square1_split2.med 
-Mesh_2 3 Mesh_2_3 localhost /home/vb144235/resources/square1_split3.med 
diff --git a/resources/square1_split1.med b/resources/square1_split1.med
deleted file mode 100644 (file)
index c3ec2b8..0000000
Binary files a/resources/square1_split1.med and /dev/null differ
diff --git a/resources/square1_split2.med b/resources/square1_split2.med
deleted file mode 100644 (file)
index 42e0777..0000000
Binary files a/resources/square1_split2.med and /dev/null differ
diff --git a/resources/square1_split3.med b/resources/square1_split3.med
deleted file mode 100644 (file)
index c77d068..0000000
Binary files a/resources/square1_split3.med and /dev/null differ
diff --git a/resources/square2_split b/resources/square2_split
deleted file mode 100644 (file)
index bad1d1a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#MED Fichier V 2.3 
-# 
-2 
-Mesh_3 1 Mesh_3_1 localhost /home/vb144235/resources/square2_split1.med 
-Mesh_3 2 Mesh_3_2 localhost /home/vb144235/resources/square2_split2.med 
diff --git a/resources/square2_split1.med b/resources/square2_split1.med
deleted file mode 100644 (file)
index 4979572..0000000
Binary files a/resources/square2_split1.med and /dev/null differ
diff --git a/resources/square2_split2.med b/resources/square2_split2.med
deleted file mode 100644 (file)
index 109f250..0000000
Binary files a/resources/square2_split2.med and /dev/null differ