From ce9ac62f182b1ea25de2f8eb3051e09768f52459 Mon Sep 17 00:00:00 2001 From: htalbot Date: Fri, 17 Dec 2021 14:56:49 +0100 Subject: [PATCH 1/7] specify version for plugin on branch v21.12 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 044bf90..351e64a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.12) -project(SofaMJEDFEM VERSION 1.0 LANGUAGES CXX) +project(SofaMJEDFEM VERSION 21.12 LANGUAGES CXX) find_package(SofaFramework REQUIRED) find_package(Sofa.GL REQUIRED) From b693ae51450f44d944de5ea37de1f91e859fa45c Mon Sep 17 00:00:00 2001 From: TALBOT Hugo Date: Fri, 17 Dec 2021 13:58:30 +0000 Subject: [PATCH 2/7] Add LICENSE --- LICENSE.md | 504 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 504 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..c5ef3a9 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + SofaMJED + Copyright (C) 2021 TALBOT Hugo + + 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, 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 + 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! From 60e30eb4db8eff82283b12f57d6ce956aa99a415 Mon Sep 17 00:00:00 2001 From: htalbot Date: Fri, 17 Dec 2021 15:31:44 +0100 Subject: [PATCH 3/7] Fix compilation out of tree --- CMakeLists.txt | 2 ++ SofaMJEDFEMConfig.cmake.in | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 351e64a..7cdef66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.12) project(SofaMJEDFEM VERSION 21.12 LANGUAGES CXX) find_package(SofaFramework REQUIRED) +find_package(SofaBaseTopology REQUIRED) +find_package(SofaBaseMechanics REQUIRED) find_package(Sofa.GL REQUIRED) set(SOFAMJEDFEM_SRC_DIR src/SofaMJEDFEM) diff --git a/SofaMJEDFEMConfig.cmake.in b/SofaMJEDFEMConfig.cmake.in index 4947380..92408e1 100644 --- a/SofaMJEDFEMConfig.cmake.in +++ b/SofaMJEDFEMConfig.cmake.in @@ -4,6 +4,9 @@ @PACKAGE_INIT@ find_package(SofaFramework REQUIRED) +find_package(SofaBaseTopology REQUIRED) +find_package(SofaBaseMechanics REQUIRED) +find_package(Sofa.GL REQUIRED) if(NOT TARGET @PROJECT_NAME@) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") From 7f5f430283d870d7f0b8b72d9e8917ced306e031 Mon Sep 17 00:00:00 2001 From: htalbot Date: Fri, 17 Dec 2021 16:10:33 +0100 Subject: [PATCH 4/7] Fix link on windows decl --- src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp | 14 +------------- src/SofaMJEDFEM/MJEDTetrahedralForceField.h | 12 ++---------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp b/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp index 57d3264..c1ef200 100644 --- a/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp +++ b/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp @@ -30,9 +30,6 @@ #include #include -#include -#include - namespace sofa::component::forcefield { @@ -42,19 +39,10 @@ SOFA_DECL_CLASS(MJEDTetrahedralForceField) // Register in the Factory int MJEDTetrahedralForceFieldClass = core::RegisterObject("Generic Tetrahedral finite elements") -#ifndef SOFA_FLOAT .add< MJEDTetrahedralForceField >() -#endif -#ifndef SOFA_DOUBLE -.add< MJEDTetrahedralForceField >() -#endif ; -#ifndef SOFA_FLOAT template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; -#endif -#ifndef SOFA_DOUBLE -template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; -#endif + } // namespace sofa::component::forcefield diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.h b/src/SofaMJEDFEM/MJEDTetrahedralForceField.h index 04775a9..9a4d387 100644 --- a/src/SofaMJEDFEM/MJEDTetrahedralForceField.h +++ b/src/SofaMJEDFEM/MJEDTetrahedralForceField.h @@ -268,17 +268,9 @@ protected : }; using sofa::defaulttype::Vec3dTypes; -using sofa::defaulttype::Vec3fTypes; -#if defined(SOFA_EXTERN_TEMPLATE) && !defined(SOFA_COMPONENT_FORCEFIELD_MJEDTETRAHEDRALFORCEFIELD_CPP) - -#ifndef SOFA_FLOAT +#if !defined(SOFA_COMPONENT_FORCEFIELD_MJEDTETRAHEDRALFORCEFIELD_CPP) extern template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; -#endif -#ifndef SOFA_DOUBLE -extern template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; -#endif - -#endif // defined(SOFA_EXTERN_TEMPLATE) && !defined(SOFA_COMPONENT_FORCEFIELD_MJEDTETRAHEDRALFORCEFIELD_CPP) +#endif //!defined(SOFA_COMPONENT_FORCEFIELD_MJEDTETRAHEDRALFORCEFIELD_CPP) } // namespace sofa::component::forcefield From 91dd17804f63899428f659e748428df38443d5d2 Mon Sep 17 00:00:00 2001 From: Hugo Talbot Date: Sat, 18 Dec 2021 10:22:46 +0100 Subject: [PATCH 5/7] Remove SOFA_DECL_CLASS --- src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp b/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp index c1ef200..b102ba7 100644 --- a/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp +++ b/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp @@ -35,8 +35,6 @@ namespace sofa::component::forcefield using namespace sofa::defaulttype; -SOFA_DECL_CLASS(MJEDTetrahedralForceField) - // Register in the Factory int MJEDTetrahedralForceFieldClass = core::RegisterObject("Generic Tetrahedral finite elements") .add< MJEDTetrahedralForceField >() From 5493a82a7b932fbd2f469103e623c36963b40804 Mon Sep 17 00:00:00 2001 From: Hugo Talbot Date: Sat, 18 Dec 2021 15:29:07 +0100 Subject: [PATCH 6/7] Clean to hopefully fix Win compilation --- src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp | 14 ++++++-------- src/SofaMJEDFEM/MJEDTetrahedralForceField.h | 7 +++---- src/SofaMJEDFEM/config.h.in | 3 ++- src/SofaMJEDFEM/initSofaMJEDFEM.cpp | 4 ++++ 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp b/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp index b102ba7..849486d 100644 --- a/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp +++ b/src/SofaMJEDFEM/MJEDTetrahedralForceField.cpp @@ -22,13 +22,11 @@ #define SOFA_COMPONENT_FORCEFIELD_MJEDTETRAHEDRALFORCEFIELD_CPP #include - #include -#include + #include +#include -#include -#include namespace sofa::component::forcefield { @@ -36,11 +34,11 @@ namespace sofa::component::forcefield using namespace sofa::defaulttype; // Register in the Factory -int MJEDTetrahedralForceFieldClass = core::RegisterObject("Generic Tetrahedral finite elements") -.add< MJEDTetrahedralForceField >() -; +int MJEDTetrahedralForceFieldClass = core::RegisterObject("Tetrahedral FEM model of visco-hyperelastic material using MJED") + .add< MJEDTetrahedralForceField >() + ; -template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; +template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; } // namespace sofa::component::forcefield diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.h b/src/SofaMJEDFEM/MJEDTetrahedralForceField.h index 9a4d387..e4d293d 100644 --- a/src/SofaMJEDFEM/MJEDTetrahedralForceField.h +++ b/src/SofaMJEDFEM/MJEDTetrahedralForceField.h @@ -47,8 +47,7 @@ using namespace sofa::component::topology; //******************* It is dependant on the description of material following the model of sofa::component::fem::HyperelasticMaterial.h ************************ //***************************** more explication on MJED explication.pdf**************************** -/** Compute Finite Element forces based on tetrahedral elements. -*/ +/** Compute Finite Element forces based on tetrahedral elements.*/ template class MJEDTetrahedralForceField : public core::behavior::ForceField { @@ -267,10 +266,10 @@ protected : }; -using sofa::defaulttype::Vec3dTypes; +using sofa::defaulttype::Vec3Types; #if !defined(SOFA_COMPONENT_FORCEFIELD_MJEDTETRAHEDRALFORCEFIELD_CPP) -extern template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; +extern template class SOFA_MJED_FEM_API MJEDTetrahedralForceField; #endif //!defined(SOFA_COMPONENT_FORCEFIELD_MJEDTETRAHEDRALFORCEFIELD_CPP) } // namespace sofa::component::forcefield diff --git a/src/SofaMJEDFEM/config.h.in b/src/SofaMJEDFEM/config.h.in index a91e4ab..85853b2 100644 --- a/src/SofaMJEDFEM/config.h.in +++ b/src/SofaMJEDFEM/config.h.in @@ -22,10 +22,11 @@ #pragma once #include +#include #define SOFAMJEDFEM_VERSION @PROJECT_VERSION@ -#ifdef SOFA_BUILD_MJED_FEM +#ifdef SOFA_BUILD_SOFAMJEDFEM # define SOFA_TARGET @PROJECT_NAME@ # define SOFA_MJED_FEM_API SOFA_EXPORT_DYNAMIC_LIBRARY #else diff --git a/src/SofaMJEDFEM/initSofaMJEDFEM.cpp b/src/SofaMJEDFEM/initSofaMJEDFEM.cpp index aefa50f..f9cef1d 100644 --- a/src/SofaMJEDFEM/initSofaMJEDFEM.cpp +++ b/src/SofaMJEDFEM/initSofaMJEDFEM.cpp @@ -23,6 +23,8 @@ #include using sofa::core::ObjectFactory; +namespace sofa::component +{ extern "C" { SOFA_MJED_FEM_API void initExternalModule(); @@ -68,3 +70,5 @@ const char* getModuleComponentList() static std::string classes = ObjectFactory::getInstance()->listClassesFromTarget(sofa_tostring(SOFA_TARGET)); return classes.c_str(); } + +} // namespace sofa::component From fe50ccd788849633d2a0a3d51b4107480ffabc03 Mon Sep 17 00:00:00 2001 From: Hugo Talbot Date: Wed, 27 Apr 2022 21:56:05 +0200 Subject: [PATCH 7/7] Fix compilation due to removal of topologyHandler --- src/SofaMJEDFEM/MJEDTetrahedralForceField.h | 26 +-- src/SofaMJEDFEM/MJEDTetrahedralForceField.inl | 154 ++++++++---------- 2 files changed, 79 insertions(+), 101 deletions(-) diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.h b/src/SofaMJEDFEM/MJEDTetrahedralForceField.h index e4d293d..a5de9ee 100644 --- a/src/SofaMJEDFEM/MJEDTetrahedralForceField.h +++ b/src/SofaMJEDFEM/MJEDTetrahedralForceField.h @@ -230,27 +230,20 @@ protected : void draw(const core::visual::VisualParams* vparams) override; + + /** Method to initialize @sa TetrahedronRestInformation when a new Tetrahedron is created. + * Will be set as creation callback in the TetrahedronData @sa tetrahedronInfo + */ + void createTetrahedronRestInformation(Index, TetrahedronRestInformation& t, + const core::topology::BaseMeshTopology::Tetrahedron&, + const sofa::type::vector&, + const sofa::type::vector&); + type::Mat<3,3,double> getPhi( int tetrahedronIndex); type::Mat<3,3,double> getForce( int tetrahedronIndex); TetrahedronData > tetrahedronInfo; EdgeData > edgeInfo; - class TetrahedronHandler : public TopologyDataHandler > - { - public: - typedef typename MJEDTetrahedralForceField::TetrahedronRestInformation TetrahedronRestInformation; - TetrahedronHandler(MJEDTetrahedralForceField* ff,TetrahedronData >* data ) - :TopologyDataHandler >(data) - ,ff(ff) - { - } - - void applyCreateFunction(unsigned int, TetrahedronRestInformation &t, const core::topology::BaseMeshTopology::Tetrahedron - &, const sofa::type::vector &, const sofa::type::vector &); - - protected: - MJEDTetrahedralForceField* ff; - }; protected: /// the array that describes the complete material energy and its derivatives @@ -261,7 +254,6 @@ protected : void testDerivatives();// a test to check the accuracy of Addforce and AddDforce, it needs the calculus of the total strain energy void saveMesh( const char *filename ); - TetrahedronHandler* tetrahedronHandler; VecCoord myposition; }; diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.inl b/src/SofaMJEDFEM/MJEDTetrahedralForceField.inl index 7c17225..c571af2 100644 --- a/src/SofaMJEDFEM/MJEDTetrahedralForceField.inl +++ b/src/SofaMJEDFEM/MJEDTetrahedralForceField.inl @@ -52,15 +52,14 @@ using namespace sofa::component::topology; using namespace core::topology; template< class DataTypes> -void MJEDTetrahedralForceField::TetrahedronHandler::applyCreateFunction(unsigned int tetrahedronIndex, - TetrahedronRestInformation &tinfo, - const Tetrahedron &, - const sofa::type::vector &, - const sofa::type::vector &) +void MJEDTetrahedralForceField::createTetrahedronRestInformation(unsigned int tetrahedronIndex, + TetrahedronRestInformation &tinfo, + const Tetrahedron &, + const sofa::type::vector &, + const sofa::type::vector &) { - if (ff) { - const vector< Tetrahedron > &tetrahedronArray=ff->_topology->getTetrahedra() ; - const std::vector< Edge> &edgeArray=ff->_topology->getEdges() ; + const vector< Tetrahedron > &tetrahedronArray=_topology->getTetrahedra() ; + const std::vector< Edge> &edgeArray=_topology->getEdges() ; unsigned int j,m,n; int k,l; typename DataTypes::Real volume; @@ -68,11 +67,11 @@ void MJEDTetrahedralForceField::TetrahedronHandler::applyCreateFuncti - const typename DataTypes::VecCoord& restPosition=ff->mstate->read(sofa::core::ConstVecCoordId::restPosition())->getValue(); + const typename DataTypes::VecCoord& restPosition=this->mstate->read(sofa::core::ConstVecCoordId::restPosition())->getValue(); ///describe the indices of the 4 tetrahedron vertices const Tetrahedron &t= tetrahedronArray[tetrahedronIndex]; - BaseMeshTopology::EdgesInTetrahedron te=ff->_topology->getEdgesInTetrahedron(tetrahedronIndex); + BaseMeshTopology::EdgesInTetrahedron te=_topology->getEdgesInTetrahedron(tetrahedronIndex); // store the point position @@ -93,7 +92,7 @@ void MJEDTetrahedralForceField::TetrahedronHandler::applyCreateFuncti // precompute Di cross Dj needed for the second derivative of the SPK tensor for(j=0;j<6;++j) { - Edge e=ff->_topology->getLocalEdgesInTetrahedron(j); + Edge e=_topology->getLocalEdgesInTetrahedron(j); k=e[0]; l=e[1]; if (edgeArray[te[j]][0]!=t[k]) { @@ -113,23 +112,23 @@ void MJEDTetrahedralForceField::TetrahedronHandler::applyCreateFuncti // we also strore functions that need a call to the material and won't change //typename vector materialTermArray; - ff->materialTermArray = ff->myMaterial->getMaterialTermArray(); + materialTermArray = myMaterial->getMaterialTermArray(); typename vector::iterator it; - it=ff->materialTermArray.begin(); + it=materialTermArray.begin(); int id=0; std::vector number; Real coefficient=0; tinfo.coeff.resize(0); MatrixSym SPK; - for(;itmaterialTermArray.end();++it) { - number.push_back((*it)->MultiplyByCoeff(&tinfo,ff->globalParameters)); + for(;itMultiplyByCoeff(&tinfo,globalParameters)); std::vector Lijfirst; std::vector Lijsecond; if((*it)->hasAConstantElasticityTensor()){ vector vectorMatrixFirstPair; vector vectorMatrixSecondPair; - (*it)->InvariantMatricesElasticityTensor(&tinfo,ff->globalParameters,vectorMatrixFirstPair,vectorMatrixSecondPair); + (*it)->InvariantMatricesElasticityTensor(&tinfo,globalParameters,vectorMatrixFirstPair,vectorMatrixSecondPair); unsigned int sizeFirst=vectorMatrixFirstPair.size(); unsigned int sizeSecond=vectorMatrixSecondPair.size(); @@ -137,7 +136,7 @@ void MJEDTetrahedralForceField::TetrahedronHandler::applyCreateFuncti for(m=0;m_topology->getLocalEdgesInTetrahedron(j); + Edge e=_topology->getLocalEdgesInTetrahedron(j); k=e[0]; l=e[1]; if (edgeArray[te[j]][0]!=t[k]) { @@ -156,7 +155,7 @@ void MJEDTetrahedralForceField::TetrahedronHandler::applyCreateFuncti MatrixList Lijs; for(j=0;j<6;++j) { - Edge e=ff->_topology->getLocalEdgesInTetrahedron(j); + Edge e=_topology->getLocalEdgesInTetrahedron(j); k=e[0]; l=e[1]; if (edgeArray[te[j]][0]!=t[k]) { @@ -194,40 +193,35 @@ void MJEDTetrahedralForceField::TetrahedronHandler::applyCreateFuncti }// end of for it coefficient=number[0]; - for(unsigned int m=1; mcounter.size();++m){ - if(ff->counter[m]!=ff->counter[m-1]){ + for(unsigned int m=1; m MJEDTetrahedralForceField::MJEDTetrahedralForceField() - : _topology(0) - , _initialPoints(0) - , updateMatrix(true) - , _meshSaved( false) + : _topology(0) + , _initialPoints(0) + , updateMatrix(true) + , _meshSaved( false) , viscous(false) , considerInversion(false) , f_inversion(initData(&f_inversion,false,"considerInversion","if inverted tetrahedra should be considered")) - , viscoelasticity(initData(&viscoelasticity,false,"viscous","If the material is also viscous")) - , f_stiffnessMatrixRegularizationWeight(initData(&f_stiffnessMatrixRegularizationWeight,false,"matrixRegularization","Regularization of the Stiffness Matrix (true or false)")) - , f_materialName(initData(&f_materialName,std::string("ArrudaBoyce"),"materialName","the name of the material to be used")) - , f_parameterSet(initData(&f_parameterSet,"ParameterSet","The global parameters specifying the material")) - , f_parameterAlpha(initData(&f_parameterAlpha,"ParameterAlpha","The parameters alpha to describe viscous part")) - , f_parameterTau(initData(&f_parameterTau,"ParameterTau","The parameters tau to describe viscous part")) - , f_anisotropySet(initData(&f_anisotropySet,"AnisotropyDirections","The global directions of anisotropy of the material")) - , f_parameterFileName(initData(&f_parameterFileName,std::string("myFile.param"),"ParameterFile","the name of the file describing the material parameters for all tetrahedra")) + , viscoelasticity(initData(&viscoelasticity,false,"viscous","If the material is also viscous")) + , f_stiffnessMatrixRegularizationWeight(initData(&f_stiffnessMatrixRegularizationWeight,false,"matrixRegularization","Regularization of the Stiffness Matrix (true or false)")) + , f_materialName(initData(&f_materialName,std::string("ArrudaBoyce"),"materialName","the name of the material to be used")) + , f_parameterSet(initData(&f_parameterSet,"ParameterSet","The global parameters specifying the material")) + , f_parameterAlpha(initData(&f_parameterAlpha,"ParameterAlpha","The parameters alpha to describe viscous part")) + , f_parameterTau(initData(&f_parameterTau,"ParameterTau","The parameters tau to describe viscous part")) + , f_anisotropySet(initData(&f_anisotropySet,"AnisotropyDirections","The global directions of anisotropy of the material")) + , f_parameterFileName(initData(&f_parameterFileName,std::string("myFile.param"),"ParameterFile","the name of the file describing the material parameters for all tetrahedra")) , tetrahedronInfo(initData(&tetrahedronInfo, "tetrahedronInfo", "Internal tetrahedron data")) , edgeInfo(initData(&edgeInfo, "edgeInfo", "Internal edge data")) - , myMaterial(0) - , tetrahedronHandler(NULL) + , myMaterial(0) { - tetrahedronHandler = new TetrahedronHandler(this,&tetrahedronInfo); } template MJEDTetrahedralForceField::~MJEDTetrahedralForceField() @@ -243,7 +237,6 @@ template MJEDTetrahedralForceField::~MJEDTetrahedra if (*it) delete *it; } } - if(tetrahedronHandler) delete tetrahedronHandler; } @@ -348,17 +341,15 @@ template void MJEDTetrahedralForceField::init() return; } - type::vector::TetrahedronRestInformation>& tetrahedronInf = *(tetrahedronInfo.beginEdit()); + helper::WriteOnlyAccessor< Data > > tetrahedronInf = tetrahedronInfo; /// prepare to store info in the triangle array tetrahedronInf.resize(_topology->getNbTetrahedra()); - type::vector::EdgeInformation>& edgeInf = *(edgeInfo.beginEdit()); - + helper::WriteOnlyAccessor< Data > > edgeInf = edgeInfo; edgeInf.resize(_topology->getNbEdges()); edgeInfo.createTopologyHandler(_topology); - edgeInfo.endEdit(); // get restPosition if (_initialPoints.size() == 0) @@ -410,9 +401,9 @@ template void MJEDTetrahedralForceField::init() /// initialize the data structure associated with each tetrahedron for (Index i=0;i<_topology->getNbTetrahedra();++i) { - tetrahedronHandler->applyCreateFunction(i,tetrahedronInf[i], - _topology->getTetrahedron(i), (const vector< unsigned int > )0, - (const vector< double >)0); + createTetrahedronRestInformation(i,tetrahedronInf[i], + _topology->getTetrahedron(i), (const vector< unsigned int > )0, + (const vector< double >)0); if(viscous){ int size=coeffA.size(); tetrahedronInf[i].GammaOld.resize(size); @@ -421,17 +412,21 @@ template void MJEDTetrahedralForceField::init() } /// set the call back function upon creation of a tetrahedron tetrahedronInfo.createTopologyHandler(_topology); - - tetrahedronInfo.endEdit(); - // testDerivatives(); //to decomment if the test should be done + tetrahedronInfo.setCreationCallback([this](Index tetrahedronIndex, TetrahedronRestInformation& tetraInfo, + const core::topology::BaseMeshTopology::Tetrahedron& tetra, + const sofa::type::vector< Index >& ancestors, + const sofa::type::vector< double >& coefs) + { + createTetrahedronRestInformation(tetrahedronIndex, tetraInfo, tetra, ancestors, coefs); + }); } template void MJEDTetrahedralForceField::addForce(const core::MechanicalParams* /* mparams */ /* PARAMS FIRST */, DataVecDeriv& d_f, const DataVecCoord& d_x, const DataVecDeriv& /* d_v */) { - VecDeriv& f = *d_f.beginEdit(); - const VecCoord& x = d_x.getValue(); + helper::WriteAccessor< Data< VecDeriv > > f = d_f; + helper::ReadAccessor< Data< VecCoord > > x = d_x; unsigned int nbInverted=0; Real volume; @@ -445,7 +440,7 @@ void MJEDTetrahedralForceField::addForce(const core::MechanicalParams unsigned int i=0,j=0,k=0,l=0; unsigned int nbTetrahedra=_topology->getNbTetrahedra(); - type::vector& tetrahedronInf = *(tetrahedronInfo.beginEdit()); + helper::WriteOnlyAccessor< Data > > tetrahedronInf = tetrahedronInfo; TetrahedronRestInformation *tetInfo; @@ -723,9 +718,6 @@ void MJEDTetrahedralForceField::addForce(const core::MechanicalParams /// indicates that the next call to addDForce will need to update the stiffness matrix updateMatrix=true; - tetrahedronInfo.endEdit(); - d_f.endEdit(); - } @@ -739,8 +731,8 @@ void MJEDTetrahedralForceField::updateMatrixData() const vector< Edge> &edgeArray=_topology->getEdges() ; - type::vector& edgeInf = *(edgeInfo.beginEdit()); - type::vector& tetrahedronInf = *(tetrahedronInfo.beginEdit()); + helper::WriteOnlyAccessor< Data > > edgeInf = edgeInfo; + helper::WriteOnlyAccessor< Data > > tetrahedronInf = tetrahedronInfo; // VecDeriv& x = myposition; // to uncomment for test derivatives and comment next line const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); @@ -1019,24 +1011,22 @@ void MJEDTetrahedralForceField::updateMatrixData() }//end of for i updateMatrix=false; - edgeInfo.endEdit(); - tetrahedronInfo.endEdit(); }// end of if } template void MJEDTetrahedralForceField::addDForce(const core::MechanicalParams* mparams /* PARAMS FIRST */, DataVecDeriv& d_df, const DataVecDeriv& d_dx) { - VecDeriv& df = *d_df.beginEdit(); - const VecDeriv& dx = d_dx.getValue(); - Real kFactor = (Real)mparams->kFactorIncludingRayleighDamping(this->rayleighStiffness.getValue()); + helper::WriteAccessor< Data< VecDeriv > > df = d_df; + helper::ReadAccessor< Data< VecDeriv > > dx = d_dx; + Real kFactor = (Real)mparams->kFactorIncludingRayleighDamping(this->rayleighStiffness.getValue()); unsigned int l=0; unsigned int nbEdges=_topology->getNbEdges(); const vector< Edge> &edgeArray=_topology->getEdges(); - type::vector& edgeInf = *(edgeInfo.beginEdit()); - EdgeInformation *einfo; + helper::WriteAccessor< Data > > edgeInf = edgeInfo; + EdgeInformation *einfo; this->updateMatrixData(); @@ -1060,9 +1050,6 @@ void MJEDTetrahedralForceField::addDForce(const core::MechanicalParam df[v0] += dv1 * kFactor; df[v1] -= dv0 * kFactor; } - - edgeInfo.endEdit(); - d_df.endEdit(); } template @@ -1071,8 +1058,8 @@ void MJEDTetrahedralForceField::addKToMatrix(sofa::linearalgebra::Bas unsigned int nbEdges=_topology->getNbEdges(); const vector< Edge> &edgeArray=_topology->getEdges(); - type::vector& edgeInf = *(edgeInfo.beginEdit()); - EdgeInformation *einfo; + helper::WriteAccessor< Data > > edgeInf = edgeInfo; + EdgeInformation *einfo; this->updateMatrixData(); @@ -1096,7 +1083,6 @@ void MJEDTetrahedralForceField::addKToMatrix(sofa::linearalgebra::Bas } } - edgeInfo.endEdit(); } template @@ -1117,8 +1103,8 @@ void MJEDTetrahedralForceField::draw(const core::visual::VisualParams template type::Mat<3,3,double> MJEDTetrahedralForceField::getPhi(int TetrahedronIndex) { - type::vector& tetrahedronInf = *(tetrahedronInfo.beginEdit()); - TetrahedronRestInformation *tetInfo; + helper::WriteOnlyAccessor< Data > > tetrahedronInf = tetrahedronInfo; + TetrahedronRestInformation *tetInfo; tetInfo=&tetrahedronInf[TetrahedronIndex]; return tetInfo->deformationGradient; @@ -1126,8 +1112,8 @@ type::Mat<3,3,double> MJEDTetrahedralForceField::getPhi(int Tetrahedr template type::Mat<3,3,double> MJEDTetrahedralForceField::getForce(int TetrahedronIndex) { - type::vector& tetrahedronInf = *(tetrahedronInfo.beginEdit()); - TetrahedronRestInformation *tetInfo; + helper::WriteOnlyAccessor< Data > > tetrahedronInf = tetrahedronInfo; + TetrahedronRestInformation *tetInfo; tetInfo=&tetrahedronInf[TetrahedronIndex]; type::Mat<3,3,double> force,inverseDeformationGradient; force.clear(); @@ -1147,9 +1133,9 @@ type::Mat<3,3,double> MJEDTetrahedralForceField::getForce(int Tetrahe template void MJEDTetrahedralForceField::testDerivatives() { - DataVecCoord d_pos; - VecCoord &pos = *d_pos.beginEdit(); - pos = this->mstate->read(sofa::core::ConstVecCoordId::position())->getValue(); + DataVecCoord d_pos; + VecCoord &pos = *d_pos.beginEdit(); + pos = this->mstate->read(sofa::core::ConstVecCoordId::position())->getValue(); // perturbate original state: srand( 0 ); @@ -1159,19 +1145,19 @@ void MJEDTetrahedralForceField::testDerivatives() DataVecDeriv d_force1; - VecDeriv &force1 = *d_force1.beginEdit(); + helper::WriteAccessor< Data > force1 = d_force1; force1.resize( pos.size() ); DataVecDeriv d_deltaPos; - VecDeriv &deltaPos = *d_deltaPos.beginEdit(); + helper::WriteAccessor< Data > deltaPos = d_deltaPos; deltaPos.resize( pos.size() ); DataVecDeriv d_deltaForceCalculated; - VecDeriv &deltaForceCalculated = *d_deltaForceCalculated.beginEdit(); + helper::WriteAccessor< Data > deltaForceCalculated = d_deltaForceCalculated; deltaForceCalculated.resize( pos.size() ); DataVecDeriv d_force2; - VecDeriv &force2 = *d_force2.beginEdit(); + helper::WriteAccessor< Data > force2 = d_force2; force2.resize( pos.size() ); Coord epsilon, zero; @@ -1181,7 +1167,7 @@ void MJEDTetrahedralForceField::testDerivatives() Real avgError=0.0; int count=0; - type::vector &tetrahedronInf = *(tetrahedronInfo.beginEdit()); + helper::WriteOnlyAccessor< Data > > tetrahedronInf = tetrahedronInfo; for (unsigned int moveIdx=0; moveIdx::testDerivatives() } } - tetrahedronInfo.endEdit(); printf( "testDerivatives passed!\n" ); avgError /= (Real)count; - printf( "Average error = %.2f%%\n", avgError ); + printf( "Average error = %.2f%%\n", avgError ); + d_pos.endEdit(); } template