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
359 Commits 6 Branches 4 Tags
Commit Graph

359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
3cfce822e4 added safe_close to log_ostream; fixed segv for selected output 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10121 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-20 00:29:23 +00:00
Scott R Charlton
c365511480 added reqd changes to compile on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10112 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-19 06:06:08 +00:00
David L Parkhurst
b20b71f383 Added public when inheriting from std::exception (IPhreeqcStop and PhreeqcRMStop). 
Rewrote dump to parallelized the dump_raw part.

More zlib changes for PhreeqcRM project.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10107 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-19 00:32:49 +00:00
David L Parkhurst
4a4d22f675 safe closed streams in IPhreeqc; set subsystem to console in order to stop after non-debug; set worker phrq_io error_ostream to std:cerr. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10089 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 22:41:27 +00:00
David L Parkhurst
65e8272554 Catch std::exception 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10087 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 13:11:41 +00:00
David L Parkhurst
33aa0bc2cc Add errprt in steady flow. 
Some changes in solution files, 
IPhreeqc catch std::exception and print meaning.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10086 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-17 13:05:39 +00:00
Scott R Charlton
97c36acb6f commmon -> common 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10058 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:38:22 +00:00
Scott R Charlton
fc8e97a89c added common directory for Parser/PHRQ_base/PHRQ_io/phrqtype/Utils 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10056 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:29:22 +00:00
Scott R Charlton
dd683b3f57 bug fix for dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9723 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-26 07:48:17 +00:00
Scott R Charlton
ee9fee4c7d unifying with CMake build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9722 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-26 07:24:57 +00:00
Scott R Charlton
64be11d988 unifying CMake and configure builds 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9720 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-26 06:21:06 +00:00
Scott R Charlton
0e89139fc4 added missing fwrap.h/fwrap.cpp to EXTRA_DIST 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9717 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-22 03:50:48 +00:00
Scott R Charlton
dff4ad69cc added comment 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9716 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-22 02:33:33 +00:00
Scott R Charlton
b2dd4ee652 updated SetBasicFortranCallback for fortran module 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9715 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-22 01:12:48 +00:00
Scott R Charlton
196ceb8b75 install src 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9711 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-21 21:49:18 +00:00
Scott R Charlton
2ae685b72e added inc files to dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9698 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-21 00:14:13 +00:00
David L Parkhurst
33b3fc6140 working on print/punch processing issue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9657 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-14 19:45:41 +00:00
Scott R Charlton
067b4c2403 fixed mismatched intents warning 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9643 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-12 22:52:34 +00:00
David L Parkhurst
2f2e7000c3 removed minimal rebuild in solution. 
added implicit none for all subroutine, functions, and interfaces.
removed unused variables (commented).
added explicit definitions for any variables missing declarations.
rewrote integers used as logical
ended do loops with a continue statement
fixed error with ch_basin_permil_ET in phreeq_mms.f90
Disabled some Fortran diagnostics
Fixed error in change of module for xdebug_start, xdebug_stop


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9474 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-07 17:26:35 +00:00
David L Parkhurst
6c199ffc46 len=l for callback fortran string. 
Made basic callback string a "const" in 8 places.


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9463 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-02 22:59:33 +00:00
Scott R Charlton
9d64d8e692 added missing file for CMake 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9444 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-01 01:51:54 +00:00
David L Parkhurst
51044518b7 Close to having Basic callback working. 
Need to test Fortran, C, and C++.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9437 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-31 21:39:10 +00:00
David L Parkhurst
81d91ff357 length argument needed for callback. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9435 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-30 18:38:56 +00:00
David L Parkhurst
b66d8cf775 Working on IPhreeqc Basic callback. Compiles with ISO_C_BINDING, but may need some more debugging. 
Need to merge this change with PhreeqcRM-trunk.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9424 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-27 22:03:36 +00:00
Scott R Charlton
acdfbdb8a3 changed NO_IPHREEQC_FORTRAN_MODULE to IPHREEQC_NO_FORTRAN_MODULE 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9376 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-18 06:26:07 +00:00
Scott R Charlton
0e1aa78cf8 working fortran 2003 builds 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9369 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-17 03:15:22 +00:00
Scott R Charlton
f1dcd36005 working on fortran/test integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9360 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-14 01:17:56 +00:00
David L Parkhurst
6c002b22d8 removed FC_FUNC from IPhreeqc_interface_F.h, fixed padfstring to use int sofar 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9357 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-13 18:34:10 +00:00
David L Parkhurst
8f85adcf3b Tested all phast3 configurations on ex4. 
Changed default logic to write xyz only for count_chem cells.
   If NEW_STYLE_XYZ is defined, then xyz file contains nxyz cells.

