max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
827 Commits 6 Branches 4 Tags
Commit Graph

827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
c6e2d523b6 IPHREEQC_BUILD_FORTRAN -> IPHREEQC_FORTRAN_TESTING 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9627 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 23:31:16 +00:00
Scott R Charlton
eddbfcf3fa fixed typo 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9626 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 23:17:56 +00:00
Scott R Charlton
8a0135a67c made all Makefile.am always have linux line endings 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9625 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 23:05:18 +00:00
Scott R Charlton
962a42e2a7 updated to create zip 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9624 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 22:35:01 +00:00
Scott R Charlton
8ae197af66 added NAME var to dist.sh 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9623 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 21:49:41 +00:00
Scott R Charlton
08a900399e made configure.ac always linux formatted 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9621 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 21:39:12 +00:00
Scott R Charlton
81ffd3158e working on windwos dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9620 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 21:35:16 +00:00
Scott R Charlton
e73aa3ac73 fixed crash that occurred when sit.dat was loaded twice 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9512 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-14 00:43:12 +00:00
Scott R Charlton
20b75597b6 added ../src/phreeqcpp/PhreeqcKeywords to include path 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9510 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-14 00:38:01 +00:00
David L Parkhurst
0046094905 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
Scott R Charlton
a4653c1b19 working cmake build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9465 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-03 08:43:18 +00:00
Scott R Charlton
00f434dca9 enabled iphreeqc cmake to be standalone 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9464 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-03 00:05:24 +00:00
David L Parkhurst
f31a2c2679 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
40c8ebdae6 Parallel compile 
removed 2008 file, replaced with 2012 file

Revised character definitions to remove "*" usage.

Removed comma separator in write statements.

Eliminated some diagnostics.

Excluded dw.cpp

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9453 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-01 23:45:29 +00:00
David L Parkhurst
5b157ab847 Updated to revised IPhreeqc using Fortran module (USE IPhreeqc) instead of include file. 
Updated keywords file locations.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9451 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-01 21:28:33 +00:00
Scott R Charlton
599603aaff 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
Scott R Charlton
ba8c433e6a adding CMake files for dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9443 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-01 01:37:35 +00:00
Scott R Charlton
e881a4f001 updated doxygen files and added silent rules for compiles 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9442 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-01 01:18:15 +00:00
David L Parkhurst
0fbbf16cba 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
099e2fe058 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
28e2eefe78 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
666c533ada missing version in html 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9419 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-27 05:09:04 +00:00
Scott R Charlton
108738e00e added module extension test 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9381 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-19 02:57:36 +00:00
Scott R Charlton
4f7854de09 works with doxygen 1.8.6 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9380 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-19 00:03:47 +00:00
Scott R Charlton
af29de47e8 type=user doesn't seem work with doxygen 1.6.1 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9379 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-18 23:17:59 +00:00
Scott R Charlton
206f5bc8a7 working on fortran module 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9378 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-18 22:03:19 +00:00
Scott R Charlton
595bac559d renamed test_f90.f90 to test_f90.F90 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9377 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-18 06:35:23 +00:00
Scott R Charlton
4719145a03 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
41de90a475 fixed AM_PROG_AR 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9370 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-17 03:57:20 +00:00
Scott R Charlton
9db51aae38 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
28f75ed56c updated for PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9368 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 22:18:25 +00:00
Scott R Charlton
0d6cba6ca7 updated for PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9367 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 22:05:20 +00:00
Scott R Charlton
4ced95f362 PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9366 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 21:32:37 +00:00
Scott R Charlton
fb2a597b12 PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9365 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 21:32:17 +00:00
Scott R Charlton
169c0d39ad works with cmake 2.8.12.1 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-14 02:49:01 +00:00
Scott R Charlton
b2ff3d5205 updated for PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9362 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-14 02:48:20 +00:00
Scott R Charlton
13c3a32e13 working on fortran/test integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9361 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-14 01:24:18 +00:00
Scott R Charlton
68cb2cc5e5 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
Scott R Charlton
613c643952 updated for CLR on VS2010 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9359 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-13 21:44:58 +00:00
David L Parkhurst
21b38a9779 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
1709dc7c2b 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
3770b76f8c 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
Scott R Charlton
bae6f83b59 Display error message if CLR and MSVC < 2010 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9354 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-12 22:55:16 +00:00
Scott R Charlton
9d4836d413 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9353 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-12 22:26:17 +00:00
Scott R Charlton
2a611c219d working on cmake build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9352 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-12 21:55:06 +00:00
David L Parkhurst
92f0ac92aa 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
5f878fe396 updated for Keywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9344 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-10 21:51:55 +00:00
Scott R Charlton
6db24c4ddf 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
9e8433dd5b 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
d67163bf5e 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