Mercurial > mxe-octave

annotate src/of-ocs-3-break-fixes.patch @ 5895:2db7f803d55d release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
librsb: Update to version 1.2.0.10 (bug #60042). * src/librsb.mk: Update version and checksum. Remove work-around for fixed bug.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 19 Sep 2021 14:32:07 +0200
parents 372ea4c0afb2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5534
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 From 5df16dfd3522c2d1c4fdf7ed28f9efefc1b64df5 Mon Sep 17 00:00:00 2001
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 From: JohnD <john.donoghue@ieee.org>
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 Date: Fri, 4 May 2018 08:41:26 -0400
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 Subject: [PATCH] remove 'break' statement from switch statements (Bug #51510)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 * inst/sbn/Mcapacitors.m, inst/sbn/Mcurrentsources.m,
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 inst/sbn/Mdiode.m, inst/sbn/Mnmosfet.m, inst/sbn/Mpmosfet.m,
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 inst/sbn/Mresistors.m, inst/sbn/Mshichmanhodgesmosfet.m,
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 inst/sbn/Mvoltagesources.m: remove break; from switch statements
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 ---
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 inst/sbn/Mcapacitors.m | 6 +-----
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 inst/sbn/Mcurrentsources.m | 2 --
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 inst/sbn/Mdiode.m | 3 ---
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 inst/sbn/Mnmosfet.m | 2 --
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 inst/sbn/Mpmosfet.m | 3 ---
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 inst/sbn/Mresistors.m | 5 -----
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 inst/sbn/Mshichmanhodgesmosfet.m | 7 +------
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 inst/sbn/Mvoltagesources.m | 8 ++------
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 8 files changed, 4 insertions(+), 32 deletions(-)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 diff --git a/inst/sbn/Mcapacitors.m b/inst/sbn/Mcapacitors.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 index fdb22b1..7c3784e 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 --- a/inst/sbn/Mcapacitors.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 +++ b/inst/sbn/Mcapacitors.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 @@ -72,7 +72,6 @@ function [a,b,c] = Mcapacitors(string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 a = [0 0 1; 0 0 -1; 0 0 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 b = [0 0 0;0 0 0;-C C 1];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 c = [0 0 0]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 case "MULTICAP"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 @@ -83,8 +82,6 @@ function [a,b,c] = Mcapacitors(string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 b = [zeros(n) zeros(n); -C eye(n)];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 c = [zeros(2*n,1)]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 ##NLC part
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 case "PDE_NMOS"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 @@ -111,7 +108,6 @@ function [a,b,c] = Mcapacitors(string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 a = [0 0 1; 0 0 -1; 0 0 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 b = [0 0 0;0 0 0;C -C -1];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45 c = [0 0 Q-q]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 otherwise
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 error (["unknown section:" string])
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 @@ -175,4 +171,4 @@ function [Q,C]=Mnmoscap(tbulk,tox,Area,Vg,Na,Nnodes,toll,maxit);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51 C = Area*C*(q*ns*xs/Vs);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 Q = Area*Q*(q*ns*xs);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54 -endfunction
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55 \ No newline at end of file
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 +endfunction
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 diff --git a/inst/sbn/Mcurrentsources.m b/inst/sbn/Mcurrentsources.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58 index 707aa75..e65078c 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59 --- a/inst/sbn/Mcurrentsources.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60 +++ b/inst/sbn/Mcurrentsources.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61 @@ -71,7 +71,6 @@ function [a,b,c] = Mcurrentsources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 a = zeros(2);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63 b = a;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 c = [I -I]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
65 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
66
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
67 case "VCCS"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
68 ## Voltage controlled current source
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
69 @@ -96,7 +95,6 @@ function [a,b,c] = Mcurrentsources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
70 a = zeros(2);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
71 b = a;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
72 c = [I -I]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
73 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
74
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
75 case "VCPS"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
76 ## Voltage controlled power source
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
77 diff --git a/inst/sbn/Mdiode.m b/inst/sbn/Mdiode.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
78 index 9db5410..44a4b00 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
79 --- a/inst/sbn/Mdiode.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
80 +++ b/inst/sbn/Mdiode.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
81 @@ -74,7 +74,6 @@ function [a,b,c] = Mdiode (string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
82 a = zeros(2);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
83 b = [geq -geq; -geq geq];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
84 c = [I ; -I] ;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
85 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
86
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
87 case "PDEsymmetric"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
88
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
89 @@ -102,8 +101,6 @@ function [a,b,c] = Mdiode (string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
90 b = [g -g; -g g];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
91 c = [I ; -I] ;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
92
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
93 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
94 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
95 otherwise
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
96 error(["unknown section:" string])
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
97 endswitch
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
98 diff --git a/inst/sbn/Mnmosfet.m b/inst/sbn/Mnmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
99 index 5fe4962..e2b9504 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
100 --- a/inst/sbn/Mnmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
101 +++ b/inst/sbn/Mnmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
102 @@ -112,7 +112,6 @@ function [a,b,c]=Mnmosfet(string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
103 0 0 0 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
104
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
105 c = [0 -id id 0]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
106 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
107
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
108 case "lincap"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
109
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
110 @@ -153,7 +152,6 @@ function [a,b,c]=Mnmosfet(string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
111 b = B+Jac;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
112 c = res + B*[extvar;intvar] + C;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
113
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
114 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
115 otherwise
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
116 error(["unknown option:" string]);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
117 endswitch
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
118 diff --git a/inst/sbn/Mpmosfet.m b/inst/sbn/Mpmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
119 index c4fbae3..58ef919 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
120 --- a/inst/sbn/Mpmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
121 +++ b/inst/sbn/Mpmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
122 @@ -108,7 +108,6 @@ function [a,b,c]= Mpmosfet (string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
123 0 0 0 0 ];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
124
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
125 c =[0 -id id 0]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
126 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
127
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
128 case "lincap"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
129
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
130 @@ -144,8 +143,6 @@ function [a,b,c]= Mpmosfet (string,parameters,parameternames,extvar,intvar,t)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
131 b = B+Jac;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
132 c = res + B*[extvar;intvar] + C;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
133
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
134 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
135 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
136 otherwise
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
137 error(["unknown option:" string]);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
138 endswitch
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
139 diff --git a/inst/sbn/Mresistors.m b/inst/sbn/Mresistors.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
140 index e8862b9..e0d43d4 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
141 --- a/inst/sbn/Mresistors.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
142 +++ b/inst/sbn/Mresistors.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
143 @@ -75,7 +75,6 @@ function [a,b,c] = Mresistors (string, parameters, parameternames,
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
144 b = [1 -1 ;-1 1]/R;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
145 c = -[0; 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
146
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
147 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
148 ##NLCpart
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
149 case "THERMAL"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
150
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
151 @@ -100,8 +99,6 @@ function [a,b,c] = Mresistors (string, parameters, parameternames,
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
152 -2*(v1-v2)/RT -2*(v2-v1)/RT (v1-v2)^2*dRdT/RT^2];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
153 c = [i1 i2 P]';
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
154
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
155 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
156 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
157 case "THERMAL1D"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
158
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
159 for ii=1:length(parameternames)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
160 @@ -123,8 +120,6 @@ function [a,b,c] = Mresistors (string, parameters, parameternames,
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
161 b = k*(S/h)*[B(ext,ext), B(ext,int); B(int,ext), B(int,int)];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
162 c = zeros(N+1,1);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
163
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
164 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
165 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
166 otherwise
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
167 error (["unknown section:" string])
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
168 endswitch
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
169 diff --git a/inst/sbn/Mshichmanhodgesmosfet.m b/inst/sbn/Mshichmanhodgesmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
170 index d5a2c93..893872d 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
171 --- a/inst/sbn/Mshichmanhodgesmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
172 +++ b/inst/sbn/Mshichmanhodgesmosfet.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
173 @@ -140,9 +140,6 @@ function [a,b,c]= Mshichmanhodgesmosfet (string,parameters,parameternames,extvar
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
174
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
175 c = [c1;c2];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
176
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
177 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
178 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
179 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
180 case "PMOS"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
181
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
182 rd = 1e6;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
183 @@ -218,8 +215,6 @@ function [a,b,c]= Mshichmanhodgesmosfet (string,parameters,parameternames,extvar
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
184
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
185 c = [c1;c2];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
186
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
187 - break;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
188 -
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
189 otherwise
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
190 error(["unknown option:" string]);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
191 endswitch
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
192 @@ -329,4 +324,4 @@ function [gm,gd,ids,didT,P,dPdT,dPdvgs,dPdvds] = pmos(extvar,mu0,Cox,W,L,Vth,rd,
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
193 dPdvgs = -(gm*vds);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
194 dPdvds = -(gd*vds + ids);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
195
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
196 -endfunction
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
197 \ No newline at end of file
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
198 +endfunction
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
199 diff --git a/inst/sbn/Mvoltagesources.m b/inst/sbn/Mvoltagesources.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
200 index b0a9819..e0a2408 100644
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
201 --- a/inst/sbn/Mvoltagesources.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
202 +++ b/inst/sbn/Mvoltagesources.m
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
203 @@ -92,7 +92,7 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
204 a = zeros(3);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
205 b = [0 0 1;0 0 -1;1 -1 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
206 c = [0 0 -V];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
207 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
208 +
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
209 ## NLC part
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
210 case "sinwave"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
211 for ii=1:length(parameternames)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
212 @@ -105,7 +105,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
213 a = zeros(3);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
214 b = [0 0 1;0 0 -1;1 -1 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
215 c = [0 0 -DV]' + b * [extvar;intvar];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
216 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
217
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
218 case "pwl"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
219
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
220 @@ -118,7 +117,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
221 a = zeros(3);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
222 b = [0 0 1;0 0 -1;1 -1 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
223 c = [0 0 -DV]' + b * [extvar;intvar];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
224 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
225
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
226 case "squarewave"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
227 for ii=1:length(parameternames)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
228 @@ -144,7 +142,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
229 a = zeros(3);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
230 b = [0 0 1;0 0 -1;1 -1 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
231 c = [0 0 -DV]' + b * [extvar;intvar];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
232 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
233
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
234 case "step"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
235 for ii=1:length(parameternames)
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
236 @@ -162,7 +159,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
237 a = zeros(3);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
238 b = [0 0 1;0 0 -1;1 -1 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
239 c = [0 0 -DV]' + b * [extvar;intvar];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
240 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
241
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
242 case "VCVS"
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
243 K = 1;
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
244 @@ -175,7 +171,7 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
245 a = zeros(5);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
246 b = [0 0 0 0 1;0 0 0 0 -1;0 0 0 0 0;0 0 0 0 0;1 -1 -K K 0];
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
247 c = zeros(5,1);
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
248 - break
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
249 +
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
250 otherwise
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
251 error (["unknown section:" string])
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
252 endswitch
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
253 --
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
254 2.14.3
372ea4c0afb2 Move of-ocs PKG_XXXX to inst dir and add break patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
255