diff --git a/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/JSON_lower_overloads.jl b/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/JSON_lower_overloads.jl index 1a426181f..4542eabe5 100644 --- a/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/JSON_lower_overloads.jl +++ b/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/JSON_lower_overloads.jl @@ -35,7 +35,6 @@ JSON.lower(func::typeof(BattMo.computeOCP_Graphite_Torchio)) JSON.lower(func::typeof(BattMo.compute_reaction_rate_constant_graphite)) = Base.nameof(func) JSON.lower(func::typeof(BattMo.computeOCP_Graphite_SiOx_Chen2020)) = Base.nameof(func) JSON.lower(func::typeof(BattMo.computeOCP_NMC811_Chen2020)) = Base.nameof(func) -JSON.lower(func::typeof(BattMo.computeOCP_LCO)) = Base.nameof(func) JSON.lower(func::typeof(BattMo.compute_reaction_rate_constant)) = Base.nameof(func) JSON.lower(func::typeof(BattMo.computeElectrolyteConductivity_default)) = Base.nameof(func) JSON.lower(func::typeof(BattMo.computeElectrolyteConductivity_Chen2020)) = Base.nameof(func) diff --git a/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/run_from_matlab.jl b/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/run_from_matlab.jl index 3cbe0180f..10a2d1421 100644 --- a/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/run_from_matlab.jl +++ b/Utilities/JuliaBridge/JuliaInterface/RunFromMatlab/src/run_from_matlab.jl @@ -1,10 +1,10 @@ import BattMo -function run_from_matlab(init::BattMo.AbstractInputParams; - kwargs...) +function run_from_matlab(init::BattMo.BattMoFormattedInput; + kwargs...) output = BattMo.run_battery(init; kwargs...) - + # create output ret = Dict("states" => output[:states], "cellSpecifications" => output[:cellSpecifications], @@ -13,8 +13,7 @@ function run_from_matlab(init::BattMo.AbstractInputParams; "matlab states" => convert_state_Matlab(output[:states], output[:extra][:model], output[:extra][:timesteps])) - + return ret - -end +end diff --git a/Utilities/JuliaBridge/JuliaInterface/ServerManager.m b/Utilities/JuliaBridge/JuliaInterface/ServerManager.m index 692d11fa5..e1d179f9f 100644 --- a/Utilities/JuliaBridge/JuliaInterface/ServerManager.m +++ b/Utilities/JuliaBridge/JuliaInterface/ServerManager.m @@ -341,6 +341,7 @@ function restart(manager, varargin) fprintf("Call to julia: %s \n", cmd); elseif manager.options.verbose fprintf("Call to julia (It will take time the first time due to just in time compilation)\n"); + fprintf(" %s \n", cmd); end [st, result] = system(cmd);