Skip to content

Commit

Permalink
corrections due to new circuittikz version
Browse files Browse the repository at this point in the history
  • Loading branch information
wallscheid committed Feb 7, 2025
1 parent a3d3bbc commit 66df0ed
Show file tree
Hide file tree
Showing 16 changed files with 233 additions and 270 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\begin{axis}[
domain=0:15,
xmin=0, xmax=7,
ymin=-1.5, ymax=2.5,
ymin=-1.75, ymax=2.5,
samples=500,
axis y line=center,
axis x line=middle,
Expand Down
4 changes: 2 additions & 2 deletions exercise/fig/ex02/sFig_diode_sw_off_esb.tex
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
\begin{solutionfigure}[htb]
\centering
\begin{circuitikz}[european currents,european resistors,american inductors]
\draw (0,2) to [open, o-o, v = $\hspace{2cm}u_2(t)$, voltage = straight] ++(0,-2)
\draw (0,2) to [open, o-o, v^= $u_2(t)$, voltage = straight] ++(0,-2)
to ++(-5.3,0);
\draw (0,2) to (2,2);
\draw (2,0) to (0.05,0);
Expand All @@ -13,7 +13,7 @@
to [short, -o, i=$i_2(t)$] (0,2)
(S.mid) to [short, o-*](\x1,0);
\draw (-1.5,2) to [capacitor, *-*, l=$C$, i>^=$i_\mathrm{C}(t)$] ++(0,-2);
\draw (-6,2) to [open, v>=$u_1(t)\hspace{0.3cm}$, voltage = straight] ++(0,-2);
\draw (-6,2) to [open, v>=$u_1(t)$, voltage = straight] ++(0,-2);
\draw (-5,0) to [short, -o] ++(-1,0);
\draw (-5.75,2) to [short, -o] ++(-0.25,0);
\end{circuitikz}
Expand Down
4 changes: 2 additions & 2 deletions exercise/fig/ex05/Fig_B2U_TopologyWithCapactiveFiltering.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
\draw
% Base point for voltage supply
(0,0) coordinate (jU1v)
% Add supply U1 [open, o-o, v = $u_1(t)\hspace{0.5cm}$, voltage = straight]
(jU1v) to [open, o-o, v = $u_1(t)\hspace{0.5cm}$, voltage = straight] ++(0,-2) coordinate (jU1g)
% Add supply U1
(jU1v) to [open, o-o, v = $u_1(t)$, voltage = straight] ++(0,-2) coordinate (jU1g)
% Add arrow and Text
(jU1v) ++(0.5,0) node[currarrow](I1){}
(I1) node[anchor=south,color=black]{$i_\mathrm{1}(t)$}
Expand Down
4 changes: 2 additions & 2 deletions exercise/fig/ex05/Fig_BoostConverter_with_Rectifiers.tex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
\begin{center}
\begin{circuitikz}[european currents,european resistors,american inductors]
% Input rectifier
\draw (0,0) to [open, o-o, v = $u_1(t)\hspace{0.5cm}$, voltage = straight] ++(0,-2) coordinate (A)
\draw (0,0) to [open, o-o, v = $u_1(t)$, voltage = straight] ++(0,-2) coordinate (A)
(0,0) to [short, i>^=$i_1(t)$] ++(0.75,0) to [short, -*] ++(0.75,0)
to [diode, l=$D_1$] ++(0,1.5)
to [short, -*] ++(1.5,0) coordinate (C)
Expand All @@ -27,7 +27,7 @@
(D) to [short] ++(1.5,0) coordinate (H)
to [short] (DCDC.port1 -| H) -- ++(0.5,0)
to [currtap, name=ct1] (DCDC.port1)
(DCDC.port4 -| G) to [open,v = $u'(t)\hspace{0.5cm}$, voltage = straight] (DCDC.port1 -| G);
(DCDC.port4 -| G) to [open,v = $u'(t)$, voltage = straight] (DCDC.port1 -| G);

% Inner part
\draw (DCDC.port4) to [L, l=$L$] ++(1.75,0) coordinate (boostup)
Expand Down
8 changes: 4 additions & 4 deletions exercise/fig/ex06/Fig_B6C_ConverterWithMotorLoad.tex
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@
% Add wire T2-T3-T6
(D2bot) to [short, -*] (D4bot) to [short, -*] (D6bot)
% Add voltage arrow u2(t) between Dtop and Dbot
(jL1) to [open, v^>=$\hspace{0.5cm}u_2(t)$, voltage = straight] (D6bot-|jL1)
(jL1) to [open, v^>=$u_2(t)$, voltage = straight] (D6bot-|jL1)
% Add voltage arrow u2+n(t) between Dtop and neutral
(D1top) ++(-0.2,0) to [open, v_>=$u_\mathrm{2,p}(t)$, voltage = straight] ++(-5.5,0)
% Add voltage arrow u2-n(t) between Dbot and neutral
(D2bot) ++(-0.2,0) to [open, v_>=$u_\mathrm{2,m}(t)$, voltage = straight] ++(-5.5,0)
% Add voltage arrow between AC source a and b
(A) to [open, v^>=$\hspace{0.75cm}u_{1\mathrm{ab}}(t)$, voltage = straight] (B)
(A) to [open, v^>=$u_{1\mathrm{ab}}(t)$, voltage = straight] (B)
% Add voltage arrow between AC source b and c
(B) to [open, v^>=$\hspace{0.75cm}u_{1\mathrm{bc}}(t)$, voltage = straight] (C)
(B) to [open, v^>=$u_{1\mathrm{bc}}(t)$, voltage = straight] (C)
% Add voltage arrow between AC source a and c
(-0.5,-2*\vd) to [open, v^>=$u_{1\mathrm{ca}}(t)\hspace{0.75cm}$, voltage = straight] (-0.5,0);
(-0.5,-2*\vd) to [open, v^>=$u_{1\mathrm{ca}}(t)$, voltage = straight] (-0.5,0);
\end{circuitikz}
\end{center}
\caption{B6C converter at a motor load.}
Expand Down
2 changes: 1 addition & 1 deletion exercise/fig/ex06/Fig_M3C_Converter_With_RL_Load.tex
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
\draw (L2bend) to [thyristor] ++(1.25,0) coordinate (D2end);
\draw (L2cend) to [thyristor] ++(1.25,0) coordinate (D3end) to [short, -*] (D2end) to [short, -*] (D1end);
\draw (D1end) to [short] ++(0.5,0) coordinate (u2) to [short, i=$i_2(t)$] ++(0.75,0) to [L, l=$L$] ++(2,0) coordinate (Ctop) to [short, i = $i_\mathrm{R}(t)$] ++(1.5,0) to [R, l=$R$] (Rend -| \tikztostart) to (Rend);
\draw (u2) to [open, v^>=$\hspace{0.5cm}u_2(t)$, voltage = straight] (Rend -| \tikztostart);
\draw (u2) to [open, v^>=$u_2(t)$, voltage = straight] (Rend -| \tikztostart);
\end{circuitikz}%
\end{center}
\caption{M3C topology with an input three-phase transformer and an RL-load.}
Expand Down
7 changes: 2 additions & 5 deletions exercise/fig/ex07/Fig_ThreePhaseInverter_6StepMode.tex
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
\begin{center}
\begin{circuitikz}
% Add voltage U1p
\draw (0,0) coordinate (U1p) to [open, o-o, v = $\frac{U_1}{2}\hspace{0.5cm}$, voltage = straight] ++(0,-2.5) coordinate (Gnd)
\draw (0,0) coordinate (U1p) to [open, o-o, v = $\frac{U_1}{2}$, voltage = straight] ++(0,-2.5) coordinate (Gnd)
(Gnd) ++ (-0.4,0) node[rground](){} coordinate (GndSymb)
(Gnd) to [short,-] (GndSymb)
(Gnd) to [open, -o, v = $\frac{U_1}{2}\hspace{0.5cm}$, voltage = straight] ++(0,-2.5) coordinate (U1m)
(Gnd) to [open, -o, v = $\frac{U_1}{2}$, voltage = straight] ++(0,-2.5) coordinate (U1m)
% Add current
(U1p) to [short, o-, i=$i_1(t)$] ++(2,0) coordinate (jT1c)
% Add T1
Expand Down Expand Up @@ -112,9 +112,6 @@
% Add voltage arrow un0
(Gnd3) ++(0,2.8) to [open,v^=$$,voltage = straight] ++(0,-3.01)
(Gnd3) ++ (-0.7,1.2) node[anchor=north,color=black,rotate = 90]{$u_\mathrm{2n0}(t)$};
\end{circuitikz}
\end{center}
\caption{Three-phase inverter in six-step mode.}
Expand Down
3 changes: 1 addition & 2 deletions exercise/fig/ex07/Fig_subtask1.4.tex
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
\end{solutionblock}
\end{axis}
\end{tikzpicture}
\caption{Output current $i_\mathrm{2}(t)$, its fundamental wave $i^\mathrm{(1)}_\mathrm{2}(t)$,
its harmonics $i^{(\mathrm{h})}_\mathrm{2}(t)$, and input current $i_\mathrm{1}(t)$ }
\caption{Output current $i_\mathrm{2}(t)$, its fundamental component $i^\mathrm{(1)}_\mathrm{2}(t)$, its harmonics $i^{(\mathrm{h})}_\mathrm{2}(t)$, and input current $i_\mathrm{1}(t)$.}
\label{sfig:ex07_sub1.4_current_and_components}
\end{figure}
4 changes: 2 additions & 2 deletions exercise/fig/ex07/Single-phase_DC_Inverter.tex
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
\begin{center}
\begin{circuitikz}
% Add voltage U1p
\draw (0,0) coordinate (U1) to [open, o-o, v = $U_1\hspace{0.5cm}$, voltage = straight] ++(0,-5.5) coordinate (Gnd)
\draw (0,0) coordinate (U1) to [open, o-o, v = $U_1$, voltage = straight] ++(0,-5.5) coordinate (Gnd)
% Add current
(U1) to [short, o-, i=$i_1(t)$] ++(2,0) coordinate (jT1c)
% Add T1
Expand Down Expand Up @@ -55,7 +55,7 @@
% (ju2x) ++(0,-0.8) to [open,v^=$u_\mathrm{2}(t)$,voltage = straight] ++(3.8,0);
\end{circuitikz}
\end{center}
\caption{Single-phase AC-DC converter}
\caption{Single-phase AC-DC converter.}
\label{fig:Fig_Single-phase_DC_Inverter}
\end{figure}
2 changes: 1 addition & 1 deletion exercise/main.tex
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
\documentclass[solution]{../course_template/exerciseClass}
\title{Power Electronics}

\includeonly{tex/exercise07}
%\includeonly{tex/exercise07}

\begin{document}
\include{tex/exercise01}
Expand Down
2 changes: 1 addition & 1 deletion lecture/main.ist
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% makeindex style file created by the glossaries package
% for document 'main' on 2025-2-4
% for document 'main' on 2025-2-7
actual '?'
encap '|'
level '!'
Expand Down
25 changes: 12 additions & 13 deletions lecture/tex/Lecture01.tex
Original file line number Diff line number Diff line change
Expand Up @@ -727,9 +727,9 @@ \subsection{Linear vs. switched power conversion}
\frametitle{Linear power conversion}
\begin{figure}
\begin{circuitikz}[]
\draw (0,2) to [open, o-o, v = $\hspace{2cm}u_2(t)$, voltage = straight] ++(0,-2)
\draw (0,2) to [open, o-o, v^=$u_2(t)$, voltage = straight] ++(0,-2)
to ++(-6,0)
to [open, o-o, v<= $u_1(t) \hspace{2cm}$, voltage = straight] ++(0,2)
to [open, o-o, v^<= $u_1(t)$, voltage = straight] ++(0,2)
to [european resistor, R=$R_1$] ++(4,0)
to ++(2,0)
(-2,0) to [variable european resistor, *-*, l=$R_2$] (-2,2);
Expand Down Expand Up @@ -759,9 +759,9 @@ \subsection{Linear vs. switched power conversion}
\begin{figure}
\onslide<1->{
\begin{circuitikz}[]
\draw (0,2) to [open, o-o, v = $\hspace{2cm}u_2(t)$, voltage = straight] ++(0,-2)
\draw (0,2) to [open, o-o, v^= $u_2(t)$, voltage = straight] ++(0,-2)
to ++(-5.5,0)
to [open, o-o, v<= $u_1(t) \hspace{2cm}$, voltage = straight] ++(0,2)
to [open, o-o, v^<= $u_1(t)$, voltage = straight] ++(0,2)
(-5.5,2) to ++(1.25,0) node [nigbt, anchor=C, rotate=90](nigbt1){}
(nigbt1.E) to [short, i=$i_2(t)$] (0,2);
\draw node[rectangle, draw, anchor = north] (r) at (nigbt1.B) {Linear amplifier}
Expand Down Expand Up @@ -793,7 +793,6 @@ \subsection{Linear vs. switched power conversion}
xmin=0, xmax=5,
xtick={0,1,2,3,4},
ytick={0,1,2,3,4,5},
%no x/y ticks displayed
xticklabels={},
yticklabels={},
domain=0:5,
Expand Down Expand Up @@ -844,9 +843,9 @@ \subsection{Linear vs. switched power conversion}
\begin{figure}
\onslide<1->{
\begin{circuitikz}[]
\draw (0,2) to [open, o-o, v = $\hspace{2cm}u_2(t)$, voltage = straight] ++(0,-2)
\draw (0,2) to [open, o-o, v^=$u_2(t)$, voltage = straight] ++(0,-2)
to ++(-5,0)
to [open, o-o, v<= $u_1(t) \hspace{2cm}$, voltage = straight] ++(0,2)
to [open, o-o, v^<= $u_1(t)$, voltage = straight] ++(0,2)
(-5,2) to ++(1.25,0) node [cuteopenswitchshape, anchor = out, rotate=180] (S) {}
let \p1 = (S.mid) in (S.in) to (0,2)
([yshift = -0.3cm]S.mid) to [short, o-*](\x1,0);
Expand Down Expand Up @@ -1067,14 +1066,14 @@ \subsection{Linear vs. switched power conversion}

\node[] (A) at (0,0) {
\begin{circuitikz}[]
\draw (0,2) to [open, o-o, v = $\hspace{2cm}u_2(t)$, voltage = straight] ++(0,-2)
\draw (0,2) to [open, o-o, v^= $u_2(t)$, voltage = straight] ++(0,-2)
to ++(-6,0)
to [open, o-o, v<= $u_1(t) \hspace{2cm}$, voltage = straight] ++(0,2)
to [open, o-o, v^<= $u_1(t)$, voltage = straight] ++(0,2)
(-6,2) to ++(1.25,0) node [cuteopenswitchshape, anchor = out, rotate=180] (S) {}
let \p1 = (S.mid) in (S.in) to [inductor, l_=$L$] (0,2)
([yshift = -0.3cm]S.mid) to [short, o-*](\x1,0);
\draw (-0.75,2) to [capacitor, *-*, l_=$C$] (-0.75,0);
\draw (-3.5,2) to [open, v = $\hspace{1.75cm}u_\mathrm{s}(t)$, voltage = straight] ++(0,-2);
\draw (-3.5,2) to [open, v^= $u_\mathrm{s}(t)$, voltage = straight] ++(0,-2);
\end{circuitikz}
};
\pause
Expand Down Expand Up @@ -1595,21 +1594,21 @@ \subsection{Linear vs. switched power conversion}
&
\onslide<2->{
{\large
$ i(t) =C \frac{}{ t}u(t)$
$ i(t) =C \frac{\mathrm{d}}{\mathrm{d}t}u(t)$
}
}
\vspace{0.5cm}
&
\onslide<3->{
{\large
$u(t) =L \frac{}{ t}i(t)$
$u(t) =L \frac{\mathrm{d}}{\mathrm{d}t}i(t)$
}
}
\vspace{0.5cm}
&
\onslide<4->{
{\large
$\bm{u}(t) =\bm{L} \frac{}{ t}\bm{i}(t)$
$\bm{u}(t) =\bm{L} \frac{\mathrm{d}}{\mathrm{d}t}\bm{i}(t)$
}
}
\vspace{0.5cm}
Expand Down
Loading

0 comments on commit 66df0ed

Please sign in to comment.