Skip to content

Commit 562a95f

Browse files
tcadusertcaduser
committed
python formatting: autopep8 . --select E12,E101
1 parent 2d8c108 commit 562a95f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2405
-2405
lines changed

‎dist/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#imported = getattr(__import__(package, fromlist=[name]), name)
66

77
if sys.version_info[0] == 3:
8-
from .devsim_py3 import *
9-
from .devsim_py3 import __version__
8+
from .devsim_py3 import *
9+
from .devsim_py3 import __version__
1010
else:
11-
raise ImportError('module not available for Python %d.%d please contact technical support' % sys.version_info[0:2])
11+
raise ImportError('module not available for Python %d.%d please contact technical support' % sys.version_info[0:2])
1212

1313

1414

‎dist/msys_devsim__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
os.environ['PATH'] = os.environ['PATH'] + os.pathsep + os.path.normpath(os.path.join(os.path.dirname(__file__), '../msys'))
55

66
if sys.version_info[0] == 3:
7-
from .devsim_py3 import *
8-
from .devsim_py3 import __version__
7+
from .devsim_py3 import *
8+
from .devsim_py3 import __version__
99
else:
10-
raise ImportError('module not available for Python %d.%d please contact technical support' % sys.version_info[0:2])
10+
raise ImportError('module not available for Python %d.%d please contact technical support' % sys.version_info[0:2])
1111

1212

1313

‎dist/msys_symdiff__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
os.environ['PATH'] = os.environ['PATH'] + os.pathsep + os.path.normpath(os.path.join(os.path.dirname(__file__), '../msys'))
66

77
if sys.version_info[0] == 3:
8-
from .symdiff_py3 import *
9-
from .symdiff_py3 import __version__
8+
from .symdiff_py3 import *
9+
from .symdiff_py3 import __version__
1010
else:
11-
raise ImportError('module not available for Python %d.%d please contact technical support' % sys.version_info[0:2])
11+
raise ImportError('module not available for Python %d.%d please contact technical support' % sys.version_info[0:2])
1212

1313

‎examples/bioapp1/bioapp1_2d.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
set_parameter(device="disk", region="dna", name="charge_density", value=0)
4545
solve(type="dc", relative_error=1e-7, absolute_error=1e11, maximum_iterations=100)
4646
for region in ("dna", "dielectric", "solution"):
47-
node_solution (device=device, region=region, name="Potential_zero")
48-
set_node_values (device=device, region=region, name="Potential_zero", init_from="Potential")
47+
node_solution (device=device, region=region, name="Potential_zero")
48+
set_node_values (device=device, region=region, name="Potential_zero", init_from="Potential")
4949

5050
set_parameter(device="disk", region="dna", name="charge_density", value=2e21)
5151
solve(type="dc", relative_error=1e-7, absolute_error=1e11, maximum_iterations=100)
5252
for region in ("dna", "dielectric", "solution"):
53-
node_model(device=device, region=region, name="LogDeltaPotential",
54-
equation="log(abs(Potential-Potential_zero) + 1e-10)/log(10)")
53+
node_model(device=device, region=region, name="LogDeltaPotential",
54+
equation="log(abs(Potential-Potential_zero) + 1e-10)/log(10)")
5555

5656
write_devices(file="bioapp1_2d_{0}.dat".format(Ve), type="tecplot")
5757

‎examples/bioapp1/bioapp1_3d.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
set_parameter(device="disk", region="dna", name="charge_density", value=0)
4545
solve(type="dc", relative_error=1e-7, absolute_error=1e11, maximum_iterations=100)
4646
for region in ("dna", "dielectric", "solution"):
47-
node_solution (device=device, region=region, name="Potential_zero")
48-
set_node_values (device=device, region=region, name="Potential_zero", init_from="Potential")
47+
node_solution (device=device, region=region, name="Potential_zero")
48+
set_node_values (device=device, region=region, name="Potential_zero", init_from="Potential")
4949

5050
set_parameter(device="disk", region="dna", name="charge_density", value=2e21)
5151
solve(type="dc", relative_error=1e-7, absolute_error=1e11, maximum_iterations=100)
5252
for region in ("dna", "dielectric", "solution"):
53-
node_model(device=device, region=region, name="LogDeltaPotential",
54-
equation="log(abs(Potential-Potential_zero) + 1e-10)/log(10)")
53+
node_model(device=device, region=region, name="LogDeltaPotential",
54+
equation="log(abs(Potential-Potential_zero) + 1e-10)/log(10)")
5555

5656
write_devices(file="bioapp1_3d_{0}.dat".format(Ve), type="tecplot")
5757

‎examples/bioapp1/bioapp1_common.py‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -33,41 +33,41 @@
3333
set_parameter(device="disk", region="solution", name="V_t", value=0.0238)
3434

