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

working on autotools

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4273 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-04-21 04:49:32 +00:00
parent 9f60df9126
commit e96f30ec73
6 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -1,4 +1,5 @@
# Subdirectories to descend into.
ACLOCAL_AMFLAGS = -I m4
if BUILD_FORTRAN
FORTRAN_DIRS = test
@ -6,5 +7,4 @@ else
FORTRAN_DIRS =
endif
SUBDIRS = src $(FORTRAN_DIRS) testcpp
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src tests

2
configure.ac
View File

@ -44,6 +44,6 @@ AC_PROG_LIBTOOL
# Checks for library functions.
AC_CONFIG_FILES([Makefile src/Makefile test/Makefile testcpp/Makefile])
AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile tests/phreeqc.dat tests/ex1 test/Makefile])
AC_OUTPUT

3
include/IPhreeqc.h
View File

@ -1,7 +1,6 @@
#ifndef INC_IPHREEQC_H
#define INC_IPHREEQC_H
#include <map>
#include "Var.h"
#if defined(_WINDLL)
@ -23,8 +22,6 @@ typedef enum {
} IPQ_RESULT;
class IPhreeqc;
#if defined(__cplusplus)
extern "C" {
#endif

2
src/IPhreeqc.cpp
View File

@ -99,10 +99,12 @@ int IPhreeqc::output_handler(const int type, const char *err_str, const int stop
this->AddError("ERROR: ");
this->AddError(err_str);
this->AddError("\n");
#if 0
if (stop == STOP)
{
this->AddError("Stopping.\n");
}
#endif
}
break;

1
src/IPhreeqcF.f
View File

@ -43,7 +43,6 @@
SUBROUTINE OutputLastError(ID)
IMPLICIT NONE
INTEGER :: ID
WRITE(*,*) "fortran OutputLastError ID = ", ID
CALL OutputLastErrorF(ID)
END SUBROUTINE OutputLastError
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

6
src/IPhreeqcLib.cpp
View File

@ -1,7 +1,9 @@
#include "IPhreeqc.h"
#include "IPhreeqc.hpp"
#include <cassert>
#include <iostream>
#include <map>
#include "IPhreeqc.h"
#include "IPhreeqc.hpp"
class IPhreeqcLib
{