From 138a047ddec734acaa84a6cd5c51e4f88aa64cfd Mon Sep 17 00:00:00 2001
From: fuchenxi <1256257282@qq.com>
Date: Sat, 21 Sep 2024 16:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AD=98=E5=8F=96=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
elec/__init__.py | 2 +-
elec/ngspice.py | 2 +-
elec/t1_create.py | 8 ++++----
tct/tct_t1.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/elec/__init__.py b/elec/__init__.py
index 78b02f07..235229be 100644
--- a/elec/__init__.py
+++ b/elec/__init__.py
@@ -4,7 +4,7 @@ def main(kwargs):
if label == 'ngspice_t1':
import subprocess
- subprocess.run(['ngspice -b output/T1_tmp.cir'], shell=True)
+ subprocess.run(['ngspice -b output/elec/T1_tmp.cir'], shell=True)
elif label == 'drs4_get_analog':
import subprocess
subprocess.run(['ngspice -b param_file/circuit/drs4_analog.cir'], shell=True)
diff --git a/elec/ngspice.py b/elec/ngspice.py
index f3999d11..815c1845 100644
--- a/elec/ngspice.py
+++ b/elec/ngspice.py
@@ -5,7 +5,7 @@ def ngspice(input_c, input_p):
lines[140] = 'tran 0.1p ' + str((input_p[len(input_p) - 2])) + '\n'
lines[141] = 'wrdata output/t1.raw v(out)\n'
f.close()
- with open('./output/T1_tmp.cir', 'w') as f:
+ with open('./output/elec/T1_tmp.cir', 'w') as f:
f.writelines(lines)
f.close()
# TODO: Need to be TOTALLY rewritten
\ No newline at end of file
diff --git a/elec/t1_create.py b/elec/t1_create.py
index f7b0effa..69410b8c 100644
--- a/elec/t1_create.py
+++ b/elec/t1_create.py
@@ -76,11 +76,11 @@ if number>=1:
lines[140] = 'tran 0.1p ' + str((input_c[len(input_c) - 2])) + '\n'
lines[141] = 'wrdata output/'+str(L)+'t1.txt v(out)\n'
f.close()
- with open('/scratchfs/atlas/xingchenli/raser/output/T1_tmp.cir', 'w') as f:
+ with open('/scratchfs/atlas/xingchenli/raser/output/elec/T1_tmp.cir', 'w') as f:
f.writelines(lines)
f.close()
- os.system("ngspice -b -r t1.txt output/T1_tmp.cir")
+ os.system("ngspice -b -r t1.txt output/elec/T1_tmp.cir")
t1=np.loadtxt('/scratchfs/atlas/xingchenli/raser/output/'+str(L)+'t1.txt',dtype=float)
volt=[]
@@ -148,11 +148,11 @@ else:
lines[140] = 'tran 0.1p ' + str((input_c[len(input_c) - 2])) + '\n'
lines[141] = 'wrdata output/'+str(L)+'t1.txt v(out)\n'
f.close()
- with open('/scratchfs/atlas/xingchenli/raser/output/T1_tmp.cir', 'w') as f:
+ with open('/scratchfs/atlas/xingchenli/raser/output/elec/T1_tmp.cir', 'w') as f:
f.writelines(lines)
f.close()
- os.system("ngspice -b -r t1.txt output/T1_tmp.cir")
+ os.system("ngspice -b -r t1.txt output/elec/T1_tmp.cir")
t1=np.loadtxt('/scratchfs/atlas/xingchenli/raser/output/'+str(L)+'t1.txt',dtype=float)
volt=[]
diff --git a/tct/tct_t1.py b/tct/tct_t1.py
index 647dda7f..cb27db07 100644
--- a/tct/tct_t1.py
+++ b/tct/tct_t1.py
@@ -70,7 +70,7 @@ with open('param_file/circuit/T1.cir', 'r') as f:
lines[140] = 'tran 0.1p ' + str((T_ele[len(T_ele) - 1])) + 'n\n'
lines[142] = 'wrdata output/t1.raw v(out)\n'
f.close()
-with open('output/T1_tmp.cir', 'w') as f:
+with open('output/elec/T1_tmp.cir', 'w') as f:
f.writelines(lines)
f.close()
--
GitLab