max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed encoding from utf-8 to windows-1252

Browse Source
This commit is contained in:
Charlton, Scott R 2021-08-31 18:45:34 -06:00
parent 4750442170
commit 6666afd6c4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtest/TestIPhreeqc.cpp
View File

@ -1,3 +1,4 @@
// -*- coding: windows-1252 -*-
#include <gtest/gtest.h>
#include <cmath>
@ -2250,7 +2251,7 @@ TEST(TestIPhreeqc, TestSetOutputFileName)
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Mass of water (kg) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Total alkalinity (eq/kg) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Total CO2 (mol/kg) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Temperature (°C) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Temperature (°C) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Electrical balance (eq) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Percent error, 100*(Cat-|An|)/(Cat+|An|) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Iterations = ") != NULL);
@ -2260,7 +2261,7 @@ TEST(TestIPhreeqc, TestSetOutputFileName)
ASSERT_TRUE(::strstr(lines[line++].c_str(), "----------------------------Distribution of species----------------------------") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Log Log Log mole V") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Species Molality Activity Molality Activity Gamma cm³/mol") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Species Molality Activity Molality Activity Gamma cm³/mol") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " OH- ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " H+ ") != NULL);

5
gtest/TestIPhreeqcLib.cpp
View File

@ -1,3 +1,4 @@
// -*- coding: windows-1252 -*-
#include <gtest/gtest.h>
#include "IPhreeqc.h"
@ -2467,7 +2468,7 @@ TEST(TestIPhreeqcLib, TestSetOutputFileName)
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Mass of water (kg) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Total alkalinity (eq/kg) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Total CO2 (mol/kg) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Temperature (°C) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Temperature (°C) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Electrical balance (eq) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Percent error, 100*(Cat-|An|)/(Cat+|An|) = ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Iterations = ") != NULL);
@ -2477,7 +2478,7 @@ TEST(TestIPhreeqcLib, TestSetOutputFileName)
ASSERT_TRUE(::strstr(lines[line++].c_str(), "----------------------------Distribution of species----------------------------") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Log Log Log mole V") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Species Molality Activity Molality Activity Gamma cm³/mol") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " Species Molality Activity Molality Activity Gamma cm³/mol") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " OH- ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), " H+ ") != NULL);