Skip to content

Commit

Permalink
preparation to opensource
Browse files Browse the repository at this point in the history
  • Loading branch information
mariomerinomartinez committed Jun 1, 2018
1 parent 589ebc3 commit e3e5e42
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 16 deletions.
3 changes: 3 additions & 0 deletions +dimagno/+postprocessor/induced_field.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
from the azimuthal currents in the plasma. It must be run after
fronts_to_arrays.
Refactored code from previous version - still experimental and not
tested.
MMM20180522
%}
function solution = induced_field(data,solution)
Expand Down
5 changes: 1 addition & 4 deletions +dimagno/+solver/dMoC_advance_front.m
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
%----------------------------------------------------------------------
%{
This function receives a integration front_2d (Fold) and propagates it
downstream once (Fnew).
%}
%----------------------------------------------------------------------

%}
function [Fnew] = dMoC_advance_front(data,Fold)

Fsub = dimagno.front;
Expand Down
3 changes: 0 additions & 3 deletions +dimagno/+solver/dMoC_axis.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%{
Function to calculate variables at a new inner point using
direct MOC (p1 and p2 are given; p3 is found and interpolated).
Expand All @@ -17,8 +16,6 @@
MMM20130310
%}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

function [p4,iter,iter_err] = dMoC_axis(data,i1,i3,F)

% abbrv
Expand Down
4 changes: 2 additions & 2 deletions +dimagno/+solver/dMoC_border.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------
%{
Function to calculate variables at a new inner point using
direct MOC (p1 and p2 are given; p3 is found and interpolated).
Expand All @@ -17,7 +17,7 @@
MMM20130310
%}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------

function [p4,iter,iter_err] = dMoC_border(data,i3,i2,F)

Expand Down
12 changes: 6 additions & 6 deletions +dimagno/@front/front.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------
%{
This abstract class defines the basic interface for simulation fronts.
It keeps enough data from the last
Expand All @@ -8,7 +8,7 @@
MMM20130221
%}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------
classdef front < handle
properties % Basic Properties (arrays) in the front (from axis (1) to wall (end))
z_
Expand All @@ -31,12 +31,12 @@
properties (Dependent = true)
M_ % calculated as sqrt(u_.^2+v_.^2)./c_
end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------
properties
n_points; % number of points
n_electrons; % number of electron species
end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------
properties (Constant = true)
basic_variable_names = {'z','r','u','v','w','phi','c'};
basic_electron_variable_names = {'ne'};
Expand All @@ -49,7 +49,7 @@
derived_electron_variable_names_ = {'Te_','we_','etae_'};
dependent_variable_names_ = {'M_'};
end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------
methods
function p = point(h,varargin)
% Returns a structure with the selected point. Varargin is just the
Expand Down Expand Up @@ -317,5 +317,5 @@
end
end
end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%----------------------------------------------------------------------
end
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Mario Merino and Javier Mauriño
Copyright (c) 2018 Mario Merino

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit e3e5e42

Please sign in to comment.