Changed names of functions handling loading and unloading Cantera.

interfaces/matlab_experimental/Func/fplus.m

@@ -10,6 +10,7 @@ classdef fplus < Func
     % :return:
     %     Instance of class :mat:class:`fplus`
     %
+
     methods
 
         function f = fplus(a, b)

interfaces/matlab_experimental/Utility/LoadCantera.m

@@ -1,26 +0,0 @@
-% Load the Cantera C Library into the Memory
-%
-if ispc
-    ctname = '/Lib/cantera_shared.dll';
-elseif ismac
-    ctname = '/Lib/libcantera_shared.dylib';
-elseif isunix
-    ctname = '/lib/libcantera_shared.so';
-else
-    error('Operating System Not Supported!');
-    return;
-end
-
-if ~libisloaded(ct)
-    [~, warnings] = loadlibrary([cantera_root, ctname], ...
-                                [cantera_root, '/include/cantera/clib/ctmatlab.h'], ...
-                                'includepath', [cantera_root '/include'], ...
-                                'addheader', 'ct', 'addheader', 'ctfunc', ...
-                                'addheader', 'ctmultiphase', 'addheader', ...
-                                'ctonedim', 'addheader', 'ctreactor', ...
-                                'addheader', 'ctrpath', 'addheader', 'ctsurf');
-end
-
-ct_ver = canteraVersion;
-sprintf('%s is ready for use.', ct_ver);
-clear all

interfaces/matlab_experimental/Utility/UnloadCantera.m

@@ -1,7 +0,0 @@
-% Unload the Cantear C Library from the Memory
-%
-if libisloaded(ct)
-    unloadlibrary(ct);
-end
-
-disp('Cantera has been unloaded');

interfaces/matlab_experimental/Utility/cantera_root.m

@@ -1,3 +0,0 @@
-function output = cantera_root()
-    output = '';
-end

interfaces/matlab_experimental/Utility/cleanup.m

@@ -1,12 +0,0 @@
-function cleanup()
-    % Delete all stored Cantera objects and reclaim memory.
-    %
-    checklib;
-    callct('ct_clearOneDim');
-    callct('ct_clearMix');
-    callct('ct_clearFunc');
-    callct('ct_clearStorage');
-    callct('ct_clearReactors');
-    callct('ct_clearReactionPath');
-    clear all
-end

interfaces/matlab_experimental/Utility/ctCleanUp.m

@@ -0,0 +1,21 @@
+function ctCleanUp()
+    % Delete all stored Cantera objects and reclaim memory.
+    %
+    ctIsLoaded;
+
+    classList = {'Domain1D', 'Sim1D', 'Func', 'Kinetics', ...
+    'Interface', 'Mixture', 'Solution', 'FlowDevice', 'Reactor', ...
+    'Wall', 'ReactorNet', 'ReactorSurface', 'ThermoPhase', 'Transport'};
+
+    varList = evalin('base', 'whos');
+
+    for i = 1:length(varList)
+        for j = 1:length(classList)
+            if isa(evalin('base', ['eval("', varList(i).name, '")']), ...
+                  classList{j});
+                evalin('base', ['clear ', varList(i).name]);
+                break
+            end
+        end
+    end
+end

interfaces/matlab_experimental/Utility/ctLoad.m

@@ -0,0 +1,27 @@
+function ctLoad()
+    % Load the Cantera C Library into Memory
+    %
+    if ispc
+        ctName = '/Lib/cantera_shared.dll';
+    elseif ismac
+        ctName = '/Lib/libcantera_shared.dylib';
+    elseif isunix
+        ctName = '/lib/libcantera_shared.so';
+    else
+        error('Operating System Not Supported!');
+        return;
+    end
+
+    if ~libisloaded(ctSharedLibrary)
+        [~, warnings] = loadlibrary([ctRoot, ctName], ...
+                                    [ctRoot, '/include/cantera/clib/ctmatlab.h'], ...
+                                    'includepath', [ctRoot '/include'], ...
+                                    'addheader', 'ct', 'addheader', 'ctfunc', ...
+                                    'addheader', 'ctmultiphase', 'addheader', ...
+                                    'ctonedim', 'addheader', 'ctreactor', ...
+                                    'addheader', 'ctrpath', 'addheader', 'ctsurf');
+    end
+
+    disp(sprintf('Cantera %s is ready for use.', ctVersion))
+
+end

interfaces/matlab_experimental/Utility/ctRoot.m

@@ -0,0 +1,3 @@
+function output = ctRoot()
+    output = '/home/ssun30/anaconda3/envs/ct-matlab';
+end

interfaces/matlab_experimental/Utility/ctUnload.m

@@ -0,0 +1,10 @@
+function ctUnload()
+    % Unload the Cantear C Library from the Memory
+    %
+    if libisloaded(ctSharedLibrary)
+        ctCleanUp;
+        unloadlibrary(ctSharedLibrary);
+    end
+
+    disp('Cantera has been unloaded');
+end