16 Commits

Author SHA1 Message Date
Darth Vader
3e3c063083 Squashed 'src/' changes from 7bae85a3..51eedbc2
51eedbc2 Fix typos

git-subtree-dir: src
git-subtree-split: 51eedbc27a828ff36a1ca732abea394e7f7f32bd
2024-12-06 00:27:53 +00:00
Scott R Charlton
202e29cb8e 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
9800894e5f 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
13a7a2b874 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
31bc3bbf65 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
6bf0c693db 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
David L Parkhurst
81c4f2c995 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
2627ccca15 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
David L Parkhurst
cb2160c0d7 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
David L Parkhurst
a7f2845bfd 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
5612684966 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
David L Parkhurst
7eda614aac 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
cfe3d9d988 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
c3dbe39d24 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
4221c4bdb8 updates for renaming SelectedOutput to CSelectedOutput
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7926 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-13 21:41:54 +00:00
Scott R Charlton
35cc8edceb renamed SelectedOutput to CSelectedOutput
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7925 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-13 21:30:41 +00:00