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

updated for linux

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4210 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-04-03 03:57:22 +00:00
parent c48a3533d7
commit f8d6737e83
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IPhreeqc2.cpp
View File

@ -1,13 +1,11 @@
#include "IPhreeqc2.h" #include "IPhreeqc2.h"
#include "Phreeqc.h" // Phreeqc
// COMMENT: {3/25/2010 7:28:15 PM}#define protected public #include <cassert> // assert
#include "Phreeqc.h" /* Phreeqc */ #include <memory> // auto_ptr
// COMMENT: {3/25/2010 7:28:18 PM}#undef protected #include "ErrorReporter.hxx" // CErrorReporter
#include "SelectedOutput.hxx" // CSelectedOutput
#include <cassert> #include "dumper.h" // dumper
#include "ErrorReporter.hxx"
#include "SelectedOutput.hxx"
#include "dumper.h"
int istream_getc(void *cookie); int istream_getc(void *cookie);
@ -22,16 +20,16 @@ const char LOG_FILENAME[] = "phreeqc.log";
const char PUNCH_FILENAME[] = "selected.out"; const char PUNCH_FILENAME[] = "selected.out";
IPhreeqc2::IPhreeqc2(void) IPhreeqc2::IPhreeqc2(void)
: ErrorReporter(0) : DatabaseLoaded(false)
, WarningReporter(0)
, SelectedOutput(0)
, DatabaseLoaded(false)
, SelectedOutputOn(false) , SelectedOutputOn(false)
, OutputOn(false) , OutputOn(false)
, LogOn(false) , LogOn(false)
, ErrorOn(false) , ErrorOn(false)
, DumpOn(false) , DumpOn(false)
, DumpStringOn(false) , DumpStringOn(false)
, ErrorReporter(0)
, WarningReporter(0)
, SelectedOutput(0)
, PhreeqcPtr(0) , PhreeqcPtr(0)
{ {
this->ErrorReporter = new CErrorReporter<std::ostringstream>; this->ErrorReporter = new CErrorReporter<std::ostringstream>;

19
IPhreeqcF.F
View File

@ -51,16 +51,16 @@
AccumulateLine = AccumulateLineF(LINE) AccumulateLine = AccumulateLineF(LINE)
END FUNCTION AccumulateLine END FUNCTION AccumulateLine
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION Run(OUTPUT_ON, ERROR_ON, LOG_ON, SELECTED_ON) FUNCTION RunAccumulated(OUTPUT_ON, ERROR_ON, LOG_ON, SELECTED_ON)
IMPLICIT NONE IMPLICIT NONE
LOGICAL :: OUTPUT_ON LOGICAL :: OUTPUT_ON
LOGICAL :: ERROR_ON LOGICAL :: ERROR_ON
LOGICAL :: LOG_ON LOGICAL :: LOG_ON
LOGICAL :: SELECTED_ON LOGICAL :: SELECTED_ON
INTEGER :: Run INTEGER :: RunAccumulated
#if defined(_WIN32) #if defined(_WIN32)
INTERFACE INTERFACE
FUNCTION RunF(OUTPUT_ON, ERROR_ON, LOG_ON, SELECTED_ON) FUNCTION RunAccumulatedF(OUTPUT_ON, ERROR_ON, LOG_ON, SELECTED_ON)
!DEC$ ATTRIBUTES C,REFERENCE::RunF !DEC$ ATTRIBUTES C,REFERENCE::RunF
!DEC$ ATTRIBUTES ALIAS:'_RunF'::RunF !DEC$ ATTRIBUTES ALIAS:'_RunF'::RunF
LOGICAL(KIND=4) :: OUTPUT_ON LOGICAL(KIND=4) :: OUTPUT_ON
@ -68,13 +68,14 @@
LOGICAL(KIND=4) :: LOG_ON LOGICAL(KIND=4) :: LOG_ON
LOGICAL(KIND=4) :: SELECTED_ON LOGICAL(KIND=4) :: SELECTED_ON
INTEGER(KIND=4) :: RunF INTEGER(KIND=4) :: RunF
END FUNCTION RunF END FUNCTION RunAccumulatedF
END INTERFACE END INTERFACE
#else #else
INTEGER :: RunF INTEGER :: RunAccumulatedF
#endif #endif
Run = RunF(OUTPUT_ON, ERROR_ON, LOG_ON, SELECTED_ON) RunAccumulated = RunAccumulatedF(OUTPUT_ON, ERROR_ON,
END FUNCTION Run & LOG_ON, SELECTED_ON)
END FUNCTION RunAccumulated
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION RunFile(FILENAME,OUTPUT_ON,ERROR_ON,LOG_ON,SELECTED_ON) FUNCTION RunFile(FILENAME,OUTPUT_ON,ERROR_ON,LOG_ON,SELECTED_ON)
IMPLICIT NONE IMPLICIT NONE
@ -161,7 +162,6 @@
REAL*8 :: DVALUE REAL*8 :: DVALUE
CHARACTER(LEN=*) :: SVALUE CHARACTER(LEN=*) :: SVALUE
INTEGER :: GetSelectedOutputValue INTEGER :: GetSelectedOutputValue
INTEGER :: adjcol
#if defined(_WIN32) #if defined(_WIN32)
INTERFACE INTERFACE
FUNCTION Get(ROW,COL,VTYPE,DVALUE,SVALUE) FUNCTION Get(ROW,COL,VTYPE,DVALUE,SVALUE)
@ -179,9 +179,8 @@
GetSelectedOutputValue = Get(ROW,adjcol,VTYPE,DVALUE,SVALUE) GetSelectedOutputValue = Get(ROW,adjcol,VTYPE,DVALUE,SVALUE)
#else #else
INTEGER :: GetSelectedOutputValueF INTEGER :: GetSelectedOutputValueF
adjcol = col - 1
GetSelectedOutputValue = GetSelectedOutputValueF(ROW, GetSelectedOutputValue = GetSelectedOutputValueF(ROW,
& adjcol,VTYPE,DVALUE,SVALUE) & COL,VTYPE,DVALUE,SVALUE)
#endif #endif
END FUNCTION GetSelectedOutputValue END FUNCTION GetSelectedOutputValue
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

3
fwrap.cpp
View File

@ -2,6 +2,7 @@
#include <stdlib.h> /* malloc */ #include <stdlib.h> /* malloc */
#include <memory.h> /* memcpy */ #include <memory.h> /* memcpy */
#include <assert.h> /* assert */ #include <assert.h> /* assert */
#include <stdio.h> /* sprintf */
#include "phrqtype.h" #include "phrqtype.h"
#include "IPhreeqc.h" #include "IPhreeqc.h"
@ -257,7 +258,7 @@ GetSelectedOutputValueF(int *row, int *col, int *vtype, double* dvalue, char* sv
case TT_LONG: case TT_LONG:
*vtype = TT_DOUBLE; *vtype = TT_DOUBLE;
*dvalue = (double)v.lVal; *dvalue = (double)v.lVal;
::sprintf(buffer, "%d", v.lVal); ::sprintf(buffer, "%ld", v.lVal);
padfstring(svalue, buffer, svalue_length); padfstring(svalue, buffer, svalue_length);
break; break;
case TT_DOUBLE: case TT_DOUBLE: