luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If C= or Q= is omitted in the instance line of a behavioral capacitor, 

select as default the C= formulation, not the Q= formula..
This commit is contained in:
Holger Vogt 2025-01-10 10:59:56 +01:00
parent 758b8cc853
commit 539ade0f38
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontend/inpcom.c
View File

@ -6687,26 +6687,26 @@ static void inp_compat(struct card *card)
/* evaluate m */ /* evaluate m */
char* mstr = eval_mvalue(cut_line, card->line); char* mstr = eval_mvalue(cut_line, card->line);
if (strstr(curr_line, "c=")) { /* capacitance formulation */ if (strstr(curr_line, "q=")) { /* charge formulation */
// Exxx n-aux 0 n2 n1 1
ckt_array[0] = tprintf("e%s %s_int1 0 %s %s %s", title_tok,
title_tok, node2, node1, mstr);
// Cxxx n-aux 0 1
ckt_array[1] = tprintf("c%s %s_int1 0 1", title_tok, title_tok);
// Bxxx n1 n2 I = i(Exxx) * equation
ckt_array[2] = tprintf("b%s %s %s i = i(e%s) * (%s) "
"%s reciproctc=1",
title_tok, node1, node2, title_tok, equation, tcrstr);
} else { /* charge formulation */
// Gxxx n1 n2 n-aux 0 1 // Gxxx n1 n2 n-aux 0 1
ckt_array[0] = tprintf("g%s %s %s %s_int1 0 %s", ckt_array[0] = tprintf("g%s %s %s %s_int1 0 %s",
title_tok, node1, node2, title_tok, mstr); title_tok, node1, node2, title_tok, mstr);
// Lxxx n-aux 0 1 // Lxxx n-aux 0 1
ckt_array[1] = tprintf("l%s %s_int1 0 1", title_tok, title_tok); ckt_array[1] = tprintf("l%s %s_int1 0 1", title_tok, title_tok);
// Bxxx 0 n-aux I = equation // Bxxx 0 n-aux I = equation
ckt_array[2] = tprintf("b%s 0 %s_int1 i = (%s) " ckt_array[2] = tprintf("b%s 0 %s_int1 i = (%s) "
"%s reciproctc=1", "%s reciproctc=1",
title_tok, title_tok, equation, tcrstr); title_tok, title_tok, equation, tcrstr);
} else { /* capacitance formulation */
// Exxx n-aux 0 n2 n1 1
ckt_array[0] = tprintf("e%s %s_int1 0 %s %s %s", title_tok,
title_tok, node2, node1, mstr);
// Cxxx n-aux 0 1
ckt_array[1] = tprintf("c%s %s_int1 0 1", title_tok, title_tok);
// Bxxx n1 n2 I = i(Exxx) * equation
ckt_array[2] = tprintf("b%s %s %s i = i(e%s) * (%s) "
"%s reciproctc=1",
title_tok, node1, node2, title_tok, equation, tcrstr);
} }
tfree(tcrstr); tfree(tcrstr);
tfree(mstr); tfree(mstr);