diff --git a/include/cantera/clib/ct.h b/include/cantera/clib/ct.h index 90e36333e4..c42c2e1d03 100644 --- a/include/cantera/clib/ct.h +++ b/include/cantera/clib/ct.h @@ -66,7 +66,7 @@ extern "C" { CANTERA_CAPI size_t thermo_elementIndex(int n, const char* nm); CANTERA_CAPI size_t thermo_speciesIndex(int n, const char* nm); //! @since Changed signature in %Cantera 3.1 - CANTERA_CAPI int thermo_report3(int nth, int show_thermo, double threshold, int ibuf, char* buf); + CANTERA_CAPI int thermo_report(int nth, int show_thermo, double threshold, int ibuf, char* buf); CANTERA_CAPI int thermo_print(int nth, int show_thermo, double threshold); CANTERA_CAPI double thermo_nAtoms(int n, size_t k, size_t m); CANTERA_CAPI int thermo_addElement(int n, const char* name, double weight); @@ -182,7 +182,7 @@ extern "C" { CANTERA_CAPI int ct_setLogCallback(LogCallback writer); CANTERA_CAPI int ct_addCanteraDirectory(size_t buflen, const char* buf); //! @since Changed signature in %Cantera 3.1 - CANTERA_CAPI int ct_getDataDirectories3(const char* sep, int buflen, char* buf); + CANTERA_CAPI int ct_getDataDirectories(const char* sep, int buflen, char* buf); CANTERA_CAPI int ct_getCanteraVersion(int buflen, char* buf); CANTERA_CAPI int ct_getGitCommit(int buflen, char* buf); CANTERA_CAPI int ct_suppress_thermo_warnings(int suppress); diff --git a/interfaces/dotnet/Cantera/src/DataDirectoryCollection.cs b/interfaces/dotnet/Cantera/src/DataDirectoryCollection.cs index bbbf301ebf..1d89c71971 100644 --- a/interfaces/dotnet/Cantera/src/DataDirectoryCollection.cs +++ b/interfaces/dotnet/Cantera/src/DataDirectoryCollection.cs @@ -17,7 +17,7 @@ unsafe static IEnumerable GetDirs() return InteropUtil .GetString(500, (size, buffer) => - LibCantera.ct_getDataDirectories3(sep.ToString(), size, buffer)) + LibCantera.ct_getDataDirectories(sep.ToString(), size, buffer)) .Split(sep) .Select(d => new DirectoryInfo(d)); } diff --git a/interfaces/matlab_experimental/Base/ThermoPhase.m b/interfaces/matlab_experimental/Base/ThermoPhase.m index a25012227b..9e7e7c7fc7 100644 --- a/interfaces/matlab_experimental/Base/ThermoPhase.m +++ b/interfaces/matlab_experimental/Base/ThermoPhase.m @@ -980,7 +980,7 @@ function display(tp) if nargin < 2 threshold = 1e-14; end - str = ctString('thermo_report3', tp.tpID, 1, threshold); + str = ctString('thermo_report', tp.tpID, 1, threshold); end function n = get.speciesNames(tp) diff --git a/interfaces/matlab_experimental/Utility/ctDataDirectories.m b/interfaces/matlab_experimental/Utility/ctDataDirectories.m index f4e1ad97cf..b6b6a86324 100644 --- a/interfaces/matlab_experimental/Utility/ctDataDirectories.m +++ b/interfaces/matlab_experimental/Utility/ctDataDirectories.m @@ -9,5 +9,5 @@ % Cell array with strings representing the data file search directories ctIsLoaded; - d = ctString('ct_getDataDirectories3', ';'); + d = ctString('ct_getDataDirectories', ';'); end diff --git a/src/clib/ct.cpp b/src/clib/ct.cpp index 3b14a70ac4..2acd86856b 100644 --- a/src/clib/ct.cpp +++ b/src/clib/ct.cpp @@ -1586,7 +1586,7 @@ extern "C" { //-------------------- Functions --------------------------- - int thermo_report3(int nth, int show_thermo, double threshold, int ibuf, char* buf) + int thermo_report(int nth, int show_thermo, double threshold, int ibuf, char* buf) { try { bool stherm = (show_thermo != 0); @@ -1630,7 +1630,7 @@ extern "C" { } } - int ct_getDataDirectories3(const char* sep, int buflen, char* buf) + int ct_getDataDirectories(const char* sep, int buflen, char* buf) { try { return static_cast(copyString(getDataDirectories(sep), buf, buflen));