Re: [Getfem-commits] Happy New Year 2020
Dear Tetsuo, Thank for that ! And Happy new year 2020 too ! Best regards, Yves - Mail original - De: "Tetsuo Koyama" À: "getfem-commits" Envoyé: Mercredi 1 Janvier 2020 10:42:54 Objet: [Getfem-commits] Happy New Year 2020 Dear getfem project Happy new year 2020 ! I updated the year of license. Could you merge devel-tetsuo-happy-new-year-2020? Have a nice year. Best regards Tetsuo
[Getfem-commits] [getfem-commits] branch devel-tetsuo-happy-new-year-2020 deleted (was 44ca1ca)
renard pushed a change to branch devel-tetsuo-happy-new-year-2020. was 44ca1ca :tada: HAPPY NEW YEAR 2020 :tada: The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[Getfem-commits] (no subject)
branch: master commit f360290f41a13f2b8c26e5f5ff11f342b15f2652 Merge: cac4df6 44ca1ca Author: Yves Renard Date: Wed Jan 1 16:47:19 2020 +0100 Merge remote-tracking branch 'origin/devel-tetsuo-happy-new-year-2020' ChangeLog | 2 +- GNU_GPL_V3 | 2 +- INSTALL | 4 ++-- Makefile.am | 2 +- NEWS| 2 +- README | 2 +- autogen.sh | 2 +- bin/Makefile.am | 2 +- bin/ansys2getfem_mesh | 2 +- bin/createmp| 2 +- bin/dr2dgnuplot | 2 +- bin/extract_doc | 4 ++-- bin/fig2eps | 2 +- bin/file_dependencies | 2 +- bin/makeheadfile| 2 +- bin/mesh_matlab_to_getfem | 2 +- bin/rst_to_xml.py | 2 +- bin/sc2dgnuplot | 2 +- bin/split_cmdref| 2 +- bin/test_dist | 2 +- bin/upload_documentation| 2 +- bin/upload_html | 2 +- bin/upload_misc | 2 +- bin/upload_version | 2 +- bin/word_count | 2 +- configure.ac| 2 +- contrib/Makefile.am | 2 +- contrib/aposteriori/Makefile.am | 2 +- contrib/aposteriori/aposteriori.cc | 2 +- contrib/aposteriori/aposteriori.m | 2 +- contrib/aposteriori/aposteriori.param | 2 +- contrib/aposteriori/aposteriori.pl | 2 +- contrib/aposteriori/aposteriori_laplacian.cc| 2 +- contrib/aposteriori/aposteriori_laplacian.param | 2 +- contrib/aposteriori/aposteriori_laplacian.pl| 2 +- contrib/aposteriori/bimaterial_crack_test.param | 2 +- contrib/bimaterial_crack_test/Makefile.am | 2 +- contrib/bimaterial_crack_test/bimaterial_crack_test.cc | 2 +- contrib/bimaterial_crack_test/bimaterial_crack_test.param | 2 +- contrib/bimaterial_crack_test/bimaterial_crack_test.pl | 2 +- contrib/bimaterial_crack_test/crack.cc | 2 +- contrib/bimaterial_crack_test/crack.param | 2 +- contrib/bimaterial_crack_test/crack.pl | 2 +- contrib/bimaterial_crack_test/crack_exact_solution.cc | 2 +- contrib/bimaterial_crack_test/crack_exact_solution.h| 2 +- contrib/bimaterial_crack_test/getfem_Xfem.cc| 2 +- contrib/bimaterial_crack_test/getfem_Xfem.h | 2 +- contrib/bimaterial_crack_test/getfem_spider_fem.h | 2 +- contrib/crack_plate/Makefile.am | 2 +- contrib/crack_plate/crack_bilaplacian.cc| 2 +- contrib/crack_plate/crack_bilaplacian.h | 2 +- contrib/crack_plate/crack_bilaplacian.param | 2 +- contrib/crack_plate/crack_bilaplacian_mixed.param | 2 +- contrib/crack_plate/crack_bilaplacian_moment.cc | 2 +- contrib/crack_plate/crack_bilaplacian_problem.cc| 2 +- contrib/crack_plate/crack_bilaplacian_sif.cc| 2 +- contrib/crack_plate/crack_bilaplacian_singularities.cc | 2 +- contrib/crack_plate/crack_bilaplacian_tools.cc | 2 +- contrib/crack_plate/crack_mindlin.cc| 2 +- contrib/crack_plate/crack_mindlin.param | 2 +- contrib/crack_plate/crack_mindlin.pl| 2 +- contrib/crack_plate/crack_panel.cc | 2 +- contrib/crack_plate/crack_panel.param
[Getfem-commits] [getfem-commits] master updated (cac4df6 -> f360290)
renard pushed a change to branch master. from cac4df6 Code readability and typo fixes adds 44ca1ca :tada: HAPPY NEW YEAR 2020 :tada: new f360290 Merge remote-tracking branch 'origin/devel-tetsuo-happy-new-year-2020' Summary of changes: ChangeLog | 2 +- GNU_GPL_V3 | 2 +- INSTALL | 4 ++-- Makefile.am | 2 +- NEWS| 2 +- README | 2 +- autogen.sh | 2 +- bin/Makefile.am | 2 +- bin/ansys2getfem_mesh | 2 +- bin/createmp| 2 +- bin/dr2dgnuplot | 2 +- bin/extract_doc | 4 ++-- bin/fig2eps | 2 +- bin/file_dependencies | 2 +- bin/makeheadfile| 2 +- bin/mesh_matlab_to_getfem | 2 +- bin/rst_to_xml.py | 2 +- bin/sc2dgnuplot | 2 +- bin/split_cmdref| 2 +- bin/test_dist | 2 +- bin/upload_documentation| 2 +- bin/upload_html | 2 +- bin/upload_misc | 2 +- bin/upload_version | 2 +- bin/word_count | 2 +- configure.ac| 2 +- contrib/Makefile.am | 2 +- contrib/aposteriori/Makefile.am | 2 +- contrib/aposteriori/aposteriori.cc | 2 +- contrib/aposteriori/aposteriori.m | 2 +- contrib/aposteriori/aposteriori.param | 2 +- contrib/aposteriori/aposteriori.pl | 2 +- contrib/aposteriori/aposteriori_laplacian.cc| 2 +- contrib/aposteriori/aposteriori_laplacian.param | 2 +- contrib/aposteriori/aposteriori_laplacian.pl| 2 +- contrib/aposteriori/bimaterial_crack_test.param | 2 +- contrib/bimaterial_crack_test/Makefile.am | 2 +- contrib/bimaterial_crack_test/bimaterial_crack_test.cc | 2 +- contrib/bimaterial_crack_test/bimaterial_crack_test.param | 2 +- contrib/bimaterial_crack_test/bimaterial_crack_test.pl | 2 +- contrib/bimaterial_crack_test/crack.cc | 2 +- contrib/bimaterial_crack_test/crack.param | 2 +- contrib/bimaterial_crack_test/crack.pl | 2 +- contrib/bimaterial_crack_test/crack_exact_solution.cc | 2 +- contrib/bimaterial_crack_test/crack_exact_solution.h| 2 +- contrib/bimaterial_crack_test/getfem_Xfem.cc| 2 +- contrib/bimaterial_crack_test/getfem_Xfem.h | 2 +- contrib/bimaterial_crack_test/getfem_spider_fem.h | 2 +- contrib/crack_plate/Makefile.am | 2 +- contrib/crack_plate/crack_bilaplacian.cc| 2 +- contrib/crack_plate/crack_bilaplacian.h | 2 +- contrib/crack_plate/crack_bilaplacian.param | 2 +- contrib/crack_plate/crack_bilaplacian_mixed.param | 2 +- contrib/crack_plate/crack_bilaplacian_moment.cc | 2 +- contrib/crack_plate/crack_bilaplacian_problem.cc| 2 +- contrib/crack_plate/crack_bilaplacian_sif.cc| 2 +- contrib/crack_plate/crack_bilaplacian_singularities.cc | 2 +- contrib/crack_plate/crack_bilaplacian_tools.cc | 2 +- contrib/crack_plate/crack_mindlin.cc| 2 +- contrib/crack_plate/crack_mindlin.param | 2 +- contrib/crack_plate/crack_mindlin.pl| 2 +- contrib/crack_plate/crack_panel.cc | 2 +-
[Getfem-commits] (no subject)
branch: master
commit cac4df66312b3b6155eab78c794b820a5e25ff57
Author: Konstantinos Poulios
Date: Wed Jan 1 11:45:37 2020 +0100
Code readability and typo fixes
---
src/getfem/getfem_generic_assembly.h| 14 +-
src/getfem/getfem_models.h | 4 +-
src/getfem_generic_assembly_compile_and_exec.cc | 8 +-
src/getfem_generic_assembly_workspace.cc| 5 +
src/getfem_models.cc| 218
src/getfem_nonlinear_elasticity.cc | 2 +-
6 files changed, 131 insertions(+), 120 deletions(-)
diff --git a/src/getfem/getfem_generic_assembly.h
b/src/getfem/getfem_generic_assembly.h
index 68ea575..8d1f8d4 100644
--- a/src/getfem/getfem_generic_assembly.h
+++ b/src/getfem/getfem_generic_assembly.h
@@ -288,10 +288,10 @@ namespace getfem {
}
var_description(bool is_var, const mesh_fem *mf_, const im_data *imd_,
- gmm::sub_interval I_, const model_real_plain_vector *v,
+ gmm::sub_interval I_, const model_real_plain_vector *V_,
size_type Q)
: is_variable(is_var), is_fem_dofs(mf_ != 0), mf(mf_), imd(imd_),
- I(I_), V(v), qdims(1)
+ I(I_), V(V_), qdims(1)
{
GMM_ASSERT1(Q > 0, "Bad dimension");
qdims[0] = Q;
@@ -340,10 +340,12 @@ namespace getfem {
const mesh_region _region(const mesh , const mesh_region );
// variables and variable groups
-mutable std::map int_disabled_variables;
-
typedef std::map VAR_SET;
VAR_SET variables;
+
+mutable std::map int_disabled_variables;
+std::map tmp_var_intervals;
+
std::map transformations;
std::map elem_transformations;
std::map secondary_domains;
@@ -362,7 +364,6 @@ namespace getfem {
bool scalar_expr, operation_type op_type=ASSEMBLY,
const std::string varname_interpolation="");
-
std::shared_ptr K;
std::shared_ptr V;
model_real_sparse_matrix col_unreduced_K,
@@ -372,8 +373,6 @@ namespace getfem {
base_tensor assemb_t;
bool include_empty_int_pts = false;
-std::map tmp_var_intervals;
-
public:
// setter functions
void set_assembled_matrix(model_real_sparse_matrix _) {
@@ -460,6 +459,7 @@ namespace getfem {
std::vector _test2,
std::vector ,
size_type order);
+bool is_linear(size_type order);
bool variable_exists(const std::string ) const;
diff --git a/src/getfem/getfem_models.h b/src/getfem/getfem_models.h
index 0d72462..54b62d7 100644
--- a/src/getfem/getfem_models.h
+++ b/src/getfem/getfem_models.h
@@ -2304,7 +2304,7 @@ namespace getfem {
/** Linear elasticity brick ( @f$ \int \sigma(u):\varepsilon(v) @f$ ).
for isotropic material. Parametrized by Young modulus and Poisson ratio
- For two-dimensional problems, corresponds to the plain strain
+ For two-dimensional problems, corresponds to the plane strain
approximation
( @f$ \lambda = E\nu/((1+\nu)(1-2\nu)), \mu = E/(2(1+\nu)) @f$ ).
Corresponds to the standard model for three-dimensional problems.
@@ -2317,7 +2317,7 @@ namespace getfem {
/**
Linear elasticity brick ( @f$ \int \sigma(u):\varepsilon(v) @f$ ).
for isotropic material. Parametrized by Young modulus and Poisson ratio.
- For two-dimensional problems, corresponds to the plain stress
+ For two-dimensional problems, corresponds to the plane stress
approximation
( @f$ \lambda^* = E\nu/(1-\nu^2), \mu = E/(2(1+\nu)) @f$ ).
Corresponds to the standard model for three-dimensional problems.
diff --git a/src/getfem_generic_assembly_compile_and_exec.cc
b/src/getfem_generic_assembly_compile_and_exec.cc
index dcf0921..f3d4ac9 100644
--- a/src/getfem_generic_assembly_compile_and_exec.cc
+++ b/src/getfem_generic_assembly_compile_and_exec.cc
@@ -5174,7 +5174,7 @@ namespace getfem {
(is_elementary ? pnode->elementary_target :
pnode->name)
<< " has to be defined on the same mesh than the "
<< "integration method or interpolation used");
-
+
// An instruction for extracting local dofs of the variable.
if (rmi.local_dofs.count(pnode->name) == 0) {
rmi.local_dofs[pnode->name] = base_vector(1);
@@ -5206,7 +5206,7 @@ namespace getfem {
(*mf, rmi.pfps[mf], gis.ctx, gis.fp_pool);
rmi.instructions.push_back(std::move(pgai));
}
-
+
// An instruction for the base value
pgai = pga_instruction();
switch (pnode->node_type) {
@@ -5289,7 +5289,7 @@ namespace getfem {
(rmi.xfem_minus_hess[mf], gis.ctx, *mf, rmi.pfps[mf]);
}
break;
-
+
default : GMM_ASSERT1(false,
[Getfem-commits] [getfem-commits] master updated (46ae0a7 -> cac4df6)
logari81 pushed a change to branch master. from 46ae0a7 :arrow_up: isort import for PEP8 new cac4df6 Code readability and typo fixes Summary of changes: src/getfem/getfem_generic_assembly.h| 14 +- src/getfem/getfem_models.h | 4 +- src/getfem_generic_assembly_compile_and_exec.cc | 8 +- src/getfem_generic_assembly_workspace.cc| 5 + src/getfem_models.cc| 218 src/getfem_nonlinear_elasticity.cc | 2 +- 6 files changed, 131 insertions(+), 120 deletions(-)
[Getfem-commits] Happy New Year 2020
Dear getfem project Happy new year 2020 ! I updated the year of license. Could you merge devel-tetsuo-happy-new-year-2020? Have a nice year. Best regards Tetsuo
[Getfem-commits] [getfem-commits] branch devel-tetsuo-happy-new-year-2020 created (now 44ca1ca)
tkoyama010 pushed a change to branch devel-tetsuo-happy-new-year-2020. at 44ca1ca :tada: HAPPY NEW YEAR 2020 :tada: This branch includes the following new commits: new 44ca1ca :tada: HAPPY NEW YEAR 2020 :tada:
