Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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],
Expand All @@ -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
1 change: 1 addition & 0 deletions Utilities/JuliaBridge/JuliaInterface/ServerManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down