3535
for region in ("dna", "dielectric", "solution"):
36-
node_solution(device="disk", region=region, name="Potential")
37-
edge_from_node_model(device="disk", region=region, node_model="Potential")
38-
39-
if dimension == 2:
40-
set_parameter(device="disk", name="raxis_variable", value="x")
41-
set_parameter(device="disk", name="raxis_zero", value=0)
42-
cylindrical_node_volume(device="disk", region=region)
43-
cylindrical_edge_couple(device="disk", region=region)
44-
45-
set_parameter(name="node_volume_model", value="CylindricalNodeVolume")
46-
set_parameter(name="edge_couple_model", value="CylindricalEdgeCouple")
47-
set_parameter(name="element_edge_couple_model", value="ElementCylindricalEdgeCouple")
48-
set_parameter(name="element_node0_volume_model", value="ElementCylindricalNodeVolume@en0")
49-
set_parameter(name="element_node1_volume_model", value="ElementCylindricalNodeVolume@en1")
50-
51-
x=sum(get_node_model_values(device="disk", region=region, name="CylindricalNodeVolume"))
52-
y=sum(get_node_model_values(device="disk", region=region, name="NodeVolume"))
53-
print("Volume {0} {1} {2}".format(region, x, y))
54-
else:
55-
y=sum(get_node_model_values(device="disk", region=region, name="NodeVolume"))
56-
print("Volume {0} {1}".format(region, y))
57-
58-
# Electric Field Edge Model
59-
edge_model(device="disk", region=region, name="EField",
60-
equation="(Potential@n0 - Potential@n1)*EdgeInverseLength")
61-
62-
edge_model(device="disk", region=region, name="EField:Potential@n0",
63-
equation="EdgeInverseLength",)
64-
65-
edge_model(device="disk", region=region, name="EField:Potential@n1",
66-
equation="-EdgeInverseLength")
67-
68-
edge_model(device="disk", region=region, name="DField", equation="Permittivity*EField")
69-
edge_model(device="disk", region=region, name="DField:Potential@n0", equation="Permittivity*EField:Potential@n0")
70-
edge_model(device="disk", region=region, name="DField:Potential@n1", equation="Permittivity*EField:Potential@n1")
36+
node_solution(device="disk", region=region, name="Potential")
37+
edge_from_node_model(device="disk", region=region, node_model="Potential")
38+
39+
if dimension == 2:
40+
set_parameter(device="disk", name="raxis_variable", value="x")
41+
set_parameter(device="disk", name="raxis_zero", value=0)
42+
cylindrical_node_volume(device="disk", region=region)
43+
cylindrical_edge_couple(device="disk", region=region)
44+
45+
set_parameter(name="node_volume_model", value="CylindricalNodeVolume")
46+
set_parameter(name="edge_couple_model", value="CylindricalEdgeCouple")
47+
set_parameter(name="element_edge_couple_model", value="ElementCylindricalEdgeCouple")
48+
set_parameter(name="element_node0_volume_model", value="ElementCylindricalNodeVolume@en0")
49+
set_parameter(name="element_node1_volume_model", value="ElementCylindricalNodeVolume@en1")
50+
51+
x=sum(get_node_model_values(device="disk", region=region, name="CylindricalNodeVolume"))
52+
y=sum(get_node_model_values(device="disk", region=region, name="NodeVolume"))
53+
print("Volume {0} {1} {2}".format(region, x, y))
54+
else:
55+
y=sum(get_node_model_values(device="disk", region=region, name="NodeVolume"))
56+
print("Volume {0} {1}".format(region, y))
57+
58+
# Electric Field Edge Model
59+
edge_model(device="disk", region=region, name="EField",
60+
equation="(Potential@n0 - Potential@n1)*EdgeInverseLength")
61+
62+
edge_model(device="disk", region=region, name="EField:Potential@n0",
63+
equation="EdgeInverseLength",)
64+
65+
edge_model(device="disk", region=region, name="EField:Potential@n1",
66+
equation="-EdgeInverseLength")
67+
68+
edge_model(device="disk", region=region, name="DField", equation="Permittivity*EField")
69+
edge_model(device="disk", region=region, name="DField:Potential@n0", equation="Permittivity*EField:Potential@n0")
70+
edge_model(device="disk", region=region, name="DField:Potential@n1", equation="Permittivity*EField:Potential@n1")
7171

7272
#create anions and cations solution variable in solution (positive only applied in equation)
7373
node_solution(device="disk", region="solution", name="cations")
@@ -89,9 +89,9 @@
8989

9090

