215 Commits

Author SHA1 Message Date
Scott R Charlton
5bd2cae399 made catch(...) always rethrow;
changed catches to const references


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8905 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-08-05 02:42:09 +00:00
Scott R Charlton
b3cff55ac9 set but not used
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8826 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-09 23:52:45 +00:00
Scott R Charlton
1ebd3748b5 updated for R defines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8697 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-05-01 04:26:23 +00:00
Scott R Charlton
9eaeda6783 cleaned up some signed/unsigned comparison warnings
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8696 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-05-01 04:22:46 +00:00
Scott R Charlton
260e385b9f removed unused buffer
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8695 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-05-01 04:22:08 +00:00
Scott R Charlton
9a3efd2351 changes req'd for R
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8685 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-04-29 23:29:30 +00:00
Scott R Charlton
d8f65736b0 fixed problem with formatting size_t
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8683 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-04-29 21:38:45 +00:00
Scott R Charlton
071f82574d fixed problem with formatting size_t
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8680 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-04-29 21:22:09 +00:00
Scott R Charlton
926615523e added this specifiers
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8679 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-04-29 04:53:42 +00:00
Scott R Charlton
cc2b4466d2 fixed typo
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8638 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-04-08 23:32:13 +00:00
Scott R Charlton
d7de17c703 first pass @ removing std::cerr, std::cout, exit, stderr, stdout from R version.
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8619 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-04-05 04:14:16 +00:00
Scott R Charlton
66fc23c0cb AccumulatedLines are now cleared after LoadDatabase/LoadDatabaseString/RunFile/RunString.
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8583 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-03-20 05:55:57 +00:00
Scott R Charlton
08d375a3c9 Fixes error that occurs when using the DATABASE keyword with multiple calls RunAccumulated
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8574 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-03-19 06:26:46 +00:00
Scott R Charlton
f03c453eb4 passes all unit tests on windows
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8506 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-20 07:19:05 +00:00
David L Parkhurst
7048a648a0 revised Char2TrimString. Did not work correctly for Fortran.
changed lengths of character buffers to int. Perhaps OK.

Added RM_GetComponentCount to RM_interface_C.cpp.

Through GetFilePrefix in documenting.

Revised Fortran output message.

Missing interface for RM_OutputMessage

Modified tests to use GetFilePrefix, OutputMessage, ErrorMessage, and LogMessage.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8504 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-19 22:16:49 +00:00
Scott R Charlton
946cff1ce3 kinn fix 2014-02-18
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8501 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-19 01:24:38 +00:00
Scott R Charlton
c745dd1aca added missing prototypes and interfaces for fortran
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8494 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-15 07:06:38 +00:00
David L Parkhurst
a64b046058 Concentrations2UtilityH2O
Concentrations2UtilityNoH2O
Number solutions 1-n.

Working on documentation

Revised example use of RM_Concentrations2Utility to calculate pH of a mixture.

Added inc files to project

Added interface SetCurrentSelectedOutputUserNumber to IPhreeqc.f90.inc

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8485 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-12 18:08:11 +00:00
Scott R Charlton
8095eb1487 changed variable name
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8472 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-11 00:24:01 +00:00
Scott R Charlton
3be1ca8d40 Added additional check to LoadDatabase
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8399 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-24 03:46:46 +00:00
Scott R Charlton
d908103d54 changed EOL to native
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8391 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-23 01:31:19 +00:00
David L Parkhurst
7b09eba977 Got ex4 working with MPI.
Added a new RunCellsThreadNoPrint that is about 20% faster when there is no printing of the output file.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8383 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-17 20:32:53 +00:00
David L Parkhurst
9a56d9f8d4 ex4 works with old flow from 8056. Will now try to keep all other changes, but go back to updated flow calculation.
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8380 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-16 17:20:14 +00:00
David L Parkhurst
a3a7720931 Changed Restart file:
Writes a -1 in the index for a solution that has saturation <= 0.
On reading the restart file,
    A kdtree is made for all points that do NOT have solution -1
    A solution is selected from the nearest available solutions for all grid points
      defined to use the restart file (previously ignored -1, which wouldn't
      work either.
Changed doublize to use a vector reference.

Rewrote logic again for a dry cell and CSelectedOutputMap was not defined.
A RunString caused the Selected output map to change, which invalidated my iterator.
New logic makes the dummy run first, then loads the necessary CSelectedOutputMap.
Still has a problem if Selected output has now rows, but added an assert.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8292 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-12-06 17:44:42 +00:00
Scott R Charlton
5086b94ada Added some additional std::map checking
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8288 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-12-06 05:19:34 +00:00
David L Parkhurst
bec792ae89 Only write saturated cells to restart file.
Only write up to nchem not nxyz cells to the restart file (need to reconsider for solids).

Fixed selected output.

remove asserts in doubleize

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8287 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-12-06 01:04:33 +00:00
Scott R Charlton
0b6695be8f Added some assertions; optimized GetSelectedOutputValue; added some multi selected-output tests
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8285 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-12-05 23:59:31 +00:00
David L Parkhurst
ed49fe9309 Still working on selected output.
Moved DumpModule

Fixed logic in InitialPhreeqc2Concentrations
Fixed logic in cxxStorageBin::read_raw

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8283 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-12-05 22:22:58 +00:00
Scott R Charlton
a0ddc0a7ce added multi_punch example
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8225 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-22 00:58:25 +00:00
Scott R Charlton
9c964753b9 updated for SetCurrentSelectedOutputUserNumber
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8224 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-22 00:45:17 +00:00
Scott R Charlton
b930bb631e added example for GetNthSelectedOutputUserNumber/SetCurrentSelectedOutputUserNumber
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8214 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-19 05:19:27 +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
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
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
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
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
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
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
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