Merge commit '50073d4cfba1d3bcde6da914b8cbeefd7ece4944'

phreeqc3-doc/.gitlab-ci.yml

@@ -2,7 +2,7 @@
 # https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-doc
 # SRC 2020-01-28T10:03:39-07:00
 #
-image: buildpack-deps:bionic-scm
+image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm
 
 stages:
   - trigger

phreeqc3-doc/RELEASE.TXT

@@ -1,5 +1,38 @@
 Version @PHREEQC_VER@: @PHREEQC_DATE@
- 
+
+  	----------------
+	November 24, 2020
+	----------------
+	PHREEQC: Added new Basic functions to control USER_PUNCH output.
+	
+	EOL_NOTAB$ omits the tab that is normally printed after EOL$.
+	NO_NEWLINE$ omits the new line normally written after printing 
+	            a USER_PUNCH block. This function can be used to completely
+				eliminate a line for a cell (assuming no SELECTED_OUTPUT fields
+				are defined.
+				
+				Example:
+USER_PUNCH 2
+100  IF (STEP_NO = 2 OR STEP_NO = 4) THEN GOTO 200
+110    PUNCH NO_NEWLINE$
+120    GOTO 300
+200 REM
+210   PUNCH TC, TK, EOL_NOTAB$
+220   PUNCH TK, TC
+300 END
+				
+	IPhreeqc: Added new Basic function ADD_HEADING to append a new heading to the list
+	          of -headings defined in USER_PUNCH. The function returns the total
+			  number of headings. This function is only helpful when using IPhreeqc.
+			  
+			  Example:
+ USER_PUNCH 2
+-heading A
+10  if (GET(999) > 0) THEN GOTO 100 # define only once
+20  n = ADD_HEADING("B")
+30  PUT(999,1)
+100 REM
+
   	----------------
 	August 17, 2020
 	----------------
@@ -34,6 +67,16 @@ Version @PHREEQC_VER@: @PHREEQC_DATE@
 	An error message will result if, for example, EQUILIBRIUM_PHASES is modified
 	to remove the phase that EXCHANGE is related to. 
 	
+ 	----------------
+	July 22, 2020
+	----------------
+	PhreeqcRM: Added new method PhreeqcRM::SetErrorOn(bool tf). This method controls
+	whether error messages are written or not. A value of true will print error 
+	messages; false will eliminate error messages. Print control (PhreeqcRM's 
+	PHRQ_io::Set_error_on) is set for the PhreeqcRM instance and for each of the 
+	IPhreeqc workers (each worker's PHRQ_io::Set_error_on). Messages include 
+	PHREEQC "ERROR" messages, and any messages written with PhreeqcRM::ErrorMessage.
+	
  	----------------
 	June 7, 2020
 	----------------