[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r4673 - /trunk/getfem/src/getfem_models.cc
From: |
Yves . Renard |
Subject: |
[Getfem-commits] r4673 - /trunk/getfem/src/getfem_models.cc |
Date: |
Mon, 02 Jun 2014 18:46:33 -0000 |
Author: renard
Date: Mon Jun 2 20:46:32 2014
New Revision: 4673
URL: http://svn.gna.org/viewcvs/getfem?rev=4673&view=rev
Log:
minor fix
Modified:
trunk/getfem/src/getfem_models.cc
Modified: trunk/getfem/src/getfem_models.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4673&r1=4672&r2=4673&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc (original)
+++ trunk/getfem/src/getfem_models.cc Mon Jun 2 20:46:32 2014
@@ -2041,6 +2041,7 @@
}
if (recompute_matrix) {
+ cout << "recompute matrix ..." << endl;
ga_workspace workspace(md);
mesh_region rg(region);
mims[0]->linked_mesh().intersect_with_mpi_region(rg);
@@ -2096,7 +2097,10 @@
ga_workspace workspace(md);
size_type order = workspace.add_expression(expr, mim, region);
model::varnamelist vl, dl;
- workspace.used_variables(vl, dl, 2);
+ bool is_lin = workspace.used_variables(vl, dl, 2);
+ GMM_ASSERT1(is_lin, 'Nonlinear term');
+ cout << "linear term vl = " << vl << endl;
+ cout << "linear term dl = " << dl << endl;
if (order == 0) { is_coercive = is_sym = true; }
pbrick pbr = new gen_linear_assembly_brick(expr, is_sym, is_coercive,
(order == 0), brickname);
@@ -2218,6 +2222,7 @@
"mesh_im");
GMM_TRACE2("Generic source term assembly");
+ cout << "recompute source term ..." << endl;
ga_workspace workspace(md);
mesh_region rg(region);
mims[0]->linked_mesh().intersect_with_mpi_region(rg);
@@ -2271,8 +2276,11 @@
ga_workspace workspace(md);
size_type order = workspace.add_expression(expr, mim, region);
+ GMM_ASSERT1(order <= 1, "Wrong order for a source term");
model::varnamelist vl, dl;
- workspace.used_variables(vl, dl, order);
+ workspace.used_variables(vl, dl, 1);
+ cout << "source term vl = " << vl << endl;
+ cout << "source term dl = " << dl << endl;
pbrick pbr = new gen_source_term_assembly_brick(expr, (order == 0),
brickname);
model::termlist tl; // A unique global vector term
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r4673 - /trunk/getfem/src/getfem_models.cc,
Yves . Renard <=