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
2,281 Commits 6 Branches 4 Tags
Commit Graph

2281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
459c77562a added missing fortran routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4257 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-14 23:07:01 +00:00
Scott R Charlton
671f38ff97 re-added src/fwrap.cpp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4253 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-14 04:22:59 +00:00
Scott R Charlton
5c22665a1f merged in IPhreeqc-class 4140-4239 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4251 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-14 04:10:37 +00:00
Scott R Charlton
c0f7528bf5 Added support for dll run time libraries 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4239 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-09 04:22:42 +00:00
Scott R Charlton
611d6fc59a added underscores 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4230 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-08 00:52:26 +00:00
Scott R Charlton
3ec05f6dda added GetWarningLineCount GetWarningLine for fortran 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4229 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-08 00:37:39 +00:00
Scott R Charlton
95e46c1659 git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4227 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2010-04-08 00:26:48 +00:00
Scott R Charlton
7499d8f14d removed module_files.h module_files.cpp module_output.cpp FInterface.for 
renamed IPhreeqc2 to IPhreeqc



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4226 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 22:59:00 +00:00
Scott R Charlton
7728a79b35 renamed IPhreeqc2.h to IPhreeqc.hpp 
renamed IPhreeqc2.cpp to IPhreeqc.cpp

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4225 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 22:13:33 +00:00
Scott R Charlton
a9e0a887fd renamed *2 routines without the 2 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4224 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 21:41:55 +00:00
Scott R Charlton
1daa55e41c renamed *M routines without the M 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4223 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 21:30:49 +00:00
Scott R Charlton
094d4c0684 Renamed IPhreeqcLib.h to IPhreeqc.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4221 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 20:52:16 +00:00
Scott R Charlton
2d8f7e0e51 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4219 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 00:51:52 +00:00
Scott R Charlton
d64227b546 renamed return values IPL_ to IPQ_ 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4214 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-06 21:50:37 +00:00
Scott R Charlton
7ca9917f8d Remove from unit: 
TestInterface.cpp
	TestInterface.h
		IPhreeqc.hpp
		IPhreeqc.h
		IPhreeqc.cpp
		module_output.cpp
		module_files.cpp
		fwrap.cpp
		fwrap2.cpp
		fwrap3.cpp
		IPhreeqc.cpp
		CVar.hxx
		ErrorReporter.hxx
		OutputFiles.hxx
		Phreeqc.hxx
		PhreeqcParser.hxx
		SelectedOutput.hxx
		Var.h
Remove from IPhreeqc
	IPhreeqc.cpp
	IPhreeqc.h
	IPhreeqc.hpp
	module_output.cpp
	module_files.cpp


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4213 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-06 20:56:38 +00:00
Scott R Charlton
0a15d767a5 Remove from unit: 
TestInterface.cpp
	TestInterface.h
		IPhreeqc.hpp
		IPhreeqc.h
		IPhreeqc.cpp
		module_output.cpp
		module_files.cpp
		fwrap.cpp
		fwrap2.cpp
		fwrap3.cpp
		IPhreeqc.cpp
		CVar.hxx
		ErrorReporter.hxx
		OutputFiles.hxx
		Phreeqc.hxx
		PhreeqcParser.hxx
		SelectedOutput.hxx
		Var.h
