diff --git a/src/.gitlab-ci.yml b/src/.gitlab-ci.yml index 436f26da..ec6bb5c9 100644 --- a/src/.gitlab-ci.yml +++ b/src/.gitlab-ci.yml @@ -116,10 +116,13 @@ trigger-downstream: script: - echo triggering iphreeqc - curl -X POST -F token=${IPHREEQC_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${IPHREEQC_ID}/trigger/pipeline + - sleep 180 - echo triggering iphreeqccom - curl -X POST -F token=${IPHREEQCCOM_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${IPHREEQCCOM_ID}/trigger/pipeline + - sleep 120 - echo triggering phreeqcrm-src - curl -X POST -F token=${PHREEQCRM_SRC_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${PHREEQCRM_SRC_ID}/trigger/pipeline + - sleep 120 ## Upstream Projects ## phreeqc3-src https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src diff --git a/src/phreeqcpp/.gitlab-ci.yml b/src/phreeqcpp/.gitlab-ci.yml index dd622b85..542d5f8b 100644 --- a/src/phreeqcpp/.gitlab-ci.yml +++ b/src/phreeqcpp/.gitlab-ci.yml @@ -106,8 +106,10 @@ trigger-downstream: script: - echo triggering iphreeqc-src - curl -X POST -F token=${IPHREEQC_SRC_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${IPHREEQC_SRC_ID}/trigger/pipeline + - sleep 120 - echo triggering phreeqc3 - curl -X POST -F token=${PHREEQC3_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${PHREEQC3_ID}/trigger/pipeline + - sleep 360 ## Upstream Projects ## phreeqc3-src-common https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src-common diff --git a/src/phreeqcpp/Phreeqc.h b/src/phreeqcpp/Phreeqc.h index 9881c015..4173da56 100644 --- a/src/phreeqcpp/Phreeqc.h +++ b/src/phreeqcpp/Phreeqc.h @@ -1593,6 +1593,12 @@ protected: int initial_solution_isotopes; std::vector calculate_value; std::map calculate_value_map; +public: + std::map& GetCalculateValueMap() + { + return this->calculate_value_map; + } +protected: std::vector isotope_ratio; std::map isotope_ratio_map; std::vector isotope_alpha; diff --git a/src/phreeqcpp/common/.gitlab-ci.yml b/src/phreeqcpp/common/.gitlab-ci.yml index 6487156b..484920a0 100644 --- a/src/phreeqcpp/common/.gitlab-ci.yml +++ b/src/phreeqcpp/common/.gitlab-ci.yml @@ -39,8 +39,10 @@ trigger-downstream: script: - echo triggering phreeqc3-src - curl -X POST -F token=${PHREEQC3_SRC_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${PHREEQC3_SRC_ID}/trigger/pipeline + - sleep 120 - echo triggering wphast - curl -X POST -F token=${WPHAST_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${WPHAST_ID}/trigger/pipeline + - sleep 180 ## Upstream Projects ## none diff --git a/src/phreeqcpp/encode_as_utf8.sh b/src/phreeqcpp/encode_as_utf8.sh new file mode 100755 index 00000000..7894d1e8 --- /dev/null +++ b/src/phreeqcpp/encode_as_utf8.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# see https://en.wikipedia.org/wiki/Windows-1252 +iconv --to-code=UTF-8 --from-code=WINDOWS-1252 print.cpp > print.utf-8.cpp +if grep -q '^// -\*- coding: windows-1252 -\*-$' print.utf-8.cpp; then + sed -i '1d' print.utf-8.cpp +fi diff --git a/src/phreeqcpp/encode_as_windows1252.sh b/src/phreeqcpp/encode_as_windows1252.sh new file mode 100755 index 00000000..cdc6b675 --- /dev/null +++ b/src/phreeqcpp/encode_as_windows1252.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# see https://en.wikipedia.org/wiki/Windows-1252 +# and https://en.wikipedia.org/wiki/ISO/IEC_8859 +iconv --to-code=WINDOWS-1252 --from-code=UTF-8 print.cpp > print.windows-1252.cpp +grep -q '^// -\*- coding: windows-1252 -\*-$' print.windows-1252.cpp \ + || echo '// -*- coding: windows-1252 -*-' | cat - print.windows-1252.cpp > print.tmp.cpp \ + && mv print.tmp.cpp print.windows-1252.cpp \ No newline at end of file diff --git a/src/phreeqcpp/print.cpp b/src/phreeqcpp/print.cpp index e32714e9..f93d8299 100644 --- a/src/phreeqcpp/print.cpp +++ b/src/phreeqcpp/print.cpp @@ -1,4 +1,3 @@ -// -*- coding: windows-1252 -*- #include "Utils.h" #include "Phreeqc.h" #include "phqalloc.h" @@ -1462,7 +1461,7 @@ print_species(void) "Molality", "Activity", "Molality", "Activity", "Gamma", "cm3/mol")); #else output_msg(sformatf(" %-13s%12s%12s%10s%10s%10s%11s\n\n", "Species", - "Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol")); + "Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol")); #endif /* * Print list of species @@ -1630,7 +1629,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("\t%11.3e sigma, C/m2\n", #else - output_msg(sformatf("\t%11.3e sigma, C/m²\n", + output_msg(sformatf("\t%11.3e sigma, C/m²\n", #endif (double) (charge * F_C_MOL / (charge_ptr->Get_specific_area() * @@ -1641,7 +1640,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("\tundefined sigma, C/m2\n")); #else - output_msg(sformatf("\tundefined sigma, C/m²\n")); + output_msg(sformatf("\tundefined sigma, C/m²\n")); #endif } if (use.Get_surface_ptr()->Get_type() == cxxSurface::CCM) @@ -1663,7 +1662,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e specific area, m2/mol %s\n", #else - "\t%11.3e specific area, m²/mol %s\n", + "\t%11.3e specific area, m²/mol %s\n", #endif (double) charge_ptr->Get_specific_area(), comp_ptr->Get_phase_name().c_str())); @@ -1671,7 +1670,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e m2 for %11.3e moles of %s\n\n", #else - "\t%11.3e m² for %11.3e moles of %s\n\n", + "\t%11.3e m² for %11.3e moles of %s\n\n", #endif (double) (charge_ptr->Get_grams() * charge_ptr->Get_specific_area()), @@ -1684,7 +1683,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e specific area, m2/mol %s\n", #else - "\t%11.3e specific area, m²/mol %s\n", + "\t%11.3e specific area, m²/mol %s\n", #endif (double) charge_ptr->Get_specific_area(), comp_ptr->Get_rate_name().c_str())); @@ -1692,7 +1691,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e m2 for %11.3e moles of %s\n\n", #else - "\t%11.3e m² for %11.3e moles of %s\n\n", + "\t%11.3e m² for %11.3e moles of %s\n\n", #endif (double) (charge_ptr->Get_grams() * charge_ptr->Get_specific_area()), @@ -1705,13 +1704,13 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e specific area, m2/g\n", #else - "\t%11.3e specific area, m²/g\n", + "\t%11.3e specific area, m²/g\n", #endif (double) charge_ptr->Get_specific_area())); #ifdef NO_UTF8_ENCODING output_msg(sformatf("\t%11.3e m2 for %11.3e g\n\n", #else - output_msg(sformatf("\t%11.3e m² for %11.3e g\n\n", + output_msg(sformatf("\t%11.3e m² for %11.3e g\n\n", #endif (double) (charge_ptr->Get_specific_area() * charge_ptr->Get_grams()), @@ -1926,28 +1925,28 @@ print_surface_cd_music(void) #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, plane 0, C/m2\n", #else - "\t%11.3e sigma, plane 0, C/m²\n", + "\t%11.3e sigma, plane 0, C/m²\n", #endif (double) charge_ptr->Get_sigma0())); output_msg(sformatf( #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, plane 1, C/m2\n", #else - "\t%11.3e sigma, plane 1, C/m²\n", + "\t%11.3e sigma, plane 1, C/m²\n", #endif (double) charge_ptr->Get_sigma1())); output_msg(sformatf( #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, plane 2, C/m2\n", #else - "\t%11.3e sigma, plane 2, C/m²\n", + "\t%11.3e sigma, plane 2, C/m²\n", #endif (double) charge_ptr->Get_sigma2())); output_msg(sformatf( #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, diffuse layer, C/m2\n\n", #else - "\t%11.3e sigma, diffuse layer, C/m²\n\n", + "\t%11.3e sigma, diffuse layer, C/m²\n\n", #endif (double) charge_ptr->Get_sigmaddl())); } @@ -1956,7 +1955,7 @@ print_surface_cd_music(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("\tundefined sigma, C/m2\n")); #else - output_msg(sformatf("\tundefined sigma, C/m²\n")); + output_msg(sformatf("\tundefined sigma, C/m²\n")); #endif } output_msg(sformatf("\t%11.3e psi, plane 0, V\n", @@ -2215,7 +2214,7 @@ print_totals(void) "Specific Conductance (uS/cm, ", tc_x, "oC) = ", (int) SC)); #else output_msg(sformatf("%35s%3.0f%7s%i\n", - "Specific Conductance (µS/cm, ", tc_x, "°C) = ", (int) SC)); + "Specific Conductance (µS/cm, ", tc_x, "°C) = ", (int) SC)); #endif } /* VP: Density Start */ @@ -2225,7 +2224,7 @@ print_totals(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("%45s%9.5f", "Density (g/cm3) = ", #else - output_msg(sformatf("%45s%9.5f", "Density (g/cm³) = ", + output_msg(sformatf("%45s%9.5f", "Density (g/cm³) = ", #endif (double) dens)); if (state == INITIAL_SOLUTION && use.Get_solution_ptr()->Get_initial_data()->Get_calc_density()) @@ -2250,7 +2249,7 @@ print_totals(void) " (solute contributions limited to 200 oC)")); #else output_msg(sformatf("%18s\n", - " (solute contributions limited to 200 °C)")); + " (solute contributions limited to 200 °C)")); #endif } else output_msg(sformatf("\n")); @@ -2280,7 +2279,7 @@ print_totals(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("%45s%6.2f\n", "Temperature (oC) = ", #else - output_msg(sformatf("%45s%6.2f\n", "Temperature (°C) = ", + output_msg(sformatf("%45s%6.2f\n", "Temperature (°C) = ", #endif (double) tc_x));