write2_2.f90 changed to USE IPhreeqc
write5.f90 changed to USE IPhreeqc

TestRM advection_f90.F90 changed to USE IPhreeqc
TestRM species_f90.F90 changed to USE IPhreeqc

FortranAdvect.vfproj: IPhreeqc.f90.inc removed and IPhreeqc_interface.F90 added.

PhreeqcRM.vcxproj, PhreeqcRM.vcxproj.filters: fwrap files removed and IPhreeqc_interface_F.cpp added

phast3.vcxproj: added or corrected postbuild copy of zlib1, hdf5dll, and szlibdll.dll.
   removed OLD_STYLE_XYZ (logically it is now the default for xyz file).
   removed dead preprocessor definitions PHREEQC_CPP, MERGE_FILES, GZIP_RESTART, OMPI_IMPORTS

phastf.vfproj: removed IPhreeqc.f90.inc added IPhreeqc_interface.F90.

fwrap files are compiled if #ifdef IPHREEQC_NO_FORTRAN_MODULE

IPhreeqc_interface.F90 compiled if #ifndef IPHREEQC_NO_FORTRAN_MODULE
   fixed bug intent(inout) should have been intent(in) (constant character argument).
   fixed interfaces for SetBasicFortranCallback

IPhreeqc_interface_F.cpp compiled if #ifndef IPHREEQC_NO_FORTRAN_MODULE

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9356 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-13 16:40:25 +00:00
Scott R Charlton
8f6dd6f405 updated for PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9355 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-13 06:14:19 +00:00
David L Parkhurst
548bf128e2 Made IPhreeqc a Fortran module when IPHREEQC_MODULE is defined. 
fwrap routines are used if IPHREEQC_MODULE is not defined.
If IPHREEQC_MODULE is defined, then IPhreeqc_interface.F90 defines the Fortran Module.
    compile it with the user Fortran code.
IPhreeqc_interface_F.cpp is a modification of fwrap.cpp, which the Fortran Module functions call.
IPhreeqc_interface_F.h is a modification of fwrap.h used only by IPhreeqc_interface_F.cpp.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9347 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-11 16:18:41 +00:00
Scott R Charlton
866b2bed2c changed the following in order to pass make check on linux 
#ifdef _DEBUG
  this->OutputFileOn = false;
#endif

to

#if !defined(NDEBUG)
  this->OutputFileOn = false;
#endif



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9292 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-02-20 05:49:48 +00:00
David L Parkhurst
2230ec1c76 cast size_t to (unsinged int) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9262 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-02-10 22:57:14 +00:00
Scott R Charlton
aaa5f5a41b reformatted for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9204 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-27 04:22:10 +00:00
Scott R Charlton
15210fab7a fixed f2cstring error that occurred when given an empty string 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9203 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-27 01:59:34 +00:00
Scott R Charlton
d63f351aac added fimpl.h to dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9191 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-01-21 03:24:27 +00:00
Scott R Charlton
dfa6995253 removed vs2008 directory and props 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9144 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-12-20 06:30:17 +00:00
David L Parkhurst
149271ce62 working on vs2008 soln/projs 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9143 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-12-20 00:07:41 +00:00
David L Parkhurst
885ebce401 Fixed Linux errors 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9140 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-12-19 17:58:29 +00:00
Scott R Charlton
9752764f20 added fwrap1.cpp to Makefile.am 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9052 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-11-07 06:03:19 +00:00
Scott R Charlton
205ec749ef minor reformatting; added some ignore directories; added missing RMimpl.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9033 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-11-03 23:44:04 +00:00
Scott R Charlton
845c118da4 seems that having padfstring receiving unsigned int fixes gfortran x64 problem 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9027 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-10-31 04:54:01 +00:00
David L Parkhurst
b0124be70c Made native 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9024 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-10-30 22:00:37 +00:00
Scott R Charlton
6a4760abd6 changed all fortran string length parameters to be size_t 
simplified fortran wrappers for windows


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-10-29 01:59:37 +00:00
Scott R Charlton
202e29cb8e made catch(...) always rethrow; 
changed catches to const references


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8905 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-08-05 02:42:09 +00:00
Scott R Charlton
9800894e5f set but not used 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8826 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-09 23:52:45 +00:00
Scott R Charlton
13a7a2b874 updated for R defines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8697 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-05-01 04:26:23 +00:00
Scott R Charlton
31bc3bbf65 cleaned up some signed/unsigned comparison warnings 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8696 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-05-01 04:22:46 +00:00
Scott R Charlton
392f48a9ed removed unused buffer 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8695 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-05-01 04:22:08 +00:00
Scott R Charlton
6bf0c693db changes req'd for R 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8685 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-29 23:29:30 +00:00