Changeset 14957


Ignore:
Timestamp:
05/08/13 09:48:54 (12 years ago)
Author:
Eric.Larour
Message:

CHG: fixed missing include files and some dependencies.

Location:
issm/trunk-jpl/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r14953 r14957  
    286286        return 1;
    287287}/*}}}*/
    288 template <class doubletype> DataSet* ExpRead(char* domainname){ /*{{{*/
    289 
    290         /*intermediary: */
    291         int                  nprof;
    292         int                 *profnvertices = NULL;
    293         doubletype         **pprofx        = NULL;
    294         doubletype         **pprofy        = NULL;
    295 
    296         /*output: */
    297         DataSet *domain = NULL;
    298 
    299         /*If domainname is an empty string, return empty dataset*/
    300         if (strcmp(domainname,"")==0){
    301                 nprof=0;
    302         }
    303         else{
    304                 ExpRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
    305         }
    306 
    307         /*now create dataset of contours: */
    308         domain=new DataSet(0);
    309 
    310         for(int i=0;i<nprof;i++){
    311                 domain->AddObject(new Contour<doubletype>(i,profnvertices[i],pprofx[i],pprofy[i],1));
    312         }
    313         return domain;
    314 } /*}}}*/

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

    r14953 r14957  
    33
    44#include <vector>
     5#include <cstring>
     6#include "../classes/objects/Contour.h"
    57
    68/*forward declarations */
    … …  
    6264/*Methods that relate to datasets: */
    6365int ExpWrite(DataSet* contours,char* domainname);
    64 template <class doubletype> DataSet* ExpRead(char* domainname);
     66template <class doubletype> DataSet* ExpRead(char* domainname){ /*{{{*/
     67
     68        /*intermediary: */
     69        int                  nprof;
     70        int                 *profnvertices = NULL;
     71        doubletype         **pprofx        = NULL;
     72        doubletype         **pprofy        = NULL;
     73
     74        /*output: */
     75        DataSet *domain = NULL;
     76
     77        /*If domainname is an empty string, return empty dataset*/
     78        if (strcmp(domainname,"")==0){
     79                nprof=0;
     80        }
     81        else{
     82                ExpRead(&nprof,&profnvertices,&pprofx, &pprofy, NULL,domainname);
     83        }
     84
     85        /*now create dataset of contours: */
     86        domain=new DataSet(0);
     87
     88        for(int i=0;i<nprof;i++){
     89                domain->AddObject(new Contour<doubletype>(i,profnvertices[i],pprofx[i],pprofy[i],1));
     90        }
     91        return domain;
     92} /*}}}*/
    6593
    6694#endif

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

    r14953 r14957  
    1212class Loads;
    1313class Nodes;
    14 class DataSet;
    1514class Inputs;
     15#include "./DataSet.h"
    1616#include "../shared/Numerics/types.h"
    1717

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

    r14912 r14957  
    66#define _MPI_INCLUDES_H_
    77
     8#ifdef HAVE_CONFIG_H
     9        #include <config.h>
     10#else
     11#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
     12#endif
     13
     14#ifdef _HAVE_MPI_
     15
    816/*MPI includes: */
    917#include <mpi.h>
    … …  
    1119/*Patches: */
    1220#include "./patches/mpipatches.h"
     21#endif
    1322
    1423#endif

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

    r14377 r14957  
    1010
    1111#include "./matlabio.h"
     12#include "../../c/Container/Container.h"
    1213#include "../../c/shared/shared.h"
    1314
Note: See TracChangeset for help on using the changeset viewer.