diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp index 4b76efa8cf4559bd2260476f0f7fc5aa3f87bbd2..9118b34aaddd38c2a726dd4ebf599b4e20ca451c 100644 --- a/Common/Gmsh.cpp +++ b/Common/Gmsh.cpp @@ -1,4 +1,4 @@ -// $Id: Gmsh.cpp,v 1.3 2008-04-13 15:20:30 geuzaine Exp $ +// $Id: Gmsh.cpp,v 1.4 2008-04-13 20:52:07 geuzaine Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -53,17 +53,20 @@ int GmshNewModel() { // Create a new model and add it to the model list, and make it the // current model + return 0; } int GmshMerge(std::string fileName) { // Merge CAD or mesh data in the current model, or create // post-processing data associated with the current model + return 0; } int GmshClear() { // Destroys all models and post-processing views + return 0; } int GmshFinalize() diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp index 6494ace43dea90f484d732d037c63607773d1f5d..d5e6bdf88a6954d90c72ba3815eaef9b22215556 100644 --- a/Geo/GModelIO_MED.cpp +++ b/Geo/GModelIO_MED.cpp @@ -1,4 +1,4 @@ -// $Id: GModelIO_MED.cpp,v 1.27 2008-04-13 09:45:48 geuzaine Exp $ +// $Id: GModelIO_MED.cpp,v 1.28 2008-04-13 20:52:07 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -150,6 +150,15 @@ int GModel::readMED(const std::string &name) return 0; } + med_int major, minor, release; + MEDversionDonner(&major, &minor, &release); + Msg(INFO, "Reading MED file using MED library V%d.%d.%d", major, minor, release); + MEDversionLire(fid, &major, &minor, &release); + if(major < 2 || (major == 2 && minor < 2)){ + Msg(GERROR, "Cannot read MED file older than V2.2"); + return 0; + } + med_int numMeshes = MEDnMaa(fid); if(MEDfermer(fid) < 0){