9191
for region in ("dna", "dielectric"):
92-
node_model(device="disk", region=region, name="NetCharge", equation="-q*charge_density")
93-
equation(device="disk", region=region, name="PotentialEquation", variable_name="Potential",
94-
node_model="NetCharge", edge_model="DField", variable_update="default")
92+
node_model(device="disk", region=region, name="NetCharge", equation="-q*charge_density")
93+
equation(device="disk", region=region, name="PotentialEquation", variable_name="Potential",
94+
node_model="NetCharge", edge_model="DField", variable_update="default")
9595

9696
#create fluxes in solution
9797
# This is complicated, but the Bernoulli functions are a representation of Sharfetter Gummel
@@ -117,8 +117,8 @@
117117

118118
#derivatives w.r.t. the solution variables
119119
for v in ("Potential@n0", "Potential@n1", "anions@n0", "anions@n1", "cations@n0", "cations@n1"):
120-
edge_model(device="disk", region="solution", name="AnionFlux:{0}".format(v), equation="simplify(diff({0},{1}))".format(Ja, v))
121-
edge_model(device="disk", region="solution", name="CationFlux:{0}".format(v), equation="simplify(diff({0},{1}))".format(Jc, v))
120+
edge_model(device="disk", region="solution", name="AnionFlux:{0}".format(v), equation="simplify(diff({0},{1}))".format(Ja, v))
121+
edge_model(device="disk", region="solution", name="CationFlux:{0}".format(v), equation="simplify(diff({0},{1}))".format(Jc, v))
122122

