[clib] Do not use transitional names

This commit is contained in:
Ingmar Schoegl
2024-08-06 15:58:29 -05:00
committed by Ray Speth
parent db8c371fe7
commit 32a8d4b8fd
5 changed files with 7 additions and 7 deletions

View File

@@ -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);

View File

@@ -17,7 +17,7 @@ public class DataDirectoryCollection : IReadOnlyList<DirectoryInfo>
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));
}

View File

@@ -980,7 +980,7 @@ classdef ThermoPhase < handle
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)

View File

@@ -9,5 +9,5 @@ function d = ctDataDirectories()
% Cell array with strings representing the data file search directories
ctIsLoaded;
d = ctString('ct_getDataDirectories3', ';');
d = ctString('ct_getDataDirectories', ';');
end

View File

@@ -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<int>(copyString(getDataDirectories(sep), buf, buflen));