10 Commits

Author SHA1 Message Date
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
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
81009f8570 added GetVersionString
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8153 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-01 04:20:31 +00:00
Scott R Charlton
c12969725a added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8007 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-05 06:38:25 +00:00
David L Parkhurst
b11bb4a3e1 functions are fcn
Added cookie to c callback.



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7895 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-08 19:53:31 +00:00
David L Parkhurst
dc6d21b5ae Revised name to BasicFortran
Added methods for C call SetBasicCallback.

Need to check C side and documentation.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7884 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-05 20:53:54 +00:00
David L Parkhurst
21ca300721 Added a Fortran callback.
Will try to revise so that the same callback works for Fortran and C.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7883 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-05 18:56:31 +00:00
Scott R Charlton
ebb8ceda99 added additional FORTRAN wrappers for different External Procedure conventions
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6643 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-07 05:27:48 +00:00