Remove from IPhreeqc
	IPhreeqc.cpp
	IPhreeqc.h
	IPhreeqc.hpp
	module_output.cpp
	module_files.cpp


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4213 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-06 20:56:38 +00:00
Scott R Charlton
44cd787d98 Added TestRunString to cunit 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4211 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-05 22:38:14 +00:00
Scott R Charlton
f8d6737e83 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4210 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-03 03:57:22 +00:00
Scott R Charlton
c48a3533d7 RunF => RunAccumulatedF 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4202 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-02 00:43:29 +00:00
Scott R Charlton
adcd44474b passes all tests on win32; before changing to multiple instances 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4201 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-02 00:14:16 +00:00
Scott R Charlton
803eda0a67 passes all tests on win32; before changing to multiple instances 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4201 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-02 00:14:16 +00:00
David L Parkhurst
8db3c1ac28 Added prototypes to class for Basic functions: 
total_mole
iso_value
iso_unit


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4198 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-29 22:15:30 +00:00
Scott R Charlton
4d050487e4 added prototypes for dump routines; added ostream header 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4197 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-29 21:56:51 +00:00
Scott R Charlton
91ccdfab2f Working on Create and Destroy methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4187 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-23 22:29:50 +00:00
Scott R Charlton
09aa7f357e renamed Run to RunAccumulated; fixed RunString for fortran wrappers fwrap2 and fwrap3 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4186 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-23 22:25:37 +00:00
Scott R Charlton
5249f4be2a Reduced risk during low memory conditions of error message handling 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4185 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-23 21:20:51 +00:00
Scott R Charlton
14e1791753 git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4184 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2010-03-23 21:05:40 +00:00
Scott R Charlton
761c7de03e Added getter methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4182 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-20 02:50:03 +00:00
Scott R Charlton
f7a93a0240 changed .c extensions to .cpp extensions for the following files: 
fwrap.c
fwrap2.c
fwrap3.c
module_files.c
module_output.c
pp_sys.c

updated unit test for GetComponent


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4180 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-19 23:39:37 +00:00
David L Parkhurst
7e52b0c345 Did not pick up redox species from solution. 
Do not include H and O here.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4175 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-19 01:00:01 +00:00
Scott R Charlton
507f5dc891 Added GETCOMPONENTCOUNT and GETCOMPONENT fortran routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4174 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-19 00:57:37 +00:00
Scott R Charlton
ffb8ee86be moved list_components from class_main.cpp to Phreeqc.cpp 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4173 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 23:57:42 +00:00
Scott R Charlton
714570975e moved list_components from class_main.cpp to Phreeqc.cpp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4173 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 23:57:42 +00:00
David L Parkhurst
4eb0dbc99b list_components method to extract complete list of elements in all solutions, equilibrium_phases, etc that are currently defined within the object. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4171 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 20:48:39 +00:00
Scott R Charlton
650e24ed1b fixed empty string bugs and added tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4168 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 04:39:55 +00:00
Scott R Charlton
a22a6db097 need to test on linux 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4165 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 03:21:45 +00:00
Scott R Charlton
da893cd778 need to test on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4165 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 03:21:45 +00:00
Scott R Charlton
4a1f9aa373 cleaned up fwrap.c 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4162 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-12 06:15:35 +00:00
Scott R Charlton
37359f2ec7 checkin to test on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4159 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-12 04:05:27 +00:00
Scott R Charlton
59e3083acd changes reqd to compile on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4150 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-06 04:55:37 +00:00
Scott R Charlton
4d34613b6e added memory header file 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4148 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-05 23:29:40 +00:00
Scott R Charlton
ab21478cd7 updated windows.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4147 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-05 23:27:10 +00:00
David L Parkhurst
9ed87e33ad std header files added. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4146 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-05 23:00:20 +00:00
Scott R Charlton
4b793aa95f Updated for IPhreeqc to use PHREEQC_CPP and PHREEQC_CLASS. Currently doesn't include gmp. MemDebug project still needs work. Needs to be tested on linux. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4145 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-05 21:20:09 +00:00
Scott R Charlton
e245f8afa0 Updated for IPhreeqc to use PHREEQC_CPP and PHREEQC_CLASS. Currently doesn't include gmp. MemDebug project still needs work. Needs to be tested on linux. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4145 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-05 21:20:09 +00:00
David L Parkhurst
4ddc83581c Added equilibrium_phase keyword to Phreeqc.cpp constructor 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4116 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-02-23 19:32:06 +00:00
Scott R Charlton
e180be69b0 Rearranging IPhreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4106 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-02-23 05:04:35 +00:00
David L Parkhurst
81717e1878 Removing zero editing. 
Adding all files from phreeqc using ../database




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4039 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-02-10 22:47:02 +00:00
David L Parkhurst
ef4a5b530e Before modification to use standard database files, 
shorten run times, and limit output.





git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4038 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-02-10 21:04:30 +00:00
David L Parkhurst
5e23f440df Made pressurs a synonym of total_p in gas_phase_modify. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4011 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-02-05 17:11:16 +00:00