[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r4529 - in /trunk/getfem: interface/src/ interface/test
From: |
Yves . Renard |
Subject: |
[Getfem-commits] r4529 - in /trunk/getfem: interface/src/ interface/tests/matlab/ src/ tests/ |
Date: |
Mon, 10 Mar 2014 15:29:38 -0000 |
Author: renard
Date: Mon Mar 10 16:29:38 2014
New Revision: 4529
URL: http://svn.gna.org/viewcvs/getfem?rev=4529&view=rev
Log:
minor fixes
Modified:
trunk/getfem/interface/src/getfemint.h
trunk/getfem/interface/src/gf_asm.cc
trunk/getfem/interface/tests/matlab/demo_dynamic_contact.m
trunk/getfem/src/getfem_generic_assembly.cc
trunk/getfem/tests/Makefile.am
Modified: trunk/getfem/interface/src/getfemint.h
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/getfemint.h?rev=4529&r1=4528&r2=4529&view=diff
==============================================================================
--- trunk/getfem/interface/src/getfemint.h (original)
+++ trunk/getfem/interface/src/getfemint.h Mon Mar 10 16:29:38 2014
@@ -573,6 +573,11 @@
create_array_h(unsigned(v.size()), T());
std::copy(v.begin(), v.end(), gfi_get_data(arg, T()));
}
+ template<class VECT> void from_dlvector(VECT& v) {
+ typedef typename VECT::value_type T;
+ create_array_v(unsigned(v.size()), T());
+ std::copy(v.begin(), v.end(), gfi_get_data(arg, T()));
+ }
template<class VECT> void from_ivector(VECT& v) {
create_iarray_h(unsigned(v.size()));
std::copy(v.begin(), v.end(), gfi_int32_get_data(arg));
Modified: trunk/getfem/interface/src/gf_asm.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_asm.cc?rev=4529&r1=4528&r2=4529&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_asm.cc (original)
+++ trunk/getfem/interface/src/gf_asm.cc Mon Mar 10 16:29:38 2014
@@ -417,7 +417,7 @@
std::map<std::string, getfem::model_real_plain_vector> vectors;
- if (in.remaining()) {
+ while (in.remaining()) {
std::string varname = in.pop().to_string();
bool is_cte = (in.pop().to_integer() == 0);
const getfem::mesh_fem *mf(0);
@@ -460,7 +460,7 @@
getfem::model_real_plain_vector residual(nbdof);
workspace.set_assembled_vector(residual);
workspace.assembly(1);
- out.pop().from_dcvector(residual);
+ out.pop().from_dlvector(residual);
}
break;
@@ -1046,13 +1046,13 @@
::COMPUTE('L2 norm') or with the square root of:
- ::ASM('generic', 0, mim, "u.u", -1, "u", 1, mf, U);
+ ::ASM('generic', mim, 0, 'u.u', -1, 'u', 1, mf, U);
The nonhomogeneous Laplacian stiffness matrix of a scalar field can be
evaluated with::
::ASM('laplacian', mim, mf, mf_data, A) or equivalently with:
- ::ASM('generic', 2, mim, 'A*Grad_Test2_u.Grad_Test_u', -1, "u", 1, mf,
U, "A", 0, mf_data, A);
+ ::ASM('generic', mim, 2, 'A*Grad_Test2_u.Grad_Test_u', -1, 'u', 1, mf,
U, 'A', 0, mf_data, A);
@*/
sub_command
Modified: trunk/getfem/interface/tests/matlab/demo_dynamic_contact.m
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_dynamic_contact.m?rev=4529&r1=4528&r2=4529&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_dynamic_contact.m (original)
+++ trunk/getfem/interface/tests/matlab/demo_dynamic_contact.m Mon Mar 10
16:29:38 2014
@@ -75,7 +75,7 @@
friction = 0; % Friction coefficient
vertical_force = 0.1; % Volumic load in the vertical direction
r = 10; % Augmentation parameter
- dt = 0.1; % Time step
+ dt = 0.001; % Time step
T = 40; % Simulation time
dt_plot = 0.5; % Drawing step;
beta = 0.25; % Newmark scheme coefficient
@@ -83,13 +83,13 @@
theta = 0.5; % Theta-method scheme coefficient
dirichlet = 0; % Dirichlet condition or not
dirichlet_val = 0.45;
- scheme = 4; % 1 = theta-method, 2 = Newmark, 3 = Newmark with
beta = 0, 4 = midpoint modified
+ scheme = 3; % 1 = theta-method, 2 = Newmark, 3 = Newmark with
beta = 0, 4 = midpoint modified
u_degree = 2;
v_degree = 1;
lambda_degree = 1;
Nitsche = 1; % Use Nitsche's method or not
- gamma0_N = 0.001; % Parameter gamma0 for Nitsche's method
- theta_N = 1.0; % Parameter theta for Nitsche's method
+ gamma0_N = 0.01; % Parameter gamma0 for Nitsche's method
+ theta_N = 1; % Parameter theta for Nitsche's method
end
singular_mass = 0; % 0 = standard method
Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4529&r1=4528&r2=4529&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Mon Mar 10 16:29:38 2014
@@ -6249,6 +6249,7 @@
size_type N = G.nrows();
bgeot::pgeometric_trans pgt = mesh.trans_of_convex(v.cv());
pintegration_method pim = mim.int_method_of_element(v.cv());
+ if (pim->type() == IM_NONE) continue;
GMM_ASSERT1(pim->type() == IM_APPROX, "Sorry, exact methods cannot "
"be used in high level generic assembly");
gis.pai = pim->approx_method();
Modified: trunk/getfem/tests/Makefile.am
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/tests/Makefile.am?rev=4529&r1=4528&r2=4529&view=diff
==============================================================================
--- trunk/getfem/tests/Makefile.am (original)
+++ trunk/getfem/tests/Makefile.am Mon Mar 10 16:29:38 2014
@@ -228,7 +228,8 @@
meshes/donut_regulier_32_elements.mesh \
meshes/sphere_with_quadratic_tetra_8_elts.mesh \
meshes/disc_with_a_hole.mesh \
- meshes/punch2D_h2.mesh \
+ meshes/punch2D_1.mesh \
+ meshes/punch2D_2.mesh \
meshes/multi_body.mesh \
meshes/donut_regulier_512_elements.mesh
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r4529 - in /trunk/getfem: interface/src/ interface/tests/matlab/ src/ tests/,
Yves . Renard <=