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

531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
ea0d5f0e6d renamed CurrentSelectedOutputUserNumber.c to SetCurrentSelectedOutputUserNumber.c 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8212 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-19 04:44:07 +00:00
Scott R Charlton
a594f0fbcd renamed CurrentSelectedOutputUserNumber.c to SetCurrentSelectedOutputUserNumber.c 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8211 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-19 04:43:18 +00:00
Scott R Charlton
bec88bbeae added example for CurrentSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8210 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-19 04:40:03 +00:00
Scott R Charlton
93bf28600f added strlen header for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8209 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-19 00:30:47 +00:00
Scott R Charlton
8a9f638e1a Added extra check in IPhreeqc::GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8195 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-16 06:26:16 +00:00
David L Parkhurst
4d54640bfe removed selected_output_names from IPhreeqcPhast. 
Changed array in hdf to a std::vector.
Revised to use new way to write hdf.cpp
   Still just roughed in.
   Does not handle multiple selected output files.
   Probably need to rewrite HDF routines to use C++ or perhaps write in Fortran.
   GetSelectedOutput should be changed to write an nxyz array.
Serial and parallel HDF seem to work.
reaction_module::GetSelectedOutput writes an array with chem_count elements,
   SHOULD be nxyz?
EndTimeStep is now public, should be private.

#define OLD_HDF might work to revert to previous methods.

Added RMHelper.cpp to write the HDF.

CSelectedOutput Doublize fixed EMPTY.


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8182 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-13 22:20:57 +00:00
David L Parkhurst
0b79ed0f2e Working on selected_output. 
Think it is now working serial and maybe parallel to retrieve selected output to root through GetSelectedOutput.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8181 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-08 20:13:14 +00:00
David L Parkhurst
764111d5d3 Working on sending select_output data to root process. 
Have serializerr and deserializer.
Have mpi and thread processing.
Need to write the part that writes the xyz and hdf files.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8179 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-06 23:36:15 +00:00
Scott R Charlton
83886005af updated makefile 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8178 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-06 23:12:50 +00:00
Scott R Charlton
5cf5076dd1 updating documentation for C/Fortran routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8177 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-06 04:05:02 +00:00
Scott R Charlton
e5dcf9b9b0 updated toc for getversionstring; changed single apostrophe to double for fortran example. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8162 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:40:47 +00:00
Scott R Charlton
150970fbdd fixed f90 example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8161 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:31:02 +00:00
Scott R Charlton
54db7172ef removed temporary test 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8160 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:20:55 +00:00
Scott R Charlton
a6288ee4d9 removed old Warning for selected_output and user_print being redefined 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8159 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:12:18 +00:00
Scott R Charlton
5c52b2744f updated f90 version 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8158 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:09:12 +00:00
Scott R Charlton
4b62f6d670 added minor unit testing enhancement 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8157 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 06:45:24 +00:00
Scott R Charlton
f53118406b added doc examples for GetVersionString 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8156 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 06:43:24 +00:00
Scott R Charlton
cb1d6439f9 updated dist.sh for linux dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8155 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 06:41:02 +00:00
Scott R Charlton
a397d2a09d alphabetized libiphreeqc_la_SOURCES and added Version.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8154 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 06:10:29 +00:00
Scott R Charlton
4e28740d56 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
5b9b110386 fixed and added tests for SetSelectedOutputFileName 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8036 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-14 03:46:01 +00:00
Scott R Charlton
83a3be18b8 fixed for debug build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8035 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-14 00:09:41 +00:00
David L Parkhurst
610ed5554b Added river turning into drain in IPhreeqc version of PHAST 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8034 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-13 21:18:23 +00:00
Scott R Charlton
f5bcccafcb updated for (Set)CurrentSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8028 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-13 05:52:16 +00:00
Scott R Charlton
ca9a7a486e added multi example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8026 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-12 04:54:10 +00:00
Scott R Charlton
a44bcec013 updates reqd for vs2010 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-10 22:57:00 +00:00
Scott R Charlton
c2e8112075 whitespace 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8022 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-09 22:08:42 +00:00
Scott R Charlton
5c19837bc5 changed selected.id.out to selected_n.id.out 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8021 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 04:37:05 +00:00
Scott R Charlton
01b94d05d6 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8020 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 03:54:02 +00:00
Scott R Charlton
9829d75af3 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8019 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 03:43:35 +00:00
Scott R Charlton
45073898a9 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8018 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 00:43:29 +00:00
Scott R Charlton
fde4104c34 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8017 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 00:40:15 +00:00
Scott R Charlton
05872a6340 updated for new multi selected output files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8016 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 23:22:12 +00:00
Scott R Charlton
3fa099261f minor changes for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 21:44:07 +00:00
Scott R Charlton
a61511a2fe renamed F90SetBasicCallback.f90 to F90SetBasicFortranCallback.f90 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8014 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 04:29:38 +00:00
Scott R Charlton
93ab13b89d added F90SetBasicCallback.f90 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8013 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 04:25:20 +00:00
Scott R Charlton
1fd4b81bf5 added missing headers for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8012 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 02:16:27 +00:00
Scott R Charlton
c30454c78f formatting 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8011 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 01:47:38 +00:00
Scott R Charlton
9bf00aa48a added SetBasicCallback example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8010 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 01:45:34 +00:00
Scott R Charlton
ce2cfdf6d5 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:39:13 +00:00
Scott R Charlton
ad321ba6e6 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
Scott R Charlton
c40ada60a7 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8006 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:37:29 +00:00
Scott R Charlton
6321adfa4d added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8005 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:35:59 +00:00
Scott R Charlton
8cf3bc7f5f all tests passing on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7991 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 04:05:25 +00:00
Scott R Charlton
2b3c5ff8de all tests passing 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7990 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 03:53:19 +00:00
Scott R Charlton
58ba9e7990 A few tests need to be updated. 
Merged revision(s) 7882-7988 from IPhreeqc/branches/multi_punch:
multi_punch branch

........
Added a Fortran callback.

Will try to revise so that the same callback works for Fortran and C.
........
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@7989 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 23:32:19 +00:00
Scott R Charlton
6101f4f2c1 git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7988 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2013-08-28 23:17:36 +00:00
Scott R Charlton
b97a6552a3 fixed ifdefs for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7985 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 22:00:41 +00:00
Scott R Charlton
3d8d0158ce fixed for phreeqc3-multi-punch; 
passes all unit tests

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7979 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 05:03:26 +00:00
Scott R Charlton
a1f3b4e5f2 Added TestMultiPunchCSelectedOutput routine 
replaced some file tests with FileTest instances

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7978 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 05:01:04 +00:00