source: issm/oecreview/Archive/14312-15392/ISSM-14956-14957.diff@ 15393

../trunk-jpl/src/c/Container/Parameters.h

@@ -11 +11 @@
 class Vertices;
 class Loads;
 class Nodes;
-class DataSet;
 class Inputs;
+#include "./DataSet.h"
 #include "../shared/Numerics/types.h"
 
 /*!\brief Declaration of Parameters class.  

../trunk-jpl/src/c/Container/DataSet.cpp

@@ -285 +285 @@
 
         return 1;
 }/*}}}*/
-template <class doubletype> DataSet* ExpRead(char* domainname){ /*{{{*/
-
-        /*intermediary: */
-        int                  nprof;
-        int                 *profnvertices = NULL;
-        doubletype         **pprofx        = NULL;
-        doubletype         **pprofy        = NULL;
-
-        /*output: */
-        DataSet *domain = NULL;
-
-        /*If domainname is an empty string, return empty dataset*/
-        if (strcmp(domainname,"")==0){
-                nprof=0;
-        }
-        else{
-                ExpRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
-        }
-
-        /*now create dataset of contours: */
-        domain=new DataSet(0);
-
-        for(int i=0;i<nprof;i++){
-                domain->AddObject(new Contour<doubletype>(i,profnvertices[i],pprofx[i],pprofy[i],1));
-        }
-        return domain;
-} /*}}}*/

../trunk-jpl/src/c/Container/DataSet.h

@@ -2 +2 @@
 #define _CONTAINER_DATASET_H_
 
 #include <vector>
+#include <cstring>
+#include "../classes/objects/Contour.h"
 
 /*forward declarations */
 class Object;
@@ -61 +63 @@
 
 /*Methods that relate to datasets: */
 int ExpWrite(DataSet* contours,char* domainname);
-template <class doubletype> DataSet* ExpRead(char* domainname);
+template <class doubletype> DataSet* ExpRead(char* domainname){ /*{{{*/
 
+        /*intermediary: */
+        int                  nprof;
+        int                 *profnvertices = NULL;
+        doubletype         **pprofx        = NULL;
+        doubletype         **pprofy        = NULL;
+
+        /*output: */
+        DataSet *domain = NULL;
+
+        /*If domainname is an empty string, return empty dataset*/
+        if (strcmp(domainname,"")==0){
+                nprof=0;
+        }
+        else{
+                ExpRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
+        }
+
+        /*now create dataset of contours: */
+        domain=new DataSet(0);
+
+        for(int i=0;i<nprof;i++){
+                domain->AddObject(new Contour<doubletype>(i,profnvertices[i],pprofx[i],pprofy[i],1));
+        }
+        return domain;
+} /*}}}*/
+
 #endif

../trunk-jpl/src/c/toolkits/mpi/mpiincludes.h

@@ -5 +5 @@
 #ifndef _MPI_INCLUDES_H_
 #define _MPI_INCLUDES_H_
 
+#ifdef HAVE_CONFIG_H
+        #include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+#ifdef _HAVE_MPI_
+
 /*MPI includes: */
 #include <mpi.h>
 
 /*Patches: */
 #include "./patches/mpipatches.h"
+#endif
 
 #endif

../trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

@@ -9 +9 @@
 #endif
 
 #include "./matlabio.h"
+#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 
 /*Primitive data types*/