Changeset 14911

Timestamp:

05/05/13 18:25:29 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing compilation (missing header files

Location:

issm/trunk-jpl/src/c

Files:

• Container/Observations.cpp (modified) (2 diffs)
• modules/Shp2Expx/Shp2Expx.cpp (modified) (1 diff)
• modules/Shp2Kmlx/Shp2Kmlx.cpp (modified) (1 diff)
• toolkits/gsl/DenseGslSolve.cpp (modified) (1 diff)
• toolkits/gsl/gslincludes.h (modified) (1 diff)

issm/trunk-jpl/src/c/Container/Observations.cpp

@@ -403 +403 @@
         /*Solve the three linear systems*/
 #if _HAVE_GSL_
-        SolverxSeq(&GinvG0,Gamma,gamma0,n_obs); // Gamma^-1 gamma0
-        SolverxSeq(&Ginv1, Gamma,ones,n_obs);   // Gamma^-1 ones
-        SolverxSeq(&GinvZ, Gamma,obs,n_obs);    // Gamma^-1 Z
+        DenseGslSolve(&GinvG0,Gamma,gamma0,n_obs); // Gamma^-1 gamma0
+        DenseGslSolve(&Ginv1, Gamma,ones,n_obs);   // Gamma^-1 ones
+        DenseGslSolve(&GinvZ, Gamma,obs,n_obs);    // Gamma^-1 Z
 #else
         _error_("GSL is required");
@@ -511 +511 @@
                 /*Compute weights*/
 #if _HAVE_GSL_
-                SolverxSeq(&weights,Green,obs,n_obs); // Green^-1 obs
+                DenseGslSolve(&weights,Green,obs,n_obs); // Green^-1 obs
 #else
                 _error_("GSL is required");

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

@@ -4 +4 @@
 
 #include "./Shp2Expx.h"
+#include "../Ll2xyx/Ll2xyx.h"
+#include "../Xy2llx/Xy2llx.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"

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

@@ -4 +4 @@
 
 #include "./Shp2Kmlx.h"
+#include "../Xy2llx/Xy2llx.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"

issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp

@@ -23 +23 @@
 class Parameters;
 
+void DenseGslSolve(IssmPDouble** pX,IssmPDouble* A,IssmPDouble* B, int n){ /*{{{*/
+
+        /*Intermediary: */
+        IssmPDouble *X  = xNew<IssmPDouble>(n);
+        SolverxSeq(X,A,B,n);
+
+        /*allocate output pointers: */
+        *pX=X;
+}
+/*}}}*/
 void DenseGslSolve(/*output*/ IssmPDouble** px,/*stiffness matrix:*/ IssmPDouble* Kff, int Kff_M, int Kff_N, /*right hand side load vector: */ IssmPDouble* pf, int pf_M, Parameters* parameters){ /*{{{*/
 

issm/trunk-jpl/src/c/toolkits/gsl/gslincludes.h

@@ -20 +20 @@
 class Parameters;
 
+void DenseGslSolve(IssmPDouble** pX,IssmPDouble* A,IssmPDouble* B, int n);
 void DenseGslSolve(IssmDouble** px, IssmDouble* Kff,int Kff_M, int Kff_N, IssmDouble* pf, int pf_M, Parameters* parameters);