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
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
Added INVERSE_CL1MP guard to cl1mp.cpp;
Added test for ex10
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9084 1feff8c3-07ed-0310-ac33-dd36852eb9cd
'make check' -> 'R CMD check --as-cran' which produces (cran/)phreeqc.Rcheck/phreeqc-Ex.R
and is checked in as leak-Ex.R (only includes the phrGetErrorStrings example).
run using:
R -d "valgrind --tool=memcheck --leak-check=full" --vanilla < leak-Ex.R
and running the full set of examples:
R -d "valgrind --tool=memcheck --leak-check=full" --vanilla < (cran/)phreeqc.Rcheck/phreeqc-Ex.R
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8844 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Thanks.
Closer inspection reveals two more issues.
* Many files have
* Copyright (c) 2002, The Regents of the University of California *
* Produced at the Lawrence Livermore National Laboratory *
That is not mentioned in the DESCRIPTION file, and hence fails to comply
with the Policy's
The ownership of copyright and intellectual property rights of all
components of the package must be clear and unambiguous (including
from the authors specification in the DESCRIPTION file). Where code is
copied (or derived) from the work of others (including from R itself),
care must be taken that any copyright/license statements are preserved
and authorship is not misrepresented.
Where copyrights are held by an entity other than the authors, the
Authors@R field can be used, or a Copyright field (if necessary
referring to an inst/COPYRIGHTS file).
* The original license was
* Redistribution and use in source and binary forms, with or without *
* modification, are permitted provided that the following conditions *
* are met: *
* *
* 1. Redistributions of source code must retain the above copyright *
* notice, this list of conditions and the disclaimer below. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the disclaimer (as noted below) *
* in the documentation and/or other materials provided with the *
* distribution. *
* *
* 3. Neither the name of the UC/LLNL nor the names of its contributors *
* may be used to endorse or promote products derived from this software *
* without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS *
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE *
* REGENTS OF THE UNIVERSITY OF CALIFORNIA, THE U.S. DEPARTMENT OF ENERGY *
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, *
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, *
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY *
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE *
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
and we would guess that clauses 2 and 3 are not covered by basic GPL-3,
and hence needs this to be restricted.
So to be on the safe side, you should use
GPL-3 + file LICENSE
with file LICENSE explaining that certain parts are covered by the above
license, and then give the license.
Best
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8808 1feff8c3-07ed-0310-ac33-dd36852eb9cd
ligges@statistik.tu-dortmund.de
After internal discussion:
Assuming that SUNDIALS is really BSD-3-clause (please confirm):
1. BSD-3-clause is known to be compatible with GPL-3.
2. You LICENSE template is perhaps not appropriate, as it
only relates to the foreign code.
3. What we need is one license for the package which could be GPL-3 given your LICENSE.note and our interpretation is correct, but we do not give legal advice here.
So we think the only reasonable solution is to have the package under
GPL-3 only. I.e.,
License: GPL-3
and then remove files LICENSE and LICENSE.note.
But be careful to kep all copyright statement and really list all the authors of the material included in your package.
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8780 1feff8c3-07ed-0310-ac33-dd36852eb9cd
