Merge branch 'master' into mix_error

usgs-coupled · Jan 4, 2025 · 4bb7b85 · 4bb7b85
2 parents 12879c2 + 8891a6a
commit 4bb7b85
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 ..."
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     #
@@ Expand Down @@