Changeset 12377

Timestamp:

06/07/12 08:01:49 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added parallel kriging module

Location:

issm/trunk-jpl/src/c

Files:

• Container/Observations.cpp (modified) (3 diffs)
• Makefile.am (modified) (3 diffs)
• io/Disk/diskio.h (modified) (1 diff)
• io/io.h (modified) (1 diff)
• issm.h (modified) (1 diff)
• modules/Krigingx/Krigingx.cpp (modified) (1 diff)
• modules/Krigingx/Krigingx.h (modified) (1 diff)
• modules/Krigingx/pKrigingx.cpp (added)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• objects/IoModel.cpp (modified) (3 diffs)
• objects/IoModel.h (modified) (2 diffs)
• solutions/kriging.cpp (added)

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

@@ -21 +21 @@
 #include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
+#include "../io/io.h"
 
 using namespace std;
@@ -71 +72 @@
 
         /*Initialize Quadtree*/
-        printf("Generating quadtree with a maximum box size %g (depth=%i)... ",minlength,maxdepth);
+        _printf_(true,"Generating quadtree with a maximum box size %g (depth=%i)... ",minlength,maxdepth);
         this->quadtree = new Quadtree(xmin,xmax,ymin,ymax,maxdepth);
 
@@ -101 +102 @@
                 }
         }
-        printf("done\n");
-        printf("Initial number of observations: %i\n",n);
-        printf("  Final number of observations: %i\n",this->quadtree->NbObs);
+        _printf_(true,"done\n");
+        _printf_(true,"Initial number of observations: %i\n",n);
+        _printf_(true,"  Final number of observations: %i\n",this->quadtree->NbObs);
 }
 /*}}}*/

issm/trunk-jpl/src/c/Makefile.am

@@ -633 +633 @@
                                                 ./modules/Krigingx/Krigingx.h
 
+#For parallel kriging, only difference is ./modules/Krigingx/pKrigingx.cpp with no multithreading
+pkriging_sources = ./Container/Observations.h\
+                                                ./Container/Observations.cpp\
+                                                ./objects/Kriging/Variogram.h \
+                                                ./objects/Kriging/GaussianVariogram.h\
+                                                ./objects/Kriging/GaussianVariogram.cpp\
+                                                ./objects/Kriging/ExponentialVariogram.h\
+                                                ./objects/Kriging/ExponentialVariogram.cpp\
+                                                ./objects/Kriging/SphericalVariogram.h\
+                                                ./objects/Kriging/SphericalVariogram.cpp\
+                                                ./objects/Kriging/PowerVariogram.h\
+                                                ./objects/Kriging/PowerVariogram.cpp\
+                                                ./objects/Kriging/Quadtree.h\
+                                                ./objects/Kriging/Quadtree.cpp\
+                                                ./objects/Kriging/Observation.h\
+                                                ./objects/Kriging/Observation.cpp\
+                                                ./modules/Krigingx/pKrigingx.cpp\
+                                                ./modules/Krigingx/Krigingx.h
+
 #}}}
 #Kml sources  {{{1
@@ -964 +983 @@
 
 libISSMCore_a_SOURCES  = $(issm_sources)
+libISSMCore_a_SOURCES += $(pkriging_sources)
 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
 
@@ -1005 +1025 @@
 issm_SOURCES = solutions/issm.cpp
 issm_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+
+bin_PROGRAMS += kriging
+kriging_SOURCES = solutions/kriging.cpp
+kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 #}}}
 #Automatic differentiation: append this fold to the end of the src/c/Makefile.am to get this Makefile.am {{{

issm/trunk-jpl/src/c/io/Disk/diskio.h

@@ -10 +10 @@
 #include "../../include/include.h"
 
-class DataSet;
-class Parameters;
-
 FILE* pfopen(char* filename,const char* format);
 void  pfclose(FILE* fid,char* filename);

issm/trunk-jpl/src/c/io/io.h

@@ -6 +6 @@
 #define _ISSM_IO_H_
 
-#ifdef HAVE_CONFIG_H //config.h {{{
+#ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif 
-//}}}
-
 #include "./Disk/diskio.h"
 

issm/trunk-jpl/src/c/issm.h

@@ -22 +22 @@
 #include "./modules/modules.h"
 
-
 #endif //ifndef _ISSM_H_

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

@@ -10 +10 @@
 #include "../../Container/Observations.h"
 #include "../modules.h"
-
 #ifdef _HAVE_GSL_
 #include <gsl/gsl_linalg.h>
 #endif
-
-#include "../../objects/Kriging/GaussianVariogram.h"
 /*FUNCTION Krigingx{{{*/
 int Krigingx(double** ppredictions,double **perror,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){

issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.h

@@ -13 +13 @@
 
 int  Krigingx(double** ppredictions,double **perror,double* x, double* y, double* observations, int n_obs,double* x_interp,double* y_interp,int n_interp,Options* options);
+int  pKrigingx(double** ppredictions,double **perror,double* x, double* y, double* observations, int n_obs,double* x_interp,double* y_interp,int n_interp,Options* options);
 void ProcessVariogram(Variogram **pvariogram,Options* options);
 void GslSolve(double** pX,double* A,double* B,int n);

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

@@ -16 +16 @@
 #include "../../objects/objects.h"
                 
-void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
+void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
 
         extern int  my_rank;

issm/trunk-jpl/src/c/objects/IoModel.cpp

@@ -71 +71 @@
 IoModel::~IoModel(){
 
-        delete this->constants;
+        if(this->constants) delete this->constants;
 
         /*Some checks in debugging mode*/
         #ifdef _ISSM_DEBUG_
-        for(int i=0;i<MaximumNumberOfEnums;i++){
-                if(this->data[i]){
-                        _printf_("Info: previous pointer of %s has not been freed (DeleteData has not been called)",EnumToStringx(i));
+        if(this->data){
+                for(int i=0;i<MaximumNumberOfEnums;i++){
+                        if(this->data[i]){
+                                _printf_("Info: previous pointer of %s has not been freed (DeleteData has not been called)",EnumToStringx(i));
+                        }
                 }
         }
@@ -83 +85 @@
 
         xfree((void**)&this->data);
-
         xfree((void**)&this->my_elements);
         xfree((void**)&this->my_nodes);
@@ -98 +99 @@
         int record_enum = 0;
 
-
         /*Check that some fields have been allocated*/
         _assert_(this->fid || my_rank);
-
 
         /*Go find in the binary file, the position of the data we want to fetch: */

issm/trunk-jpl/src/c/objects/IoModel.h

@@ -18 +18 @@
 
         private: 
-                FILE        *fid;         //pointer to input file
                 IssmDouble     **data;        //this dataset holds temporary data, memory intensive.
                 Parameters  *constants;   //this dataset holds all IssmDouble, int, bool and char *parameters read in from the input file.*
@@ -24 +23 @@
         public:
                 /*This data needs to stay memory resident at all time, even if it's memory intensive: */
+                FILE        *fid;         //pointer to input file
                 bool *my_elements;
                 bool *my_nodes;