[Getfem-commits] r4638 - in /trunk/getfem: interface/tests/matlab/demo_refine.m src/getfem_error_estimate.cc

[Yves . Renard]

Author: renard
Date: Tue May  6 16:22:31 2014
New Revision: 4638

URL: http://svn.gna.org/viewcvs/getfem?rev=4638&view=rev
Log:
small fixes

Modified:
    trunk/getfem/interface/tests/matlab/demo_refine.m
    trunk/getfem/src/getfem_error_estimate.cc

Modified: trunk/getfem/interface/tests/matlab/demo_refine.m
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/tests/matlab/demo_refine.m?rev=4638&r1=4637&r2=4638&view=diff
==============================================================================
--- trunk/getfem/interface/tests/matlab/demo_refine.m   (original)
+++ trunk/getfem/interface/tests/matlab/demo_refine.m   Tue May  6 16:22:31 2014
@@ -63,41 +63,11 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-% b0=gfMdBrick('isotropic_linearized_elasticity',mim, mfu);
-% b1=gfMdBrick('dirichlet',b0,1,mfu,'penalized');
-% b2=gfMdBrick('source term',b1,2);
-
-% set(b0, 'param', 'lambda', lambda);
-% set(b0, 'param', 'mu', mu);
-
-% mds=gfMdState(b2)
-
 for step=1:8,
-  dd=get(mf0, 'basic dof from cvid');
-  
-  % set(b2, 'param','source_term', mfd, F);
-
   gf_model_get(md, 'solve');
   U = gf_model_get(md, 'variable', 'u');
-
-  % get(b2, 'solve', mds, 'very noisy'); %, 'lsolver', 'superlu');
-  
-  % U=get(mds, 'state'); U=U(1:get(mfu, 'nbdof'));
   
   VM = gf_model_get(md, 'compute isotropic linearized Von Mises or Tresca', 
'u', 'lambda', 'mu', mfdu);
-
-  % VM = get(b0, 'von mises', mds, mfdu);
 
   subplot(2,1,1);
   if (N==3) opt = {'cvlst', get(m,'outer_faces')}; 
@@ -108,6 +78,7 @@
   caxis([0 1e7]); colorbar; 
   title('Von Mises stress');
   
+  dd=get(mf0, 'basic dof from cvid');
   ERR=gf_compute(mfu,U,'error estimate', mim);
   E=ERR; E(dd)=ERR;
   subplot(2,1,2);

Modified: trunk/getfem/src/getfem_error_estimate.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_error_estimate.cc?rev=4638&r1=4637&r2=4638&view=diff
==============================================================================
--- trunk/getfem/src/getfem_error_estimate.cc   (original)
+++ trunk/getfem/src/getfem_error_estimate.cc   Tue May  6 16:22:31 2014
@@ -150,11 +150,15 @@
       //ERR[cv] = sqrt(ERR[cv]);
       
     };
-     int bnum = GAMMAC; 
-   
-    getfem::mesh_region region = m.region(bnum);
+
+
+    {
+
+      int bnum = GAMMAC; 
+      
+      getfem::mesh_region region = m.region(bnum);
       for (getfem::mr_visitor v(region, m);  !v.finished(); ++v) {
-  
+        
        //    getfem::mesher_level_set mmls = ls.mls_of_convex(v.cv(), 0);
        bgeot::pgeometric_trans pgt1 = m.trans_of_convex(v.cv());
        getfem::papprox_integration pai1 = 
@@ -218,21 +222,19 @@
         } 
         
         
-         
         if (ERR[v.cv()] > 100)
           cout << "Erreur en résidu sur element " << v.cv() << " : " << 
ERR[v.cv()] << endl;
         
- 
-};
-
- 
-
-  
-
-
-      bnum = GAMMAN; 
+        
+      }
+      
+    }
+
+    {
+
+      int bnum = GAMMAN; 
    
-      region = m.region(bnum);
+      getfem::mesh_region region = m.region(bnum);
       for (getfem::mr_visitor v(region,m);  !v.finished(); ++v) {
   
        //    getfem::mesher_level_set mmls = ls.mls_of_convex(v.cv(), 0);
@@ -268,14 +270,14 @@
          ERR[v.cv()] +=radius * coefficient * gmm::vect_norm2_sqr(jump);
        
          //    
-           } 
-        
-        
-         if (ERR[v.cv()] > 100)
-        cout << "Erreur en résidu sur element " << v.cv() << " : " << 
ERR[v.cv()] << endl;
-      
- 
-};
+        }
+        
+        if (ERR[v.cv()] > 100)
+          cout << "Erreur en résidu sur element " << v.cv() << " : " << 
ERR[v.cv()] << endl;
+        
+        
+      }
+    }
 
     
   }