From 675f8cc0f00b7baaa13d81ab7a22481afb067942 Mon Sep 17 00:00:00 2001
From: mhx <mhx@iae.nl>
Date: Sun, 29 Jan 2017 15:58:27 +0100
Subject: [PATCH] Updated, there should be no errors when run.

---
 tests/regression/behavioralRLC/testRLC.cir  | 18 ++++++++++--------
 tests/regression/behavioralRLC/testRLC2.cir |  8 ++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/tests/regression/behavioralRLC/testRLC.cir b/tests/regression/behavioralRLC/testRLC.cir
index 1d578f0e7..2b45bf545 100644
--- a/tests/regression/behavioralRLC/testRLC.cir
+++ b/tests/regression/behavioralRLC/testRLC.cir
@@ -1,6 +1,6 @@
 .TITLE Test non-linear RLC
 
-.param lin=0 ape=13 bear=69 giraffe=bear/ape
+.param lin=0 ape=13 bear=69 giraffe=bear/ape pi=3.1459
 
 Vc ctrl 0 dc=2
 V1 1 0 dc=0 pulse(0 10 0 1u 1u 10u 20u) 
@@ -27,30 +27,32 @@ R6 1 0 1001 tc1='-3*100u/4' tc2='sqrt(100)*1.3m'
 R7 1 0 1001 tc1='-3*100u/4'
 R8 1 0 1001 tc1='-3*100u/4' tc2='sqrt(100)*1.3m' temp='100+1' dtemp='24*2/4'
 
-R9  1 0 '1.23*10'                tc1='-3*100u/4' tc2='sqrt(100)*1.3m'
-*bug R10 1 0 'v(ctrl)*1.23*{pi/10}'   tc1='-3*100u/4' tc2='sqrt(100)*1.3m'
-*bug B11 4 0 v = v(ctrl)*{1.23*pi/10} tc1='-3*100u/4' tc2='sqrt(100)*1.3m' 
+R9  1 0 '1.23*10'                tc1='-3*100u/4' tc2='sqrt(100)*1.3m' temp='100/20' 
+R10 1 0 'v(ctrl)*1.23*{ape/10}'  tc1='-3*100u/4' tc2='sqrt(100)*1.3m' dtemp='5*pi'
+B11 4 0 v = v(ctrl)*{1.23/10}    tc1='-3*100u/4' tc2='sqrt(100)*1.3m' temp='100/20' 
 Rxx 4 0 1k
 
-*bug B12 5 0 v = {bear*1.23*pi/ape} tc1='-3*100u/ape' tc2='sqrt(100)*giraffe' 
+B12 5 0 v = {bear*1.23/ape} 	 tc1='-3*100u/ape' tc2='sqrt(100)*giraffe'  dtemp='5*12'
 L1  5 6 0.1mH
 C3  6 0 C='1u*25'
 
 * test for names imbedded in other names
 V2 nodetc1001 0 2
 C4 6 0 C='v(nodetc1001)*2u'
-*bug C5 6 0 C='v(nodetc1001)*2u' tc1='-3*100u/ape' tc2='sqrt(100)*giraffe' 
+C5 6 0 C='v(nodetc1001)*2u' tc1='-3*100u/ape' tc2='sqrt(100)*giraffe' 
+
+* A normal one
+B99 7 0 v = tanh( pi * v(ctrl,1) )
+R99 7 0 1k
 
 .tran 1u 1ms uic
 .options method=trap reltol=1m
 
-*.inc ngspice.inc
 .control
    listing e
    run
    set filetype=ascii
    write testRLC.raw
-*  quit
 .endc
 
 .end
diff --git a/tests/regression/behavioralRLC/testRLC2.cir b/tests/regression/behavioralRLC/testRLC2.cir
index 70a05d3e9..e6985ea8f 100644
--- a/tests/regression/behavioralRLC/testRLC2.cir
+++ b/tests/regression/behavioralRLC/testRLC2.cir
@@ -6,20 +6,20 @@ X1 0 1 2 dummy a={3*ape} b={sqrt(bear)} c={giraffe+5}
 
 Vx nodetc2001 0 dc=2
 Rx 1 2 1k
-Bx 1 0 v = {bear*1.23*pi/ape} tc1=-300u tc2=10m 
+Bx 1 0 v = {bear*1.23*pi/ape} tc1=-300u tc2=10m temp=100 dtemp=5
 
 R1 2 0 R='12+1u*25'
 R2 2 0 R='24+v(nodetc2001)*2u'
-R3 2 0 R='36+v(nodetc2001)*2u' tc1=-300u tc2=10m 
+R3 2 0 R='36+v(nodetc2001)*2u' tc1=-300u tc2=10m temp=100
 
 C1 2 0 C='1u*25'
 C2 2 0 C='v(nodetc2001)*2u'
-C3 2 0 C='v(nodetc2001)*2u' tc1=-300u' tc2=10m
+C3 2 0 C='v(nodetc2001)*2u' tc1=-300u tc2=10m dtemp=5
 
 L1 2 0 L='1u*25'
 L2 2 x L='v(nodetc2001)*2u'
 Ri x 0 1
-L3 2 0 L='v(nodetc2001)*2u' tc1=-300u tc2=10m
+L3 2 0 L='v(nodetc2001)*2u' tc1=-300u tc2=10m temp=100
 
 .subckt dummy 0 1 2  a=1 b=2 c=3
 r1 1 0 {a}