11 Commits

Author SHA1 Message Date
Charlton, Scott R
00816dc695 [iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9) 2023-01-14 22:14:20 -07:00
Charlton, Scott R
e221f73ce7 implemented Get/SetErrorOn 2020-08-25 12:17:54 -06:00
Charlton, Scott R
9029c2bcba added changes from email dated 2020-07-15 2020-07-15 18:56:06 -06:00
Scott Charlton
c88ff034bc Fixed -Wcatch-value warnings reported by CRAN 2019-01-29 16:04:01 -08:00
Scott R Charlton
d9b02af0e0 added optional fortran argument to GetSelectedOutputValue for the string length
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10767 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-30 00:21:32 +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
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
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
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