123123
#create continuity equations in solution
124124
equation(device="disk", region="solution", name="AnionContinuityEquation", variable_name="anions",
@@ -129,31 +129,31 @@
129129

130130
#create n0, and potential boundary condition at contact
131131
for contact in ("top", "bot"):
132-
node_model(device="disk", region="solution", name="{0}_potential".format(contact), equation="Potential - {0}_bias".format(contact))
133-
node_model(device="disk", region="solution", name="{0}_potential:Potential".format(contact), equation="1")
132+
node_model(device="disk", region="solution", name="{0}_potential".format(contact), equation="Potential - {0}_bias".format(contact))
133+
node_model(device="disk", region="solution", name="{0}_potential:Potential".format(contact), equation="1")
134134

135-
contact_equation(device="disk", contact=contact, name="PotentialEquation", variable_name="Potential",
136-
node_model="{0}_potential".format(contact), edge_charge_model="DField")
135+
contact_equation(device="disk", contact=contact, name="PotentialEquation", variable_name="Potential",
136+
node_model="{0}_potential".format(contact), edge_charge_model="DField")
137137

138-
contact_node_model(device="disk", contact=contact, name="{0}_anion".format(contact), equation="anions - n_bound")
139-
contact_node_model(device="disk", contact=contact, name="{0}_anion:anions".format(contact), equation="1")
140-
contact_equation(device="disk", contact=contact, name="AnionContinuityEquation", variable_name="anions", node_model="{0}_anion".format(contact))
138+
contact_node_model(device="disk", contact=contact, name="{0}_anion".format(contact), equation="anions - n_bound")
139+
contact_node_model(device="disk", contact=contact, name="{0}_anion:anions".format(contact), equation="1")
140+
contact_equation(device="disk", contact=contact, name="AnionContinuityEquation", variable_name="anions", node_model="{0}_anion".format(contact))
141141

142-
contact_node_model(device="disk", contact=contact, name="{0}_cation".format(contact), equation="cations - n_bound")
143-
contact_node_model(device="disk", contact=contact, name="{0}_cation:cations".format(contact), equation="1")
144-
contact_equation(device="disk", contact=contact, name="CationContinuityEquation", variable_name="cations", node_model="{0}_cation".format(contact))
142+
contact_node_model(device="disk", contact=contact, name="{0}_cation".format(contact), equation="cations - n_bound")
143+
contact_node_model(device="disk", contact=contact, name="{0}_cation:cations".format(contact), equation="1")
144+
contact_equation(device="disk", contact=contact, name="CationContinuityEquation", variable_name="cations", node_model="{0}_cation".format(contact))
145145

146146

147147
#create potential continuity at interfaces
148148
for interface in ("dna_solution", "dielectric_solution"):
149-
interface_model(device="disk", interface=interface, name="continuousPotential", equation="Potential@r0-Potential@r1")
150-
interface_model(device="disk", interface=interface, name="continuousPotential:Potential@r0", equation="1")
151-
interface_model(device="disk", interface=interface, name="continuousPotential:Potential@r1", equation="-1")
152-
interface_equation(device="disk", interface=interface, name="PotentialEquation", variable_name="Potential", interface_model="continuousPotential", type="continuous")
149+
interface_model(device="disk", interface=interface, name="continuousPotential", equation="Potential@r0-Potential@r1")
150+
interface_model(device="disk", interface=interface, name="continuousPotential:Potential@r0", equation="1")
151+
interface_model(device="disk", interface=interface, name="continuousPotential:Potential@r1", equation="-1")
152+
interface_equation(device="disk", interface=interface, name="PotentialEquation", variable_name="Potential", interface_model="continuousPotential", type="continuous")
153153

154154
# For visualization
155155
for region in ("dna", "dielectric", "solution"):
156-
element_from_edge_model(edge_model="EField", device="disk", region=region)
156+
element_from_edge_model(edge_model="EField", device="disk", region=region)
157157
element_from_edge_model(edge_model="AnionFlux", device="disk", region="solution")
158158
element_from_edge_model(edge_model="CationFlux", device="disk", region="solution")
159159

‎examples/capacitance/cap1d.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@
7979
### Contact models and equations
8080
###
8181
for c in ("contact1", "contact2"):
82-
contact_node_model(device=device, contact=c, name="%s_bc" % c,
83-
equation="Potential - %s_bias" % c)
82+
contact_node_model(device=device, contact=c, name="%s_bc" % c,
83+
equation="Potential - %s_bias" % c)
8484

85-
contact_node_model(device=device, contact=c, name="%s_bc:Potential" % c,
86-
equation="1")
85+
contact_node_model(device=device, contact=c, name="%s_bc:Potential" % c,
86+
equation="1")
8787

88-
contact_equation(device=device, contact=c, name="PotentialEquation",
89-
variable_name="Potential",
90-
node_model="%s_bc" % c, edge_charge_model="DField")
88+
contact_equation(device=device, contact=c, name="PotentialEquation",
89+
variable_name="Potential",
90+
node_model="%s_bc" % c, edge_charge_model="DField")
9191

9292
###
9393
### Set the contact
@@ -104,5 +104,5 @@
104104
### Print the charge on the contacts
105105
###
106106
for c in ("contact1", "contact2"):
107-
print ("contact: %s charge: %1.5e" % (c, get_contact_charge(device=device, contact=c, equation="PotentialEquation")))
107+
print ("contact: %s charge: %1.5e" % (c, get_contact_charge(device=device, contact=c, equation="PotentialEquation")))
108108

‎examples/capacitance/cap2d.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@
111111
### Contact models and equations
112112
###
113113
for c in ("top", "bot"):
114-
contact_node_model(device=device, contact=c, name="%s_bc" % c,
115-
equation="Potential - %s_bias" % c)
114+
contact_node_model(device=device, contact=c, name="%s_bc" % c,
115+
equation="Potential - %s_bias" % c)
116116

117-
contact_node_model(device=device, contact=c, name="%s_bc:Potential" % c,
118-
equation="1")
117+
contact_node_model(device=device, contact=c, name="%s_bc:Potential" % c,
118+
equation="1")
119119

120-
contact_equation(device=device, contact=c, name="PotentialEquation",
121-
variable_name="Potential",
122-
node_model="%s_bc" % c, edge_charge_model="DField")
120+
contact_equation(device=device, contact=c, name="PotentialEquation",
121+
variable_name="Potential",
122+
node_model="%s_bc" % c, edge_charge_model="DField")
123123

124124
###
125125
### Set the contact

‎examples/diode/diode_1d.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@
5454
####
5555
v = 0.0
5656
while v < 0.51:
57-
set_parameter(device=device, name=GetContactBiasName("top"), value=v)
58-
solve(type="dc", absolute_error=1e10, relative_error=1e-10, maximum_iterations=30)
59-
PrintCurrents(device, "top")
60-
PrintCurrents(device, "bot")
61-
v += 0.1
57+
set_parameter(device=device, name=GetContactBiasName("top"), value=v)
58+
solve(type="dc", absolute_error=1e10, relative_error=1e-10, maximum_iterations=30)
59+
PrintCurrents(device, "top")
60+
PrintCurrents(device, "bot")
61+
v += 0.1
6262

6363
write_devices(file="diode_1d.dat", type="tecplot")
6464

‎examples/diode/diode_2d.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
####
5050
v = 0.0
5151
while v < 0.51:
52-
set_parameter(device=device, name=GetContactBiasName("top"), value=v)
53-
solve(type="dc", absolute_error=1e10, relative_error=1e-10, maximum_iterations=30)
54-
PrintCurrents(device, "top")
55-
PrintCurrents(device, "bot")
56-
v += 0.1
52+
set_parameter(device=device, name=GetContactBiasName("top"), value=v)
53+
solve(type="dc", absolute_error=1e10, relative_error=1e-10, maximum_iterations=30)
54+
PrintCurrents(device, "top")
55+
PrintCurrents(device, "bot")
56+
v += 0.1
5757

0 commit comments

Comments
 (0)