[Getfem-commits] r4726 - in /trunk/getfem: bin/ src/

[Yves . Renard]

Author: renard
Date: Sat Jul 19 15:08:07 2014
New Revision: 4726

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

Modified:
    trunk/getfem/bin/upload_documentation
    trunk/getfem/bin/upload_html
    trunk/getfem/bin/upload_misc
    trunk/getfem/bin/upload_version
    trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc

Modified: trunk/getfem/bin/upload_documentation
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/upload_documentation?rev=4726&r1=4725&r2=4726&view=diff
==============================================================================
--- trunk/getfem/bin/upload_documentation       (original)
+++ trunk/getfem/bin/upload_documentation       Sat Jul 19 15:08:07 2014
@@ -26,6 +26,10 @@
 do_rmdir=0
 do_delete=0
 do_mrproper=0
+
+if [ "$srcdir" == "" ]; then
+  srcdir="."
+fi
 
 me=$((cd $srcdir && svn info) | grep "svn+ssh" | sed "1,1d" | awk -F"//" 
'{print $2}' | awk -F"@" '{print $1}')
 echo "gna login : $me"

Modified: trunk/getfem/bin/upload_html
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/upload_html?rev=4726&r1=4725&r2=4726&view=diff
==============================================================================
--- trunk/getfem/bin/upload_html        (original)
+++ trunk/getfem/bin/upload_html        Sat Jul 19 15:08:07 2014
@@ -26,6 +26,10 @@
 
 do_delete=0
 do_mrproper=0
+
+if [ "$srcdir" == "" ]; then
+  srcdir="."
+fi
 
 where="html"
 me=$((cd $srcdir && svn info) | grep "svn+ssh" | sed "1,1d" | awk -F"//" 
'{print $2}' | awk -F"@" '{print $1}')

Modified: trunk/getfem/bin/upload_misc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/upload_misc?rev=4726&r1=4725&r2=4726&view=diff
==============================================================================
--- trunk/getfem/bin/upload_misc        (original)
+++ trunk/getfem/bin/upload_misc        Sat Jul 19 15:08:07 2014
@@ -26,6 +26,10 @@
 
 do_delete=0
 do_mrproper=0
+
+if [ "$srcdir" == "" ]; then
+  srcdir="."
+fi
 
 where="misc"
 me=$((cd $srcdir && svn info) | grep "svn+ssh" | sed "1,1d" | awk -F"//" 
'{print $2}' | awk -F"@" '{print $1}')

Modified: trunk/getfem/bin/upload_version
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/upload_version?rev=4726&r1=4725&r2=4726&view=diff
==============================================================================
--- trunk/getfem/bin/upload_version     (original)
+++ trunk/getfem/bin/upload_version     Sat Jul 19 15:08:07 2014
@@ -29,6 +29,10 @@
 do_mrproper=0
 
 where=""
+
+if [ "$srcdir" == "" ]; then
+  srcdir=".."
+fi
 
 me=$((cd $srcdir && svn info) | grep "svn+ssh" | sed "1,1d" | awk -F"//" 
'{print $2}' | awk -F"@" '{print $1}')
 echo "gna login : $me"

Modified: trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc?rev=4726&r1=4725&r2=4726&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       
(original)
+++ trunk/getfem/src/getfem_contact_and_friction_large_sliding.cc       Sat Jul 
19 15:08:07 2014
@@ -2406,13 +2406,14 @@
           //                   lambda.Interpolate(Test_ug, contact_trans), 1)
           // or
           // Interpolate_filter(trans,
-          //       coupled_projection_def.Interpolate(Test_ug, contact_trans), 
1)
+          //     coupled_projection_def.Interpolate(Test_ug, contact_trans), 1)
           + "+ Interpolate_filter("+transformation_name+","
           + (sym_version ? coupled_projection_def : lambda)
           + ".Interpolate(Test_"+u_group+"," + transformation_name+"), 1)"
           // -(1/r)*lambda.Test_lambda
           + "-(1/"+augmentation_param+")*"+lambda+".Test_"+lambda
-          // Interpolate_filter(trans, 
(1/r)*coupled_projection_rig.Test_lambda, 2)
+          // Interpolate_filter(trans,
+          //   (1/r)*coupled_projection_rig.Test_lambda, 2)
           + "+ Interpolate_filter("+transformation_name+","
           + "(1/"+augmentation_param+")*"+ coupled_projection_rig
           + ".Test_"+lambda+", 2)"
@@ -2423,10 +2424,6 @@
           + lambda+", 1)";
       }
     }
-
-
-    
-
 
     virtual void asm_real_tangent_terms(const model &md, size_type ,
                                         const model::varnamelist &,