Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2022
[modules/smesh.git]
/
src
/
SMESH_I
/
MG_ADAPT_i.cxx
diff --git
a/src/SMESH_I/MG_ADAPT_i.cxx
b/src/SMESH_I/MG_ADAPT_i.cxx
index 02415c69e4c405759eb56d6d91467d2d0d68ee3f..fcbc77eda9dfe7ac6d6e4a26d5c79c1abe877be4 100644
(file)
--- a/
src/SMESH_I/MG_ADAPT_i.cxx
+++ b/
src/SMESH_I/MG_ADAPT_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2020-202
1
CEA/DEN, EDF R&D
+// Copyright (C) 2020-202
2
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-19,6
+19,8
@@
#include "MG_ADAPT_i.hxx"
#include "MG_ADAPT_i.hxx"
+#include CORBA_SERVER_HEADER(SMESH_Homard)
+
#include "MG_ADAPT.hxx"
#include "SMESH_File.hxx"
#include "SMESH_Gen_i.hxx"
#include "MG_ADAPT.hxx"
#include "SMESH_File.hxx"
#include "SMESH_Gen_i.hxx"
@@
-114,7
+116,8
@@
SMESH::MG_ADAPT_ptr SMESH_Gen_i::CreateAdaptationHypothesis()
return SMESH::MG_ADAPT_ptr();
#endif
}
return SMESH::MG_ADAPT_ptr();
#endif
}
-SMESH::MG_ADAPT_OBJECT_ptr SMESH_Gen_i::Adaptation( const char* adaptationType)
+//SMESH::MG_ADAPT_OBJECT_ptr SMESH_Gen_i::Adaptation( const char* adaptationType)
+SALOME::GenericObj_ptr SMESH_Gen_i::Adaptation( const char* adaptationType)
{
#ifndef DISABLE_MG_ADAPT
if (!strcmp(adaptationType, "MG_Adapt"))
{
#ifndef DISABLE_MG_ADAPT
if (!strcmp(adaptationType, "MG_Adapt"))
@@
-124,7
+127,12
@@
SMESH::MG_ADAPT_OBJECT_ptr SMESH_Gen_i::Adaptation( const char* adaptationType)
return anObj._retn();
}
#endif
return anObj._retn();
}
#endif
- return SMESH::MG_ADAPT_OBJECT_ptr();
+#ifndef DISABLE_HOMARD_ADAPT
+ if (!strcmp(adaptationType, "Uniform")) {
+ return CreateHOMARD_ADAPT();
+ }
+#endif
+ return SALOME::GenericObj_ptr();
}
//=============================================================================
/*!
}
//=============================================================================
/*!