[Getfem-commits] r5354 - in /trunk/getfem: bin/extract_doc interface/src/python/getfem_python.c src/getfem/getfem_config.h

[Yves . Renard]

Author: renard
Date: Tue Jul 26 20:20:23 2016
New Revision: 5354

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

Modified:
    trunk/getfem/bin/extract_doc
    trunk/getfem/interface/src/python/getfem_python.c
    trunk/getfem/src/getfem/getfem_config.h

Modified: trunk/getfem/bin/extract_doc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/bin/extract_doc?rev=5354&r1=5353&r2=5354&view=diff
==============================================================================
--- trunk/getfem/bin/extract_doc        (original)
+++ trunk/getfem/bin/extract_doc        Tue Jul 26 20:20:23 2016
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- python -*-
 #
-# Copyright (C) 2004-2015 Yves Renard, Julien Pommier.
+# Copyright (C) 2004-2016 Yves Renard, Julien Pommier.
 #                                                       
 # This file is a part of GetFEM++                                         
 #                                                                         
@@ -1556,7 +1556,7 @@
 #
 # Python GetFEM++ interface
 #
-# Copyright (C) 2004-2015 Yves Renard, Julien Pommier.
+# Copyright (C) 2004-2016 Yves Renard, Julien Pommier.
 #
 # This file is a part of GetFEM++
 #

Modified: trunk/getfem/interface/src/python/getfem_python.c
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/python/getfem_python.c?rev=5354&r1=5353&r2=5354&view=diff
==============================================================================
--- trunk/getfem/interface/src/python/getfem_python.c   (original)
+++ trunk/getfem/interface/src/python/getfem_python.c   Tue Jul 26 20:20:23 2016
@@ -715,7 +715,7 @@
     word_out = PyString_FromString("GetFEM++");
   } else if (strcmp(word_in,"copyright") == 0) {
     word_out = PyString_FromString
-    ("2004-2015 GetFEM++ project");
+    ("2004-2016 GetFEM++ project");
   } else if (strcmp(word_in,"authors") == 0) {
     word_out = PyString_FromString
     ("Yves Renard, Julien Pommier");

Modified: trunk/getfem/src/getfem/getfem_config.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_config.h?rev=5354&r1=5353&r2=5354&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_config.h     (original)
+++ trunk/getfem/src/getfem/getfem_config.h     Tue Jul 26 20:20:23 2016
@@ -307,8 +307,8 @@
           }
         }
 
-        for (int j = 0; j < int(contributors.size()); ++j) {
-          if (column_master == rk) { // receive a column and store
+       if (column_master == rk) { // receive a column and store
+         for (int j = 0; j < int(contributors.size()); ++j) {
             typename gmm::rsvector<T>::base_type_ &VV = V;
             int si = all_nnz(i, contributors[j]);
             VV.resize(si);
@@ -317,15 +317,15 @@
                      MPI_BYTE, contributors[j], 0,
                      MPI_COMM_WORLD, MPI_STATUS_IGNORE);
             gmm::add(V, gmm::mat_col(MM, i));
-          } else { // send the column to the column master
-            typename gmm::rsvector<T>::base_type_ &VV = MM.col(i);
-            MPI_Send((void *)(&(VV[0])),
-                     my_nnz[i]*sizeof(gmm::elt_rsvector_<T>),
-                     MPI_BYTE, column_master, 0,
-                     MPI_COMM_WORLD);
-            MM.col(i).clear();
           }
-        }
+       } else { // send the column to the column master
+         typename gmm::rsvector<T>::base_type_ &VV = MM.col(i);
+         MPI_Send((void *)(&(VV[0])),
+                  my_nnz[i]*sizeof(gmm::elt_rsvector_<T>),
+                  MPI_BYTE, column_master, 0,
+                  MPI_COMM_WORLD);
+         MM.col(i).clear();
+       }
       }
     }