max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

mpi.h needs to be defined first because of a conflict with stdio (SEEK_SET ifdef).

Browse Source 
output.h is needed for NameDouble mpi version.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3886 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2009-12-09 17:35:19 +00:00
parent 7dbc8d0632
commit d850641336
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NameDouble.cxx
View File

@ -20,6 +20,7 @@
#include "Dictionary.h" #include "Dictionary.h"
#include "phqalloc.h" #include "phqalloc.h"
#include "phrqproto.h" #include "phrqproto.h"
#include "output.h"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Construction/Destruction // Construction/Destruction
@ -477,7 +478,7 @@ cxxNameDouble::mpi_pack(std::vector < int >&ints,
} }
} }
void void
cxxNameDouble::mpi_pack(int *ints, int *ii, double *doubles, int *dd) cxxNameDouble::mpi_pack(PHREEQC_PTR_ARG_COMMA int *ints, int *ii, double *doubles, int *dd)
{ {
int i = *ii; int i = *ii;
int d = *dd; int d = *dd;
@ -490,7 +491,7 @@ cxxNameDouble::mpi_pack(int *ints, int *ii, double *doubles, int *dd)
if (n < 0) if (n < 0)
{ {
std::cerr << it->first << std::endl; std::cerr << it->first << std::endl;
error_msg("Name in NameDouble was not defined in dictionary?\n", P_INSTANCE_POINTER error_msg("Name in NameDouble was not defined in dictionary?\n",
STOP); STOP);
} }
//ints.push_back(n); //ints.push_back(n);

2
NameDouble.h
View File

@ -73,7 +73,7 @@ class cxxNameDouble:public
} }
void void
mpi_pack(std::vector < int >&ints, std::vector < double >&doubles); mpi_pack(PHREEQC_PTR_ARG_COMMA std::vector < int >&ints, std::vector < double >&doubles);
void void
mpi_pack(int *ints, int *ii, double *doubles, int *dd); mpi_pack(int *ints, int *ii, double *doubles, int *dd);

5
Solution.cxx
View File

@ -4,13 +4,14 @@
#ifdef _DEBUG #ifdef _DEBUG
#pragma warning(disable : 4786) // disable truncation warning (Only used by debugger) #pragma warning(disable : 4786) // disable truncation warning (Only used by debugger)
#endif #endif
#include <cassert> // assert
#include <algorithm> // std::sort
#ifdef USE_MPI #ifdef USE_MPI
//MPICH seems to require mpi.h to be first //MPICH seems to require mpi.h to be first
#include <mpi.h> #include <mpi.h>
#endif #endif
#include <cassert> // assert
#include <algorithm> // std::sort
#include "Utils.h" // define first #include "Utils.h" // define first
#if !defined(PHREEQC_CLASS) #if !defined(PHREEQC_CLASS)
#define EXTERNAL extern #define EXTERNAL extern

8
StorageBin.cxx
View File

@ -4,15 +4,15 @@
#ifdef _DEBUG #ifdef _DEBUG
#pragma warning(disable : 4786) // disable truncation warning (Only used by debugger) #pragma warning(disable : 4786) // disable truncation warning (Only used by debugger)
#endif #endif
#ifdef USE_MPI
//MPICH seems to require mpi.h to be first
#include <mpi.h>
#endif
#include <fstream> #include <fstream>
#include <iostream> // std::cout std::cerr #include <iostream> // std::cout std::cerr
#include <cassert> // assert #include <cassert> // assert
#include <algorithm> // std::sort #include <algorithm> // std::sort
#ifdef USE_MPI
//MPICH seems to require mpi.h to be first
#include <mpi.h>
#endif
#include "Utils.h" // define first #include "Utils.h" // define first
#if !defined(PHREEQC_CLASS) #if !defined(PHREEQC_CLASS)
#define EXTERNAL extern #define EXTERNAL extern