diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | phreeqc.el | 21 |
3 files changed, 21 insertions, 12 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Fri Dec 11 17:58:20 UTC 2015 pkgbase = phreeqc pkgdesc = PHREEQC - A Computer Program for Speciation, Batch-Reaction, One-Dimensional Transport, and Inverse Geochemical Calculations pkgver = 3.3.3 - pkgrel = 1 + pkgrel = 2 url = http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc/ install = install.sh arch = i686 @@ -13,7 +15,7 @@ pkgbase = phreeqc source = https://raw.githubusercontent.com/jaalto/project-emacs--folding-mode/master/folding.el md5sums = b4b1f11e5855d3b034473ec51c76f7cc md5sums = 8facd6e784cd1985b2c57c092b753002 - md5sums = 198df23100e18efddc1aa7b5fec393b4 + md5sums = 81a6827b2d0d1d2675cbf4e117095208 md5sums = d262512bd4a19a68805914d35f8f9019 pkgname = phreeqc @@ -2,7 +2,7 @@ pkgname=phreeqc pkgver=3.3.3 _pkgsvn=10424 -pkgrel=1 +pkgrel=2 pkgdesc="PHREEQC - A Computer Program for Speciation, Batch-Reaction, One-Dimensional Transport, and Inverse Geochemical Calculations" arch=('i686' 'x86_64') url="http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc/" @@ -25,12 +25,12 @@ source=("ftp://brrftp.cr.usgs.gov/pub/charlton/phreeqc/phreeqc-$pkgver-$_pkgsvn. "https://raw.githubusercontent.com/jaalto/project-emacs--folding-mode/master/folding.el") md5sums=('b4b1f11e5855d3b034473ec51c76f7cc' '8facd6e784cd1985b2c57c092b753002' - '198df23100e18efddc1aa7b5fec393b4' + '81a6827b2d0d1d2675cbf4e117095208' 'd262512bd4a19a68805914d35f8f9019') build() { cd "$srcdir/$pkgname-$pkgver-$_pkgsvn" - ./configure --prefix=/usr/bin + ./configure --prefix=/usr make -j8 CCFLAGS="-O3 -Wall -ansi -pedantic -DHAVE_ISFINITE -DNDEBUG -mtune=native" } diff --git a/phreeqc.el b/phreeqc.el index d670bfccad8f..93366e4708da 100644 --- a/phreeqc.el +++ b/phreeqc.el @@ -141,18 +141,25 @@ (defconst phreeqc-block-re (regexp-opt '("ADVECTION" "CALCULATE_VALUES" "CALC_VALUE" "COPY" "DATABASE" "DELETE" "DUMP" "END" - "EQUILIBRIUM_PHASES" "EXCHANGE" "EXCHANGE_MASTER_SPECIES" - "EXCHANGE_SPECIES" "GAS_PHASE" "INCLUDE$" + "EQUILIBRIUM_PHASES" "EQUILIBRIUM_PHASES_MODIFY" "EQUILIBRIUM_PHASES_RAW" + "EXCHANGE" "EXCHANGE_MODIFY" "EXCHANGE_RAW" "EXCHANGE_MASTER_SPECIES" + "EXCHANGE_SPECIES" "GAS_PHASE" "GAS_PHASE_MODIFY" "GAS_PHASE_RAW" + "INCLUDE$" "INCREMENTAL_REACTIONS" "INVERSE_MODELING" "ISOTOPES" "ISOTOPES_ALPHAS" "ISOTOPES_RATIOS" - "KINETICS" "KNOBS" "LLNL_AQUEOUS_MODEL_PARAMETERS" + "KINETICS" "KINETICS_MODIFY" "KINETICS_RAW" "KNOBS" + "LLNL_AQUEOUS_MODEL_PARAMETERS" "MIX" "NAMED_EXPRESSIONS" "PHASES" "PITZER" "PRINT" - "RATES" "REACTION" "REACTION_PRESSURE" - "REACTION_TEMPERATURE" "RUN_CELLS" + "RATES" "REACTION" "REACTION_MODIFY" "REACTION_RAW" + "REACTION_PRESSURE" "REACTION_PRESSURE_RAW" + "REACTION_TEMPERATURE" "REACTION_TEMPERATURE_RAW" "RUN_CELLS" "SAVE" "SELECTED_OUTPUT" "SIT" "SOLID_SOLUTIONS" - "SOLUTION" "SOLUTION_MASTER_SPECIES" + "SOLID_SOLUTIONS_MODIFY" "SOLID_SOLUTIONS_RAW" + "SOLUTION" "SOLUTION_MODIFY" "SOLUTION_RAW" + "SOLUTION_MASTER_SPECIES" "SOLUTION_SPECIES" "SOLUTION_SPREAD" - "SURFACE" "SURFACE_MASTER_SPECIES" + "SURFACE" "SURFACE_MODIFY" "SURFACE_RAW" + "SURFACE_MASTER_SPECIES" "SURFACE_SPECIES" "TITLE" "TRANSPORT" "USE" "USER_GRAPH" "USER_PRINT" "USER_PUNCH" "Read input data for simulation"))) |