-// Copyright (C) 2006-2013 EDF R&D
+// Copyright (C) 2006-2016 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.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include <cstdlib>
#include <cstring>
#include <ctime>
+#include <algorithm>
using namespace std;
using namespace MESHCUT;
med_geometry_type MESHCUT::InstanceMGE(TYPE_MAILLE TYPE)
{
- med_geometry_type typeBanaliseMED;
+ med_geometry_type typeBanaliseMED = MED_NONE;
switch (TYPE)
{
return typeBanaliseMED;
}
-int MESHCUT::chrono()
+int MESHCUT::salome_chrono()
{
return clock() / CLOCKS_PER_SEC;
}
if (debug)
{
cout << endl << " Liste des valeurs du champ brut aux 3 premiers éléments:" << endl;
- for (imaille = 0; imaille < min(nmailles, 3); imaille++)
+ for (imaille = 0; imaille < std::min(nmailles, 3); imaille++)
{
cout << " Maille " << imaille << endl;
for (igauss = 0; igauss < ngauss; igauss++)