diff --git a/interfaces/matlab_experimental/SetCanteraPath.m b/interfaces/matlab_experimental/SetCanteraPath.m deleted file mode 100644 index 3d44272cce..0000000000 --- a/interfaces/matlab_experimental/SetCanteraPath.m +++ /dev/null @@ -1,3 +0,0 @@ -function SetCanteraPath(cantera_root) - save('Utility/cantera_root.mat','cantera_root'); -end diff --git a/interfaces/matlab_experimental/LoadCantera.m b/interfaces/matlab_experimental/Utility/LoadCantera.m similarity index 70% rename from interfaces/matlab_experimental/LoadCantera.m rename to interfaces/matlab_experimental/Utility/LoadCantera.m index e764568715..0713266952 100644 --- a/interfaces/matlab_experimental/LoadCantera.m +++ b/interfaces/matlab_experimental/Utility/LoadCantera.m @@ -1,21 +1,16 @@ function LoadCantera - addpath('Class', 'Utility', 'PresetFlowDevices', 'PresetFunctors', ... - 'PresetMixtures', 'PresetReactors', '1D'); if ispc ctname = 'cantera_shared.dll'; elseif ismac ctname = 'libcantera_shared.dylib'; elseif isunix ctname = 'libcantera_shared.so'; - else error('Operating System Not Supported!'); return; end if ~libisloaded(ct) - load('Utility/cantera_root.mat'); - addpath([cantera_root, '/samples/matlab_new']); - [~,warnings] = loadlibrary([cantera_root '/lib/' ctname], ... + [~,warnings] = loadlibrary([cantera_root '/Lib/' ctname], ... [cantera_root '/include/cantera/clib/ctmatlab.h'], ... 'includepath', [cantera_root '/include'], ... 'addheader','ct','addheader','ctfunc', ... @@ -23,8 +18,6 @@ 'ctonedim','addheader','ctreactor', ... 'addheader','ctrpath','addheader','ctsurf', ... 'addheader','ctxml'); - example_dir = [cantera_root, '/samples/matlab_new']; - addpath(example_dir); end disp('Cantera is ready for use'); end diff --git a/interfaces/matlab_experimental/UnloadCantera.m b/interfaces/matlab_experimental/Utility/UnloadCantera.m similarity index 100% rename from interfaces/matlab_experimental/UnloadCantera.m rename to interfaces/matlab_experimental/Utility/UnloadCantera.m diff --git a/interfaces/matlab_experimental/ct.m b/interfaces/matlab_experimental/Utility/ct.m similarity index 100% rename from interfaces/matlab_experimental/ct.m rename to interfaces/matlab_experimental/Utility/ct.m diff --git a/samples/matlab_experimental/test_examples.m b/samples/matlab_experimental/test_examples.m new file mode 100644 index 0000000000..b1c6bf7531 --- /dev/null +++ b/samples/matlab_experimental/test_examples.m @@ -0,0 +1,12 @@ +% runs selected examples without pausing +equil(); +isentropic(); +reactor1(); +reactor2(); +surfreactor; +periodic_cstr; +rankine(300.0, 2.0*oneatm, 0.8, 0.7); +prandtl1(); +flame1; +catcomb; +exit;