diff --git a/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat b/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat index 1006f59b..02b98dc6 100644 --- a/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat +++ b/database/OtherDatabases/CEMDATA18-31-03-2022-phaseVol.dat @@ -24,7 +24,7 @@ SOLUTION_MASTER_SPECIES # -# elemen species alk gfw_formula element_gfw atomic number +# element species alk gfw_formula element_gfw atomic number # diff --git a/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat b/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat index c27d0cd5..37a27609 100644 --- a/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat +++ b/database/OtherDatabases/CEMDATA18.1-16-01-2019-phaseVol.dat @@ -22,7 +22,7 @@ SOLUTION_MASTER_SPECIES # -# elemen species alk gfw_formula element_gfw atomic number +# element species alk gfw_formula element_gfw atomic number # diff --git a/database/OtherDatabases/CEMDATA18.dat b/database/OtherDatabases/CEMDATA18.dat index 80be5ba5..961964fc 100644 --- a/database/OtherDatabases/CEMDATA18.dat +++ b/database/OtherDatabases/CEMDATA18.dat @@ -18,7 +18,7 @@ SOLUTION_MASTER_SPECIES # -# elemen species alk gfw_formula element_gfw atomic number +# element species alk gfw_formula element_gfw atomic number # diff --git a/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat b/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat index 0e6c024f..23d30410 100644 --- a/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat +++ b/database/OtherDatabases/PSINA_12_07_110615_DAV_s_win.dat @@ -61,7 +61,7 @@ SOLUTION_MASTER_SPECIES # # # -# elemen species alk gfw_formula element_gfw atomic Disposition Source of data +# element species alk gfw_formula element_gfw atomic Disposition Source of data # number PMATCHC # H H+ -1.0 H 1.008 # 1 Ele NAGRA NTB 91-17 diff --git a/jenkins-phreeqc-dist.sh b/jenkins-phreeqc-dist.sh index c64b9b2b..14732897 100755 --- a/jenkins-phreeqc-dist.sh +++ b/jenkins-phreeqc-dist.sh @@ -162,8 +162,10 @@ fi VERSION_LONG="$ver_major.$ver_minor.$ver_patch.$REVISION_SVN" SED_FILES="$DISTPATH/configure.ac \ + $DISTPATH/phreeqc_version.h \ $DISTPATH/doc/README.Phreeqc.TXT \ - $DISTPATH/doc/RELEASE.TXT" + $DISTPATH/doc/RELEASE.TXT \ + $DISTPATH/src/class_main.cpp" for vsn_file in $SED_FILES do @@ -191,7 +193,7 @@ done mv $DISTPATH/doc/RELEASE.TXT $DISTPATH/doc/RELEASE mv $DISTPATH/doc/README.Phreeqc.TXT $DISTPATH/doc/README mv $DISTPATH/doc/NOTICE.TXT $DISTPATH/doc/NOTICE -mv $DISTPATH/HTMLversion/phreeqc3.chm $DISTPATH/doc/phreeqc3.chm +mv $DISTPATH/HTMLversion/phreeqc3.chm $DISTPATH/doc/phreeqc3.chm # if [ -n "$WIN" ]; then # echo "Rolling $DISTNAME.zip ..."