Changeset 14882

Timestamp:

05/03/13 21:41:19 (12 years ago)

Author:

Eric.Larour

Message:

CHG: adolc mode mumps solver not yet available.

Location:

issm/trunk-jpl/src/c

Files:

• modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (modified) (1 diff)
• toolkits/mumps/MpiDenseMumpsSolve.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp

@@ -101 +101 @@
         MPI_Bcast(&numanalyses,1,MPI_INT,0,IssmComm::GetComm());
         if(my_rank!=0){
-                analyses=xNew<IssmPDouble>(numanalyses);
+                analyses=xNew<IssmDouble>(numanalyses);
                 strings=xNew<char*>(numanalyses);
         }

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

@@ -21 +21 @@
 #include "dmumps_c.h"
 
-/*}}}*/
 
 #define JOB_INIT -1 
 #define JOB_SOLVE 6
 #define JOB_END  -2
+/*}}}*/
 
-void MpiDenseMumpsSolve( /*output: */ IssmDouble* uf, int uf_M, int uf_m, /*matrix input: */ IssmDouble* Kff, int Kff_M, int Kff_N, int Kff_m, /*right hand side vector: */ IssmDouble* pf, int pf_M, int pf_m){
+void MpiDenseMumpsSolve( /*output: */ IssmPDouble* uf, int uf_M, int uf_m, /*matrix input: */ IssmPDouble* Kff, int Kff_M, int Kff_N, int Kff_m, /*right hand side vector: */ IssmPDouble* pf, int pf_M, int pf_m){ /*{{{*/
 
-        /*Variables: */
+        /*Variables: {{{*/
 
 
@@ -40 +40 @@
         int        *irn_loc = NULL;
         int        *jcn_loc = NULL;
-        IssmDouble *a_loc   = NULL;
+        IssmPDouble *a_loc   = NULL;
         int         count;
         int         lower_row;
         int         upper_row;
-        IssmDouble* rhs=NULL;
+        IssmPDouble* rhs=NULL;
         int*        recvcounts=NULL;
         int*        displs=NULL;
-
+        /*}}}*/
+        /*Communicator info:{{{ */
         my_rank=IssmComm::GetRank();
         num_procs=IssmComm::GetSize();
         comm=IssmComm::GetComm();
-        
+        /*}}}*/
         /*First, some checks:{{{ */
         if (Kff_M!=Kff_N)_error_("stiffness matrix Kff should be square");
@@ -97 +98 @@
                 irn_loc=xNew<int>(local_nnz);
                 jcn_loc=xNew<int>(local_nnz);
-                a_loc=xNew<IssmDouble>(local_nnz);
+                a_loc=xNew<IssmPDouble>(local_nnz);
         }
         
@@ -119 +120 @@
 
         /*Deal with right hand side. We need to MPI_Gather it onto cpu 0: */
-        rhs=xNew<IssmDouble>(pf_M);
+        rhs=xNew<IssmPDouble>(pf_M);
 
         recvcounts=xNew<int>(num_procs);
@@ -145 +146 @@
 
         /*}}}*/
-        /*}}}*/
         /*Cleanup: {{{*/
         id.job = JOB_END; 
@@ -152 +152 @@
         xDelete<int>(irn_loc);
         xDelete<int>(jcn_loc);
-        xDelete<IssmDouble>(a_loc);
-        xDelete<IssmDouble>(rhs);
+        xDelete<IssmPDouble>(a_loc);
+        xDelete<IssmPDouble>(rhs);
         xDelete<int>(recvcounts);
         xDelete<int>(displs);
 
         /*}}}*/
-}
+} /*}}}*/
 
+#ifdef _HAVE_ADOLC_
+void MpiDenseMumpsSolve( /*output: */ IssmDouble* uf, int uf_M, int uf_m, /*matrix input: */ IssmDouble* Kff, int Kff_M, int Kff_N, int Kff_m, /*right hand side vector: */ IssmDouble* pf, int pf_M, int pf_m){ /*{{{*/
+        _error_("not supported yet!");
+} /*}}}*/
+#endif