Author: renard
Date: Sat Oct 29 17:43:31 2016
New Revision: 5454
URL: http://svn.gna.org/viewcvs/getfem?rev=5454&view=rev
Log:
minor change
Modified:
trunk/getfem/contrib/opt_assembly/opt_assembly.cc
trunk/getfem/src/getfem_generic_assembly.cc
Modified: trunk/getfem/contrib/opt_assembly/opt_assembly.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/contrib/opt_assembly/opt_assembly.cc?rev=5454&r1=5453&r2=5454&view=diff
==============================================================================
--- trunk/getfem/contrib/opt_assembly/opt_assembly.cc (original)
+++ trunk/getfem/contrib/opt_assembly/opt_assembly.cc Sat Oct 29 17:43:31 2016
@@ -255,7 +255,7 @@
chrono ch;
bool all = false;
- bool select = false;
+ bool select = true;
int only_one = 1;
if (all || select || only_one == 1) {
@@ -438,7 +438,7 @@
GMM_SET_EXCEPTION_DEBUG; // Exceptions make a memory fault, to debug.
FE_ENABLE_EXCEPT; // Enable floating point exception for Nan.
- bool all = false;
+ bool all = true;
int only_one = 2;
// Mesured times for
Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=5454&r1=5453&r2=5454&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Sat Oct 29 17:43:31 2016
@@ -4239,12 +4239,11 @@
GA_DEBUG_INFO("Instruction: Trace");
GA_DEBUG_ASSERT(t.size()*n*n == tc1.size(), "Wrong sizes");
size_type s = t.size() * (n+1);
- base_tensor::iterator it = t.begin();
- base_tensor::const_iterator it1 = tc1.begin();
+ auto it = t.begin();
+ auto it1 = tc1.begin();
for (; it != t.end(); ++it, ++it1) {
- *it = scalar_type(0);
- base_tensor::const_iterator it2 = it1;
- *it += *it2;
+ auto it2 = it1;
+ *it = *it2;
for (size_type i = 1; i < n; ++i) { it2 += s; *it += *it2; }
}
return 0;
_______________________________________________
Getfem-commits mailing list
[email protected]
https://mail.gna.org/listinfo/getfem-commits
