aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
commit3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 (patch)
tree0cc82498adcf7e3fdde6a370e4fdd4f510ca5167 /sci-misc/salome-med/files
parentAdd hydra pm. #309353 (diff)
downloadsci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.gz
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.bz2
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.zip
sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6
Diffstat (limited to 'sci-misc/salome-med/files')
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch59
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch367
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6.patch28
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch20
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_environ.patch27
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch26
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch48
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch74
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch43
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch13
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch11
-rw-r--r--sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch11
12 files changed, 200 insertions, 527 deletions
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch b/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch
deleted file mode 100644
index a82924f1d..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx 2008-05-25 19:32:53.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCasedTree.cxx 2008-05-26 01:21:12.000000000 +0200
-@@ -20,7 +20,7 @@
- #include "stdio.h"
- #include "stdlib.h"
-
--#include <iostream.h>
-+#include <iostream>
-
- #include "MEDMEM_InterpolationHighLevelObjects.hxx"
-
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx 2008-05-25 19:32:53.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseMapping.cxx 2008-05-26 01:33:32.000000000 +0200
-@@ -20,7 +20,7 @@
- #include "stdio.h"
- #include "stdlib.h"
-
--#include <iostream.h>
-+#include <iostream>
-
- #include "MEDMEM_InterpolationHighLevelObjects.hxx"
-
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx 2008-05-25 19:32:53.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/UseCaseWrapper_Maillage.cxx 2008-05-26 01:41:07.000000000 +0200
-@@ -20,7 +20,7 @@
- #include "stdio.h"
- #include "stdlib.h"
-
--#include <iostream.h>
-+#include <iostream>
-
- #include "MEDMEM_InterpolationHighLevelObjects.hxx"
-
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx 2008-05-25 19:32:53.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_AsciiFieldDriver.hxx 2008-05-26 00:59:23.000000000 +0200
-@@ -34,7 +34,7 @@
- #include <iomanip>
- #include <stdlib.h>
- #include <string.h>
--#include <fstream.h>
-+#include <fstream>
-
- #define PRECISION_IN_ASCII_FILE 10
- #define PRECISION_IN_COMPARE 1e-10
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx 2008-05-25 19:32:53.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/test_grid.cxx 2008-05-26 01:55:21.000000000 +0200
-@@ -18,6 +18,7 @@
- // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
- //
- #include "MEDMEM_Grid.hxx"
-+#include <memory>
-
- using namespace MEDMEM;
- using namespace MED_EN;
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch b/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch
deleted file mode 100644
index 7342af130..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6-hdf5-1.6.7.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-07-25 09:16:10.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.cxx 2008-10-15 12:03:32.000000000 +0200
-@@ -258,12 +258,22 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -291,13 +301,23 @@
- }
- }
-
--#ifdef HDF_NEW_API
-+#ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -378,9 +398,16 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
- return -1;
- #endif
-@@ -418,11 +445,21 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
-- return -1;
-+ return -1;
-+#else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
- #else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-07-25 09:16:10.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumEcrire.cxx 2008-10-15 12:03:08.000000000 +0200
-@@ -205,27 +205,37 @@
- { /* switch pflmod pout FULL_INTERLACE*/
- case MED_GLOBALE :
-
-- /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */
-- if ( (memspace = H5Screate_simple (1, size, NULL)) <0)
-- return -1;
-+ /* Creation d'un data space mémoire de dimension 1, de longeur size, et de longeur maxi size */
-+ if ( (memspace = H5Screate_simple (1, size, NULL)) <0)
-+ return -1;
-+
-+ for (dim=firstdim; dim < lastdim; dim++) {
-+
-+ for (i=0; i < psize; i++) /* i balaye les élements du profil */
-+ for (j=0; j < ngauss; j++) {
-+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-+ pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim;
-+ pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;
-+ }
-+ }
-+
-+ #ifdef HDF_NEW_API
-
-- for (dim=firstdim; dim < lastdim; dim++) {
--
-- for (i=0; i < psize; i++) /* i balaye les élements du profil */
-- for (j=0; j < ngauss; j++) {
-- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-- pflmem[index] = (pfltab[i]-1)*ngauss*nbdim + j*nbdim+dim;
-- pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;
-- }
-- }
--
--#ifdef HDF_NEW_API
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -255,12 +265,22 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -326,39 +346,46 @@
- pfldsk = (med_size *) malloc(sizeof(med_size)*pcount[0]);
- #else
- pfldsk = (med_ssize *) malloc(sizeof(med_ssize)*pcount[0]);
--#endif
-+ #endif
-
-- switch(pflmod)
-- { /*switch plfmod pour NO_INTERLACE */
-- case MED_GLOBALE :
--
-- for (dim=firstdim; dim < lastdim; dim++) {
--
-- for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
-- for (j=0; j < ngauss; j++) {
-- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-- pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j;
-- }
-- }
--
-+ switch(pflmod)
-+ { /*switch plfmod pour NO_INTERLACE */
-+ case MED_GLOBALE :
-+
-+ for (dim=firstdim; dim < lastdim; dim++) {
-+
-+ for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
-+ for (j=0; j < ngauss; j++) {
-+ index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-+ pfldsk[index] = dim*count[0]+(pfltab[i]-1)*ngauss+j;
-+ }
-+ }
-+
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
- return -1;
- #endif
--
-+
- if ((ret = H5Dwrite(dataset,type_hdf,dataspace,dataspace,H5P_DEFAULT, val)) < 0)
- return -1;
--
-+
- break;
--
-+
- case MED_COMPACT :
--
-- /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */
-- /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */
-- /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */
-+
-+ /* Creation d'un data space mémoire de dimension 1, de la longeur du profil */
-+ /* La dimension utilisée est ici nbdim, même pour un profil compact on suppose */
-+ /* que l'utilisateur a toutes les coordonées stockées, même si il en demande qu'une */
-
- if ( (memspace = H5Screate_simple (1, pflsize, NULL)) <0)
- return -1;
-@@ -368,26 +395,36 @@
- #else
- pflmem = (med_ssize *) malloc (sizeof(med_ssize)*pcount[0]);
- #endif
--
-+
- /* Le profil COMPACT est contigüe, mais il est possible que l'on selectionne uniquemenent une dimension*/
--
-+
- for (dim=firstdim; dim < lastdim; dim++) {
--
-+
- for (i=0; i < psize; i++) /* i balaye le nbre d'élements du profil */
- for (j=0; j < ngauss; j++) {
- index = i*ngauss+j + (dim-firstdim)*(psize*ngauss);
-- pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j;
-+ pflmem[index] = dim*(psize*ngauss) + (pfltab[i]-1)*ngauss+j;
- pfldsk[index] = dim*count[0] + (pfltab[i]-1)*ngauss+j;
- }
- }
--
-+
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET,pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-diff -aur src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx
---- src3.2.6.old/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-07-25 09:16:10.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/MEDdatasetNumLire.cxx 2008-10-15 12:01:30.000000000 +0200
-@@ -204,12 +204,22 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-
-@@ -239,11 +249,21 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t **) pfldsk ) ) <0)
-+ return -1;
-+#else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
- return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET, pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
- #else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
-@@ -325,9 +345,16 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
- return -1;
- #else
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
-+#else
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hssize_t **) pfldsk ) ) <0)
- return -1;
- #endif
-@@ -369,11 +396,21 @@
- }
-
- #ifdef HDF_NEW_API
-+
-+#if H5_VERS_RELEASE < 7
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t **) pflmem ) ) <0)
- return -1;
-
- if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t **) pfldsk ) ) <0)
-- return -1;
-+ return -1;
-+#else
-+ if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hsize_t *) pflmem ) ) <0)
-+ return -1;
-+
-+ if ( (ret = H5Sselect_elements(dataspace,H5S_SELECT_SET,pcount[0], (const hsize_t *) pfldsk ) ) <0)
-+ return -1;
-+#endif
-+
- #else
- if ( (ret = H5Sselect_elements(memspace ,H5S_SELECT_SET, pcount[0], (const hssize_t **) pflmem ) ) <0)
- return -1;
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6.patch b/sci-misc/salome-med/files/salome-med-3.2.6.patch
deleted file mode 100644
index 7ffd0ac23..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./MED_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:51.000000000 +0200
-+++ ./MED_SRC_3.2.6/adm_local/Makefile.in 2008-01-04 15:51:44.000000000 +0100
-@@ -26,12 +26,12 @@
- all: resources
-
- install:
-- cp -rf @top_srcdir@/adm_local @prefix@
-+# cp -rf @top_srcdir@/adm_local @prefix@
-
- bin:
-
- resources :
-- cp -rf @top_srcdir@/adm_local $(top_builddir)
-+# cp -rf @top_srcdir@/adm_local $(top_builddir)
-
- inc:
-
---- ./MED_SRC_3.2.6/build_configure.org 2007-04-24 18:40:51.000000000 +0200
-+++ ./MED_SRC_3.2.6/build_configure 2008-01-04 15:14:30.000000000 +0100
-@@ -174,7 +174,7 @@
- # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
- echo "" >> configure.in_tmp1
- echo 'if test ${MED_WITH_KERNEL} = yes; then' >> configure.in_tmp1
--echo ' ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
-+echo ' cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
- echo 'else' >> configure.in_tmp1
- echo ' ln -fsn ${ROOT_SRCDIR}/adm_local_without_kernel ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
- echo 'fi' >> configure.in_tmp1
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch b/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch
deleted file mode 100644
index 7425b13e9..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6_boost-1.35.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src3.2.6_orig/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:10:27.000000000 +0200
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Wrapper.cxx 2008-09-04 21:14:06.000000000 +0200
-@@ -23,7 +23,7 @@
- ::TLockProxy(TWrapper* theWrapper):
- myWrapper(theWrapper)
- {
-- boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex);
-+ myWrapper->myMutex.lock();
- INITMSG(MYDEBUG,"TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl);
- }
-
-@@ -31,7 +31,7 @@
- ::~TLockProxy()
- {
- INITMSG(MYDEBUG,"~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<endl);
-- boost::detail::thread::lock_ops<TWrapper::TMutex>::unlock(myWrapper->myMutex);
-+ myWrapper->myMutex.unlock();
- }
-
- TWrapper*
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch b/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
deleted file mode 100644
index 8af83ea5a..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/MedClient/test/environ/Makefile.in_orig 2008-01-04 17:11:06.000000000 +0100
-+++ src/MedClient/test/environ/Makefile.in 2008-01-04 17:12:08.000000000 +0100
-@@ -29,6 +29,7 @@
- top_builddir=../../../..
- srcdir=@srcdir@
- VPATH=.:@srcdir@
-+prefix=@prefix@
-
- BIN= runEnvironTests
-
-@@ -53,11 +54,11 @@
- chmod +x csh/*
-
- install:
-- mkdir -p @prefix@/Tests/environ
-- cp -rf ${BIN} csh @prefix@/Tests/environ
-- cd @prefix@/Tests/environ ; chmod u+x ${BIN}
-- cp -f ${top_builddir}/bin/runTestMedCorba @prefix@/bin
-- chmod +x @prefix@/bin/runTestMedCorba
-+ mkdir -p ${prefix}/Tests/environ
-+ cp -rf ${BIN} csh ${prefix}/Tests/environ
-+ cd ${prefix}/Tests/environ ; chmod u+x ${BIN}
-+ cp -f ${top_builddir}/bin/runTestMedCorba ${prefix}/bin
-+ chmod +x ${prefix}/bin/runTestMedCorba
-
- ./%: @srcdir@/%.in
- cd $(top_builddir) ; \
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch b/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
deleted file mode 100644
index 7ec5dac34..000000000
--- a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:27:29.000000000 +0100
-+++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:28:23.000000000 +0100
-@@ -222,7 +222,7 @@
- case MED_FLOAT64 :
- if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_FLOAT64,
- interlace,ncomp,numco,
-- psize,pflmod,pfltab,ngauss,val)< 0)
-+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
- goto ERROR;
- break;
-
-@@ -230,12 +230,12 @@
- #if defined(F77INT64)
- if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT64,
- interlace,ncomp,numco,
-- psize,pflmod,pfltab,ngauss,val)< 0)
-+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
- goto ERROR;
- #else
- if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT32,
- interlace,ncomp,numco,
-- psize,pflmod,pfltab,ngauss,val)< 0)
-+ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
- goto ERROR;
- #endif
- break;
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch
new file mode 100644
index 000000000..c133b7f37
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch
@@ -0,0 +1,48 @@
+--- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4.orig 2009-09-27 22:35:51.014701709 +0200
++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4 2009-09-27 22:41:46.471297649 +0200
+@@ -28,6 +28,10 @@
+
+ METIS_CPPFLAGS=""
+ METIS_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*) METIS_LIBSUFFIX="64" ;;
++*) METIS_LIBSUFFIX="" ;;
++esac
+ METIS_LIBS=""
+ ENABLE_METIS="no"
+
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+
+ if test "x${METISDIR}" != "x" ; then
+- METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib"
+- METIS_LIBS="-L${METISDIR} -lmetis"
++ METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/include/metis"
++ METIS_LIBS="-L${METISDIR}/lib${METIS_LIBSUFFIX} -lmetis"
+ fi
+
+ metis_ok=no
+@@ -57,7 +61,7 @@
+
+ metis_include_dir_ok=yes
+ if test "x${METISDIR}" != "x" ; then
+- AC_CHECK_FILE(${METISDIR}/Lib/metis.h,
++ AC_CHECK_FILE(${METISDIR}/include/metis/metis.h,
+ metis_include_dir_ok=yes,
+ metis_include_dir_ok=no)
+ fi
+@@ -81,12 +85,12 @@
+ AC_CHECKING(for METIS binaries)
+ metis_lib_dir_ok=yes
+ if test "x${METISDIR}" != "x" ; then
+- AC_CHECK_FILE(${METISDIR}/libmetis.a,
++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+ metis_lib_dir_ok=yes,
+ metis_lib_dir_ok=no)
+ if test "x${metis_lib_dir_ok}" = "xno" ; then
+ METIS_LIBSUFFIX=""
+- AC_CHECK_FILE(${METISDIR}/libmetis.a,
++ AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
+ metis_lib_dir_ok=yes,
+ metis_lib_dir_ok=no)
+ fi
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch
new file mode 100644
index 000000000..64c8bb2d8
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch
@@ -0,0 +1,74 @@
+--- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4.orig 2009-09-27 23:07:31.245061430 +0200
++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4 2009-09-27 23:11:02.080868671 +0200
+@@ -28,6 +28,10 @@
+
+ SCOTCH_CPPFLAGS=""
+ SCOTCH_LIBSUFFIX=""
++case "$build_cpu" in
++x86_64*) SCOTCH_LIBSUFFIX="64" ;;
++*) SCOTCH_LIBSUFFIX="" ;;
++esac
+ SCOTCH_LIBS=""
+ ENABLE_SCOTCH="no"
+
+@@ -43,8 +47,8 @@
+ LIBS_old=$LIBS
+
+ if test "x${SCOTCHDIR}" != "x" ; then
+- SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}"
+- SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr"
++ SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch"
++ SCOTCH_LIBS="-L${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX} -lscotch -lscotcherr"
+ fi
+
+ scotch_ok=no
+@@ -57,14 +61,14 @@
+
+ scotch_include_dir_ok=yes
+ if test "x${SCOTCHDIR}" != "x" ; then
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h,
++ AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h,
+ scotch_include_dir_ok=yes,
+ scotch_include_dir_ok=no)
+ fi
+
+ if test "x${scotch_include_dir_ok}" = "xyes" ; then
+ AC_TRY_COMPILE([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_headers_ok=yes,
+@@ -83,12 +87,12 @@
+ AC_CHECKING(for SCOTCH binaries)
+ scotch_lib_dir_ok=yes
+ if test "x${SCOTCHDIR}" != "x" ; then
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+ scotch_lib_dir_ok=yes,
+ scotch_lib_dir_ok=no)
+ if test "x${scotch_lib_dir_ok}" = "xno" ; then
+ SCOTCH_LIBSUFFIX=""
+- AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
++ AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
+ scotch_lib_dir_ok=yes,
+ scotch_lib_dir_ok=no)
+ fi
+@@ -96,7 +100,7 @@
+ if test "x${scotch_lib_dir_ok}" = "xyes" ; then
+ LIBS="${LIBS_old} ${SCOTCH_LIBS}"
+ AC_TRY_LINK([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_binaries_ok=yes,
+@@ -105,7 +109,7 @@
+ SCOTCH_LIBSUFFIX=""
+ LIBS="${LIBS_old} ${SCOTCH_LIBS} "
+ AC_TRY_LINK([#include <stdio.h>
+- #include <bin/scotch.h>],
++ #include <scotch.h>],
+ [SCOTCH_Graph* graph;
+ SCOTCH_graphInit(graph)],
+ scotch_binaries_ok=yes,
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch
new file mode 100644
index 000000000..15e349204
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch
@@ -0,0 +1,43 @@
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:18:07.064072621 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx 2010-03-07 23:19:44.920271906 +0100
+@@ -23,6 +23,7 @@
+ #include <cmath>
+ #include <list>
+ #include <stdexcept>
++#include <cstdlib>
+
+ //================================================================================
+ /*!
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:18:07.102331566 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx 2010-03-07 23:24:44.300321009 +0100
+@@ -21,7 +21,7 @@
+ #include <map>
+ #include <iostream>
+ #include <mpi.h>
+-#include <time.h>
++#include <ctime>
+
+ #include "MPIAccessDECTest.hxx"
+ #include <cppunit/TestAssert.h>
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:18:07.084009650 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx 2010-03-07 23:25:22.930322599 +0100
+@@ -22,7 +22,7 @@
+ #include <map>
+ #include <iostream>
+ #include <mpi.h>
+-#include <time.h>
++#include <ctime>
+
+ #include "MPIAccessDECTest.hxx"
+ #include <cppunit/TestAssert.h>
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:14:50.721209673 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c 2010-03-13 13:15:35.420479255 +0100
+@@ -21,7 +21,7 @@
+ //
+ #include <med.h>
+ #include <string.h>
+-
++#include <stdlib.h>
+
+ /*****************************************************************************************************/
+
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch
new file mode 100644
index 000000000..a4dc19909
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch
@@ -0,0 +1,13 @@
+--- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:42:49.442822826 +0100
++++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx 2010-03-07 19:43:38.710252330 +0100
+@@ -39,8 +39,8 @@
+ void addElementFromSource(int distant_proc, int distant_elem);
+ void prepareSendRecv();
+ void sendRecv(MEDCouplingFieldDouble& field);
+- void sendRecv(double* field, MEDCouplingFieldDouble& field) const ;
+- void reverseSendRecv(double* field, MEDCouplingFieldDouble& field) const ;
++ void sendRecv(double* sendfield, MEDCouplingFieldDouble& field) const ;
++ void reverseSendRecv(double* recvfield, MEDCouplingFieldDouble& field) const ;
+
+ //
+ const std::vector<std::pair<int,int> >& getSendingIds() const { return _sending_ids; }
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch
new file mode 100644
index 000000000..0737e67bf
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100
++++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100
+@@ -333,7 +333,7 @@
+
+ LIBS_old=$LIBS
+ if test "x$QTDIR" = "x/usr" ; then
+- QT_LIB_DIR=""
++ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
+ elif test -d ${QTDIR}/lib; then
+ QT_LIB_DIR="-L$QTDIR/lib"
+ elif test -d ${QTDIR}/lib64; then
diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch
new file mode 100644
index 000000000..0cfcaf708
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2008-12-10 10:14:43.000000000 +0100
++++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx 2009-09-27 23:26:59.010112791 +0200
+@@ -19,7 +19,7 @@
+ #include <cstdio>
+ extern "C" {
+ #define restrict
+-#include "bin/scotch.h"
++#include "scotch.h"
+ }
+ #include "MEDSPLITTER_Graph.hxx"
+ #include "MEDSPLITTER_SCOTCHGraph.hxx"