From e7326214b2c573346cf01b1189cc4ab673b2018f Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Tue, 24 Nov 2020 14:09:28 -0700 Subject: [PATCH 1/3] Added EOL_NOTAB$ and NO_NEWLINE$, updated release notes --- RELEASE.TXT | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/RELEASE.TXT b/RELEASE.TXT index 2eb55825..0a017cf2 100644 --- a/RELEASE.TXT +++ b/RELEASE.TXT @@ -34,6 +34,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 ---------------- From 6227f660bfd80c3f7418c5452a9fd2d841e54957 Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Tue, 24 Nov 2020 20:50:05 -0700 Subject: [PATCH 2/3] added ADD_HEADING for IPhreeqc --- RELEASE.TXT | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/RELEASE.TXT b/RELEASE.TXT index 0a017cf2..40f4d5f2 100644 --- a/RELEASE.TXT +++ b/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 ---------------- From 50073d4cfba1d3bcde6da914b8cbeefd7ece4944 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Tue, 1 Dec 2020 15:33:48 -0700 Subject: [PATCH 3/3] [phreeqc3] updated image location --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 704ba16a..e26d92d5 100644 --- a/.gitlab-ci.yml +++ b/.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