14 Commits

Author SHA1 Message Date
Charlton, Scott R
dd058e3bec 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 R Charlton
bd84d2a56f added code to initialize slength to zero for Fortran GetSelectedOutputValue
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10768 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-30 01:24:53 +00: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
Scott R Charlton
092c766abd commented out save from module
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10237 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-09-11 00:42:47 +00:00
Richard M Webb
662293d37f Appears that variables are not initialized with each call, and previous values are persistent.
Set all true/false variables to 0 to make sure they are initialized.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10231 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-09-10 17:54:45 +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
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
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
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