Salome HOME
projects
/
modules
/
hexablock.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update: 2016
[modules/hexablock.git]
/
src
/
HEXABLOCK
/
HexLaw.cxx
diff --git
a/src/HEXABLOCK/HexLaw.cxx
b/src/HEXABLOCK/HexLaw.cxx
index b16373937472195ffb5d855273c62d85e9257d0b..d822a36bb83b8e6824c949074cc9f7be39bd4db4 100644
(file)
--- a/
src/HEXABLOCK/HexLaw.cxx
+++ b/
src/HEXABLOCK/HexLaw.cxx
@@
-1,10
+1,10
@@
-// Copyright (C) 2009-201
2
CEA/DEN, EDF R&D
+// Copyright (C) 2009-201
6
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
//
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-25,7
+25,7
@@
BEGIN_NAMESPACE_HEXA
int Law::last_law_id = 0;
// ================================================== Constructeur
int Law::last_law_id = 0;
// ================================================== Constructeur
-Law::Law (
cpchar name, int nbnodes
)
+Law::Law (
Document* dad, cpchar name, int nbnodes) : EltBase (dad, EL_LAW
)
{
nbr_nodes = nbnodes;
law_id = last_law_id++;
{
nbr_nodes = nbnodes;
law_id = last_law_id++;
@@
-37,14
+37,15
@@
Law::Law (cpchar name, int nbnodes)
if (!_nom.empty())
law_name = _nom;
else {
if (!_nom.empty())
law_name = _nom;
else {
- char buffer [16];
-
sprintf (buffer, "l%04d", law_id);
-
law_name = std::string(buffer);
+ char buffer [16];
+ sprintf (buffer, "l%04d", law_id);
+ law_name = std::string(buffer);
}
law_type = Uniform;
law_coefficient = 0.0;
}
}
law_type = Uniform;
law_coefficient = 0.0;
}
+
// ================================================== Constructeur 2
Law::Law (Law* other)
{
// ================================================== Constructeur 2
Law::Law (Law* other)
{
@@
-52,6
+53,14
@@
Law::Law (Law* other)
law_name = other->law_name ;
law_type = other->law_type ;
law_coefficient = other->law_coefficient;
law_name = other->law_name ;
law_type = other->law_type ;
law_coefficient = other->law_coefficient;
+ el_root = other->el_root;
+}
+
+// ========================================================= getNextName
+char* Law::getNextName (pchar buffer)
+{
+ sprintf (buffer, "l%04d", last_law_id);
+ return buffer;
}
END_NAMESPACE_HEXA
}
END_NAMESPACE_HEXA