From 270597cb2daee00483634a0c2100f5e7f9b25e14 Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 2 Feb 2010 08:57:43 +0000 Subject: [PATCH] *** empty log message *** --- src/{ParaMEDMEM => }/MEDLoader/MEDLoader.cxx | 113 +++++++++--------- src/{ParaMEDMEM => }/MEDLoader/MEDLoader.hxx | 5 +- src/{ParaMEDMEM => }/MEDLoader/Makefile.am | 20 ++-- src/ParaMEDLoader/Makefile.am | 41 +++++++ src/ParaMEDLoader/ParaMEDLoader.cxx | 59 +++++++++ src/ParaMEDLoader/ParaMEDLoader.hxx | 37 ++++++ src/ParaMEDMEM/Makefile.am | 15 --- .../MPIAccessDECTest.cxx | 0 .../MPIAccessDECTest.hxx | 0 .../Test => ParaMEDMEMTest}/MPIAccessTest.cxx | 0 .../Test => ParaMEDMEMTest}/MPIAccessTest.hxx | 0 .../Test => ParaMEDMEMTest}/MPIMainTest.hxx | 0 .../Test => ParaMEDMEMTest}/Makefile.am | 19 +-- .../ParaMEDMEMTest.cxx | 0 .../ParaMEDMEMTest.hxx | 0 .../ParaMEDMEMTest_BlockTopology.cxx | 0 .../ParaMEDMEMTest_Gauthier1.cxx | 0 .../ParaMEDMEMTest_ICocoTrio.cxx | 0 .../ParaMEDMEMTest_InterpKernelDEC.cxx | 18 +-- .../ParaMEDMEMTest_MEDLoader.cxx | 0 .../ParaMEDMEMTest_MPIProcessorGroup.cxx | 0 .../ParaMEDMEMTest_NonCoincidentDEC.cxx | 0 ...ParaMEDMEMTest_StructuredCoincidentDEC.cxx | 0 .../Test => ParaMEDMEMTest}/TestMPIAccess.cxx | 0 .../TestMPIAccessDEC.cxx | 0 .../TestParaMEDMEM.cxx | 0 .../test_AllToAllDEC.cxx | 0 .../test_AllToAllTimeDEC.cxx | 0 .../test_AllToAllvDEC.cxx | 0 .../test_AllToAllvTimeDEC.cxx | 0 .../test_AllToAllvTimeDoubleDEC.cxx | 0 .../test_MPI_Access_Cancel.cxx | 0 .../test_MPI_Access_Cyclic_ISend_IRecv.cxx | 0 .../test_MPI_Access_Cyclic_Send_Recv.cxx | 0 .../test_MPI_Access_IProbe.cxx | 0 .../test_MPI_Access_ISendRecv.cxx | 0 .../test_MPI_Access_ISend_IRecv.cxx | 0 ...test_MPI_Access_ISend_IRecv_BottleNeck.cxx | 0 .../test_MPI_Access_ISend_IRecv_Length.cxx | 0 .../test_MPI_Access_ISend_IRecv_Length_1.cxx | 0 .../test_MPI_Access_Probe.cxx | 0 .../test_MPI_Access_SendRecv.cxx | 0 .../test_MPI_Access_Send_Recv.cxx | 0 .../test_MPI_Access_Send_Recv_Length.cxx | 0 .../test_MPI_Access_Time.cxx | 0 .../test_MPI_Access_Time_0.cxx | 0 .../Test => ParaMEDMEMTest}/test_perf.cxx | 0 src/ParaMEDMEM_Swig/Makefile.am | 6 +- 48 files changed, 224 insertions(+), 109 deletions(-) rename src/{ParaMEDMEM => }/MEDLoader/MEDLoader.cxx (92%) rename src/{ParaMEDMEM => }/MEDLoader/MEDLoader.hxx (95%) rename src/{ParaMEDMEM => }/MEDLoader/Makefile.am (62%) create mode 100755 src/ParaMEDLoader/Makefile.am create mode 100644 src/ParaMEDLoader/ParaMEDLoader.cxx create mode 100644 src/ParaMEDLoader/ParaMEDLoader.hxx rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/MPIAccessDECTest.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/MPIAccessDECTest.hxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/MPIAccessTest.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/MPIAccessTest.hxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/MPIMainTest.hxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/Makefile.am (89%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest.hxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_BlockTopology.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_Gauthier1.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_ICocoTrio.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_InterpKernelDEC.cxx (98%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_MEDLoader.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_MPIProcessorGroup.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_NonCoincidentDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/ParaMEDMEMTest_StructuredCoincidentDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/TestMPIAccess.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/TestMPIAccessDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/TestParaMEDMEM.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_AllToAllDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_AllToAllTimeDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_AllToAllvDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_AllToAllvTimeDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_AllToAllvTimeDoubleDEC.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Cancel.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Cyclic_ISend_IRecv.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Cyclic_Send_Recv.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_IProbe.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_ISendRecv.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_ISend_IRecv.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_ISend_IRecv_BottleNeck.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_ISend_IRecv_Length.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_ISend_IRecv_Length_1.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Probe.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_SendRecv.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Send_Recv.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Send_Recv_Length.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Time.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_MPI_Access_Time_0.cxx (100%) rename src/{ParaMEDMEM/Test => ParaMEDMEMTest}/test_perf.cxx (100%) diff --git a/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx b/src/MEDLoader/MEDLoader.cxx similarity index 92% rename from src/ParaMEDMEM/MEDLoader/MEDLoader.cxx rename to src/MEDLoader/MEDLoader.cxx index 453ad73f6..bbf367809 100644 --- a/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx +++ b/src/MEDLoader/MEDLoader.cxx @@ -18,9 +18,8 @@ // #include "MEDLoader.hxx" #include "CellModel.hxx" -#include "ParaMESH.hxx" -#include "BlockTopology.hxx" #include "MEDCouplingUMesh.hxx" +#include "MEDCouplingMemArray.hxx" #include "MEDCouplingFieldDouble.hxx" extern "C" @@ -76,6 +75,43 @@ INTERP_KERNEL::NormalizedCellType typmai2[MED_NBR_GEOMETRIE_MAILLE+2] = { INTERP using namespace ParaMEDMEM; +namespace MEDLoader +{ + class FieldPerTypeCopier + { + public: + FieldPerTypeCopier(double *ptr):_ptr(ptr) { } + void operator()(const MEDLoader::MEDFieldDoublePerCellType& elt) { _ptr=std::copy(elt.getArray(),elt.getArray()+elt.getNbOfValues(),_ptr); } + private: + double *_ptr; + }; + + std::string buildStringFromFortran(const char *expr, int lgth); + std::vector getMeshNamesFid(med_idt fid); + void readFieldDoubleDataInMedFile(const char *fileName, const char *meshName, const char *fieldName, std::list& field, + int iteration, int order, ParaMEDMEM::TypeOfField typeOfOutField, double& time); + std::vector getIdsFromFamilies(const char *fileName, const char *meshName, const std::vector& fams); + std::vector getIdsFromGroups(const char *fileName, const char *meshName, const std::vector& grps); + med_int getIdFromMeshName(med_idt fid, const char *meshName) throw(INTERP_KERNEL::Exception); + void dispatchElems(int nbOfElemCell, int nbOfElemFace, int& nbOfElem, med_entite_maillage& whichEntity); + void readUMeshDataInMedFile(med_idt fid, med_int meshId, double *&coords, int& nCoords, int& spaceDim, std::list& conn); + int buildMEDSubConnectivityOfOneType(DataArrayInt *conn, DataArrayInt *connIndex, INTERP_KERNEL::NormalizedCellType type, std::vector& conn4MEDFile, + std::vector& connIndex4MEDFile, std::vector& connIndexRk24MEDFile); + MEDCouplingUMesh *readUMeshFromFileLev1(const char *fileName, const char *meshName, int meshDimRelToMax, const std::vector& ids, + const std::vector& typesToKeep, unsigned& meshDimExtract) throw(INTERP_KERNEL::Exception); + void tradMEDFileCoreFrmt2MEDCouplingUMesh(const std::list& medConnFrmt, + DataArrayInt* &conn, + DataArrayInt* &connIndex, + const std::vector& familiesToKeep); + ParaMEDMEM::DataArrayDouble *buildArrayFromRawData(const std::list& fieldPerType); + int buildMEDSubConnectivityOfOneTypesPolyg(DataArrayInt *conn, DataArrayInt *connIndex, std::vector& conn4MEDFile, std::vector& connIndex4MEDFile); + int buildMEDSubConnectivityOfOneTypesPolyh(DataArrayInt *conn, DataArrayInt *connIndex, std::vector& conn4MEDFile, + std::vector& connIndex4MEDFile, std::vector& connIndexRk24MEDFile); + int buildMEDSubConnectivityOfOneTypeStaticTypes(DataArrayInt *conn, DataArrayInt *connIndex, INTERP_KERNEL::NormalizedCellType type, std::vector& conn4MEDFile); + ParaMEDMEM::MEDCouplingFieldDouble *readFieldDoubleLev1(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order, + ParaMEDMEM::TypeOfField typeOfOutField); +} + const char WHITE_SPACES[]=" \n"; /*! @@ -117,22 +153,22 @@ void MEDLoader::MEDFieldDoublePerCellType::releaseArray() delete [] _values; } -std::string buildStringFromFortran(const char *expr, int lgth) -{ - std::string ret(expr,lgth); - std::string whiteSpaces(WHITE_SPACES); - std::size_t lgthReal=strlen(ret.c_str()); - std::string ret2=ret.substr(0,lgthReal); - std::size_t found=ret2.find_last_not_of(whiteSpaces); - if (found!=std::string::npos) - ret2.erase(found+1); - else - ret2.clear();//ret is all whitespace - return ret2; -} - namespace MEDLoader { + std::string buildStringFromFortran(const char *expr, int lgth) + { + std::string ret(expr,lgth); + std::string whiteSpaces(WHITE_SPACES); + std::size_t lgthReal=strlen(ret.c_str()); + std::string ret2=ret.substr(0,lgthReal); + std::size_t found=ret2.find_last_not_of(whiteSpaces); + if (found!=std::string::npos) + ret2.erase(found+1); + else + ret2.clear();//ret is all whitespace + return ret2; + } + std::vector getMeshNamesFid(med_idt fid) { med_maillage type_maillage; @@ -463,7 +499,7 @@ namespace MEDLoader return ret; } - std::vector getIdsFromGroups(const char *fileName, const char *meshName, const std::vector& grps) + std::vector getIdsFromGroups(const char *fileName, const char *meshName, const std::vector& grps) { std::vector ret; med_idt fid=MEDouvrir((char *)fileName,MED_LECTURE); @@ -685,15 +721,6 @@ namespace MEDLoader int operator()(int res, const MEDLoader::MEDFieldDoublePerCellType& elt) { return res+elt.getNbOfTuple(); } }; - class FieldPerTypeCopier - { - public: - FieldPerTypeCopier(double *ptr):_ptr(ptr) { } - void operator()(const MEDLoader::MEDFieldDoublePerCellType& elt) { _ptr=std::copy(elt.getArray(),elt.getArray()+elt.getNbOfValues(),_ptr); } - private: - double *_ptr; - }; - ParaMEDMEM::DataArrayDouble *buildArrayFromRawData(const std::list& fieldPerType) { ParaMEDMEM::DataArrayDouble *ret=ParaMEDMEM::DataArrayDouble::New(); @@ -971,20 +998,6 @@ namespace MEDLoader releaseMEDFileCoreFrmt(fieldPerCellType); return ret; } - - /*! - * This method builds the master file 'fileName' of a parallel MED file defined in 'fileNames'. - */ - void writeMasterFile(const char *fileName, const std::vector& fileNames, const char *meshName) - { - int nbOfDom=fileNames.size(); - std::ofstream fs(fileName); - fs << "#MED Fichier V 2.3" << " " << std::endl; - fs << "#"<<" " << std::endl; - fs << nbOfDom <<" " << std::endl; - for(int i=0;igetBlockTopology()->getProcGroup()->containsMyRank()) - return ; - int myRank=mesh->getBlockTopology()->getProcGroup()->myRank(); - int nbDomains=mesh->getBlockTopology()->getProcGroup()->size(); - std::vector fileNames(nbDomains); - for(int i=0;igetCellMesh()->getName()); - writeUMesh(fileNames[myRank].c_str(),dynamic_cast(mesh->getCellMesh())); -} - -void MEDLoader::writeParaField(const char *fileName, const char *meshName, ParaMEDMEM::ParaFIELD *f) +void MEDLoader::writeField(const char *fileName, const char *meshName, ParaMEDMEM::MEDCouplingFieldDouble *f) { } diff --git a/src/ParaMEDMEM/MEDLoader/MEDLoader.hxx b/src/MEDLoader/MEDLoader.hxx similarity index 95% rename from src/ParaMEDMEM/MEDLoader/MEDLoader.hxx rename to src/MEDLoader/MEDLoader.hxx index 9e5c5db73..9cbd82418 100644 --- a/src/ParaMEDMEM/MEDLoader/MEDLoader.hxx +++ b/src/MEDLoader/MEDLoader.hxx @@ -27,8 +27,6 @@ namespace ParaMEDMEM { - class ParaMESH; - class ParaFIELD; class DataArrayInt; class MEDCouplingUMesh; class MEDCouplingFieldDouble; @@ -88,8 +86,7 @@ namespace MEDLoader ParaMEDMEM::MEDCouplingFieldDouble *ReadFieldDoubleCell(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order); ParaMEDMEM::MEDCouplingFieldDouble *ReadFieldDoubleNode(const char *fileName, const char *meshName, int meshDimRelToMax, const char *fieldName, int iteration, int order); void writeUMesh(const char *fileName, ParaMEDMEM::MEDCouplingUMesh *mesh); - void writeParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh); - void writeParaField(const char *fileName, const char *meshName, ParaMEDMEM::ParaFIELD *f); + void writeField(const char *fileName, const char *meshName, ParaMEDMEM::MEDCouplingFieldDouble *f); } #endif diff --git a/src/ParaMEDMEM/MEDLoader/Makefile.am b/src/MEDLoader/Makefile.am similarity index 62% rename from src/ParaMEDMEM/MEDLoader/Makefile.am rename to src/MEDLoader/Makefile.am index 372249430..cd8bf9dd7 100755 --- a/src/ParaMEDMEM/MEDLoader/Makefile.am +++ b/src/MEDLoader/Makefile.am @@ -18,22 +18,20 @@ # include $(top_srcdir)/adm_local/unix/make_common_starter.am -lib_LTLIBRARIES= libparamedmemmedloader.la +lib_LTLIBRARIES = libmedloader.la salomeinclude_HEADERS= \ MEDLoader.hxx -dist_libparamedmemmedloader_la_SOURCES= \ +dist_libmedloader_la_SOURCES= \ MEDLoader.cxx -#libmedmem_la_LDFLAGS= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -libparamedmemmedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \ - -I$(srcdir)/../../INTERP_KERNEL \ - -I$(srcdir)/../../INTERP_KERNEL/Geometric2D \ - -I$(srcdir)/../../INTERP_KERNEL/Bases \ - -I$(srcdir)/../../MEDCoupling \ - -I$(srcdir)/../ +libmedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \ + -I$(srcdir)/../INTERP_KERNEL \ + -I$(srcdir)/../INTERP_KERNEL/Geometric2D \ + -I$(srcdir)/../INTERP_KERNEL/Bases \ + -I$(srcdir)/../MEDCoupling # change motivated by the bug KERNEL4778. -libparamedmemmedloader_la_LDFLAGS= ../../MEDCoupling/libmedcoupling.la \ -../../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED2_LIBS) $(HDF5_LIBS) +libmedloader_la_LDFLAGS= ../MEDCoupling/libmedcoupling.la \ +../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED2_LIBS) $(HDF5_LIBS) diff --git a/src/ParaMEDLoader/Makefile.am b/src/ParaMEDLoader/Makefile.am new file mode 100755 index 000000000..98125e5aa --- /dev/null +++ b/src/ParaMEDLoader/Makefile.am @@ -0,0 +1,41 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libparamedloader.la + +salomeinclude_HEADERS= \ +ParaMEDLoader.hxx + +dist_libparamedloader_la_SOURCES= \ +ParaMEDLoader.cxx + +#libmedmem_la_LDFLAGS= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome +libparamedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \ + -I$(srcdir)/../INTERP_KERNEL \ + -I$(srcdir)/../INTERP_KERNEL/Geometric2D \ + -I$(srcdir)/../INTERP_KERNEL/Bases \ + -I$(srcdir)/../MEDCoupling \ + -I$(srcdir)/../MEDLoader \ + -I$(srcdir)/../ParaMEDMEM + +libparamedloader_la_LDFLAGS= ../ParaMEDMEM/libparamedmem.la \ + ../MEDLoader/libmedloader.la \ + ../MEDCoupling/libmedcoupling.la \ + ../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED2_LIBS) $(HDF5_LIBS) diff --git a/src/ParaMEDLoader/ParaMEDLoader.cxx b/src/ParaMEDLoader/ParaMEDLoader.cxx new file mode 100644 index 000000000..f61ff6dff --- /dev/null +++ b/src/ParaMEDLoader/ParaMEDLoader.cxx @@ -0,0 +1,59 @@ +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +#include "ParaMEDLoader.hxx" +#include "MEDLoader.hxx" +#include "ParaMESH.hxx" +#include "BlockTopology.hxx" +#include "MEDCouplingUMesh.hxx" + +#include + +using namespace ParaMEDMEM; + +void MEDLoader::writeParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh) +{ + if(!mesh->getBlockTopology()->getProcGroup()->containsMyRank()) + return ; + int myRank=mesh->getBlockTopology()->getProcGroup()->myRank(); + int nbDomains=mesh->getBlockTopology()->getProcGroup()->size(); + std::vector fileNames(nbDomains); + for(int i=0;igetCellMesh()->getName()); + writeUMesh(fileNames[myRank].c_str(),dynamic_cast(mesh->getCellMesh())); +} + +/*! + * This method builds the master file 'fileName' of a parallel MED file defined in 'fileNames'. + */ +void MEDLoader::writeMasterFile(const char *fileName, const std::vector& fileNames, const char *meshName) +{ + int nbOfDom=fileNames.size(); + std::ofstream fs(fileName); + fs << "#MED Fichier V 2.3" << " " << std::endl; + fs << "#"<<" " << std::endl; + fs << nbOfDom <<" " << std::endl; + for(int i=0;i +#include + +namespace ParaMEDMEM +{ + class ParaMESH; + class ParaFIELD; +} + +namespace MEDLoader +{ + void writeParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh); + void writeMasterFile(const char *fileName, const std::vector& fileNames, const char *meshName); +} + +#endif diff --git a/src/ParaMEDMEM/Makefile.am b/src/ParaMEDMEM/Makefile.am index 746b7170a..7b582c9fc 100644 --- a/src/ParaMEDMEM/Makefile.am +++ b/src/ParaMEDMEM/Makefile.am @@ -18,21 +18,6 @@ # include $(top_srcdir)/adm_local/unix/make_common_starter.am -### -# MEDLoader and Test sub-folders are available only if MED2 is detected ok -### - -if MED_ENABLE_MED2 - SUBDIRS = . MEDLoader - -if CPPUNIT_IS_OK - SUBDIRS += Test -endif - -endif - -DIST_SUBDIRS = MEDLoader Test - lib_LTLIBRARIES= libparamedmem.la salomeinclude_HEADERS= \ diff --git a/src/ParaMEDMEM/Test/MPIAccessDECTest.cxx b/src/ParaMEDMEMTest/MPIAccessDECTest.cxx similarity index 100% rename from src/ParaMEDMEM/Test/MPIAccessDECTest.cxx rename to src/ParaMEDMEMTest/MPIAccessDECTest.cxx diff --git a/src/ParaMEDMEM/Test/MPIAccessDECTest.hxx b/src/ParaMEDMEMTest/MPIAccessDECTest.hxx similarity index 100% rename from src/ParaMEDMEM/Test/MPIAccessDECTest.hxx rename to src/ParaMEDMEMTest/MPIAccessDECTest.hxx diff --git a/src/ParaMEDMEM/Test/MPIAccessTest.cxx b/src/ParaMEDMEMTest/MPIAccessTest.cxx similarity index 100% rename from src/ParaMEDMEM/Test/MPIAccessTest.cxx rename to src/ParaMEDMEMTest/MPIAccessTest.cxx diff --git a/src/ParaMEDMEM/Test/MPIAccessTest.hxx b/src/ParaMEDMEMTest/MPIAccessTest.hxx similarity index 100% rename from src/ParaMEDMEM/Test/MPIAccessTest.hxx rename to src/ParaMEDMEMTest/MPIAccessTest.hxx diff --git a/src/ParaMEDMEM/Test/MPIMainTest.hxx b/src/ParaMEDMEMTest/MPIMainTest.hxx similarity index 100% rename from src/ParaMEDMEM/Test/MPIMainTest.hxx rename to src/ParaMEDMEMTest/MPIMainTest.hxx diff --git a/src/ParaMEDMEM/Test/Makefile.am b/src/ParaMEDMEMTest/Makefile.am similarity index 89% rename from src/ParaMEDMEM/Test/Makefile.am rename to src/ParaMEDMEMTest/Makefile.am index 83fed05c1..b5f8a5a59 100644 --- a/src/ParaMEDMEM/Test/Makefile.am +++ b/src/ParaMEDMEMTest/Makefile.am @@ -65,16 +65,17 @@ dist_libParaMEDMEMTest_la_SOURCES = \ libParaMEDMEMTest_la_CPPFLAGS = \ @CPPUNIT_INCLUDES@ \ $(MPI_INCLUDES) \ - -I$(srcdir)/../../INTERP_KERNEL \ - -I$(srcdir)/../../INTERP_KERNEL/Bases \ - -I$(srcdir)/../../INTERP_KERNEL/Geometric2D \ - -I$(srcdir)/../../ParaMEDMEM \ - -I$(srcdir)/../../MEDCoupling \ - -I$(srcdir)/../MEDLoader + -I$(srcdir)/../INTERP_KERNEL \ + -I$(srcdir)/../INTERP_KERNEL/Bases \ + -I$(srcdir)/../INTERP_KERNEL/Geometric2D \ + -I$(srcdir)/../ParaMEDMEM \ + -I$(srcdir)/../MEDCoupling \ + -I$(srcdir)/../MEDLoader \ + -I$(srcdir)/../ParaMEDLoader libParaMEDMEMTest_la_LDFLAGS = \ - ../libparamedmem.la \ - ../MEDLoader/libparamedmemmedloader.la \ + ../ParaMEDMEM/libparamedmem.la \ + ../ParaMEDLoader/libparamedloader.la \ @CPPUNIT_LIBS@ $(MPI_LIBS) # Executables targets @@ -91,7 +92,7 @@ dist_test_perf_SOURCES = test_perf.cxx LDADD = $(MED2_LIBS) $(libMEDMEMTest_la_LDFLAGS) -lm $(MPI_LIBS) \ libParaMEDMEMTest.la \ - ../../INTERP_KERNEL/libinterpkernel.la + ../INTERP_KERNEL/libinterpkernel.la if MED_ENABLE_FVM LDADD += $(FVM_LIBS) diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest.cxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest.hxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_BlockTopology.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_BlockTopology.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_Gauthier1.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_Gauthier1.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_ICocoTrio.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_ICocoTrio.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_InterpKernelDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx similarity index 98% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_InterpKernelDEC.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx index a4487c821..b595af573 100644 --- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_InterpKernelDEC.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx @@ -30,7 +30,9 @@ #include "ParaFIELD.hxx" #include "ComponentTopology.hxx" #include "ICoCoMEDField.hxx" +#include "ParaMEDLoader.hxx" #include "MEDLoader.hxx" + #include #include @@ -216,14 +218,14 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta ostringstream filename; filename<<"./sourcesquareb_"<myRank()+1; aRemover.Register(filename.str().c_str()); - MEDLoader::writeParaField("./sourcesquareb","boundary",parafield); + MEDLoader::writeField("./sourcesquareb","boundary",parafield->getField()); dec.recvData(); cout <<"writing"<myRank()==0) aRemover.Register("./sourcesquare"); - MEDLoader::writeParaField("./sourcesquare","boundary",parafield); + MEDLoader::writeField("./sourcesquare","boundary",parafield->getField()); filename<<"./sourcesquare_"<myRank()+1; @@ -246,7 +248,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta dec.recvData(); MEDLoader::writeParaMesh("./targetsquareb",paramesh); - MEDLoader::writeParaField("./targetsquareb", "boundary",parafield); + MEDLoader::writeField("./targetsquareb", "boundary",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); ostringstream filename; @@ -254,7 +256,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta aRemover.Register(filename.str().c_str()); dec.sendData(); MEDLoader::writeParaMesh("./targetsquare",paramesh); - MEDLoader::writeParaField("./targetsquare", "boundary",parafield); + MEDLoader::writeField("./targetsquare", "boundary",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); @@ -578,14 +580,14 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta ostringstream filename; filename<<"./sourcesquareb_"<myRank()+1; aRemover.Register(filename.str().c_str()); - MEDLoader::writeParaField("./sourcesquareb","boundary",parafield); + MEDLoader::writeField("./sourcesquareb","boundary",parafield->getField()); dec.recvData(); cout <<"writing"<myRank()==0) aRemover.Register("./sourcesquare"); - MEDLoader::writeParaField("./sourcesquare","boundary",parafield); + MEDLoader::writeField("./sourcesquare","boundary",parafield->getField()); filename<<"./sourcesquare_"<myRank()+1; @@ -604,7 +606,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta dec.recvData(); MEDLoader::writeParaMesh("./targetsquareb",paramesh); - MEDLoader::writeParaField("./targetsquareb", "boundary",parafield); + MEDLoader::writeField("./targetsquareb", "boundary",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); ostringstream filename; @@ -612,7 +614,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta aRemover.Register(filename.str().c_str()); dec.sendData(); MEDLoader::writeParaMesh("./targetsquare",paramesh); - MEDLoader::writeParaField("./targetsquare", "boundary",parafield); + MEDLoader::writeField("./targetsquare", "boundary",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_MEDLoader.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_MEDLoader.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_MPIProcessorGroup.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_NonCoincidentDEC.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/ParaMEDMEMTest_StructuredCoincidentDEC.cxx rename to src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx diff --git a/src/ParaMEDMEM/Test/TestMPIAccess.cxx b/src/ParaMEDMEMTest/TestMPIAccess.cxx similarity index 100% rename from src/ParaMEDMEM/Test/TestMPIAccess.cxx rename to src/ParaMEDMEMTest/TestMPIAccess.cxx diff --git a/src/ParaMEDMEM/Test/TestMPIAccessDEC.cxx b/src/ParaMEDMEMTest/TestMPIAccessDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/TestMPIAccessDEC.cxx rename to src/ParaMEDMEMTest/TestMPIAccessDEC.cxx diff --git a/src/ParaMEDMEM/Test/TestParaMEDMEM.cxx b/src/ParaMEDMEMTest/TestParaMEDMEM.cxx similarity index 100% rename from src/ParaMEDMEM/Test/TestParaMEDMEM.cxx rename to src/ParaMEDMEMTest/TestParaMEDMEM.cxx diff --git a/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_AllToAllDEC.cxx rename to src/ParaMEDMEMTest/test_AllToAllDEC.cxx diff --git a/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx rename to src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx diff --git a/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllvDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx rename to src/ParaMEDMEMTest/test_AllToAllvDEC.cxx diff --git a/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx rename to src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx diff --git a/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx rename to src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx b/src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Time.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Time.cxx diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx rename to src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx diff --git a/src/ParaMEDMEM/Test/test_perf.cxx b/src/ParaMEDMEMTest/test_perf.cxx similarity index 100% rename from src/ParaMEDMEM/Test/test_perf.cxx rename to src/ParaMEDMEMTest/test_perf.cxx diff --git a/src/ParaMEDMEM_Swig/Makefile.am b/src/ParaMEDMEM_Swig/Makefile.am index 0e840db86..edf8bd574 100644 --- a/src/ParaMEDMEM_Swig/Makefile.am +++ b/src/ParaMEDMEM_Swig/Makefile.am @@ -30,7 +30,7 @@ salomeinclude_HEADERS = \ SWIG_DEF = libParaMEDMEM_Swig.i libParaMEDMEM_Swig.typemap SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) $(MPI_INCLUDES) -I$(srcdir)/../ParaMEDMEM -I$(srcdir)/../MEDCoupling -I$(srcdir)/../MEDCoupling_Swig \ - -I$(srcdir)/../INTERP_KERNEL -I$(srcdir)/../INTERP_KERNEL/Bases -I$(srcdir)/../ParaMEDMEM/MEDLoader + -I$(srcdir)/../INTERP_KERNEL -I$(srcdir)/../INTERP_KERNEL/Bases -I$(srcdir)/../ParaMEDLoader -I$(srcdir)/../MEDLoader dist__libParaMEDMEM_Swig_la_SOURCES = $(SWIG_DEF) nodist__libParaMEDMEM_Swig_la_SOURCES = libParaMEDMEM_Swig_wrap.cxx @@ -43,11 +43,11 @@ _libParaMEDMEM_Swig_la_CPPFLAGS = $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) $(PYTHON_I $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \ -I$(srcdir)/../INTERP_KERNEL \ $(MPI_INCLUDES) -I$(srcdir)/../ParaMEDMEM -I$(srcdir)/../MEDCoupling_Swig -I$(srcdir)/../INTERP_KERNEL/Bases \ - -I$(srcdir)/../MEDCoupling -I$(srcdir)/../ParaMEDMEM/MEDLoader + -I$(srcdir)/../MEDCoupling -I$(srcdir)/../ParaMEDLoader -I$(srcdir)/../MEDLoader _libParaMEDMEM_Swig_la_LDFLAGS = -module $(MED2_LIBS) $(HDF5_LIBS) $(PYTHON_LIBS) $(MPI_LIBS) \ ../MEDCoupling/libmedcoupling.la ../INTERP_KERNEL/libinterpkernel.la \ - ../ParaMEDMEM/libparamedmem.la ../ParaMEDMEM/MEDLoader/libparamedmemmedloader.la + ../ParaMEDMEM/libparamedmem.la ../ParaMEDLoader/libparamedloader.la if MED_ENABLE_KERNEL _libParaMEDMEM_Swig_la_CPPFLAGS += ${KERNEL_CXXFLAGS} -- 2.39.2