Changeset 16068

Timestamp:

09/04/13 12:56:23 (12 years ago)

Author:

utke

Message:

CHG fixed initialization sequence

File:

• issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp

@@ -20 +20 @@
 /*}}}*/
 
-void MumpsSettings(DMUMPS_STRUC_C &theMumpsStruc,ISSM_MPI_Comm &comm) { 
+void MumpsInit(DMUMPS_STRUC_C &theMumpsStruc) { 
         theMumpsStruc.par          = 1;  
         theMumpsStruc.sym          = 0;
-        theMumpsStruc.comm_fortran = MPI_Comm_c2f(comm);
+        theMumpsStruc.comm_fortran = MPI_Comm_c2f(IssmComm::GetComm());
+        theMumpsStruc.job          = -1;
+        dmumps_c(&theMumpsStruc);
+}
+
+// must be preceded by a call to MumpsInit
+void MumpsSettings(DMUMPS_STRUC_C &theMumpsStruc) { 
         /*Control statements:{{{ */
         theMumpsStruc.icntl[1-1] = 6; //error verbose
@@ -35 +41 @@
         theMumpsStruc.icntl[30-1] = 0;
         /*}}}*/
-}
-
-// must be preceded by a call to MumpsSettings
-void MumpsInit(DMUMPS_STRUC_C &theMumpsStruc) { 
-        theMumpsStruc.job          = -1;
-        dmumps_c(&theMumpsStruc);
 }
 
@@ -75 +75 @@
                 IssmPDouble *rhs) { 
         /*Initialize mumps: {{{*/
-        ISSM_MPI_Comm   comm=IssmComm::GetComm();
         DMUMPS_STRUC_C theMumpsStruc;
-        MumpsSettings(theMumpsStruc,comm);
         MumpsInit(theMumpsStruc);
+        MumpsSettings(theMumpsStruc);
         /*}}}*/
         // now setup the rest of theMumpsStruc 
@@ -195 +194 @@
                    rhs);
 
+if (my_rank==0) for (int i=0;i<Kff_M;++i) std::cout << i << " : " << rhs[i] << std::endl;
         /*Now scatter from cpu 0 to all other cpus: {{{*/
         ISSM_MPI_Scatterv( rhs, recvcounts, displs, ISSM_MPI_DOUBLE, uf, uf_m, ISSM_MPI_DOUBLE, 0, comm);