working on updating test input files for python changes

tcaduser · tcaduser · commit d6aa3f07282a · 2018-10-20T19:43:09.000-05:00
diff --git a/examples/capacitance/cap1d.py b/examples/capacitance/cap1d.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 device="MyDevice"
 region="MyRegion"
 
diff --git a/examples/capacitance/cap2d.py b/examples/capacitance/cap2d.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 device="MyDevice"
 region="MyRegion"
 
diff --git a/python_packages/Klaassen.py b/python_packages/Klaassen.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 from python_packages.model_create import *
 
 def Set_Mobility_Parameters(device, region):
diff --git a/python_packages/model_create.py b/python_packages/model_create.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 debug = False
 def CreateSolution(device, region, name):
   '''
diff --git a/python_packages/mos_physics.py b/python_packages/mos_physics.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 from python_packages.model_create import *
 
 def CreateElementElectronContinuityEquation(device, region, current_model):
diff --git a/python_packages/pythonmesh.py b/python_packages/pythonmesh.py
@@ -1,4 +1,4 @@
-from ds import *
+from devsim import *
 
 def parse_gmsh_file(file):
   sections=set(['$MeshFormat', '$PhysicalNames', '$Nodes', '$Elements'])
diff --git a/python_packages/ramp.py b/python_packages/ramp.py
@@ -14,7 +14,7 @@
 
 import sys
 sys.path.append('../../python_packages')
-from ds import *
+from devsim import *
 import ds
 from simple_physics import *
 
diff --git a/python_packages/simple_physics.py b/python_packages/simple_physics.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from simple_dd import *
-from ds import *
+from devsim import *
 #TODO: make this a class so that paramters can be changed
 contactcharge_node="contactcharge_node"
 contactcharge_edge="contactcharge_edge"
diff --git a/testing/cap2.py b/testing/cap2.py
@@ -16,7 +16,7 @@
 #### cap2.py
 #### tests physics of cap made of two insulating regions
 ####
-from ds import *
+from devsim import *
 device="MyDevice"
 interface="MySiOx"
 regions =("MyOxRegion", "MySiRegion")
@@ -204,11 +204,11 @@ def get_ilist():
 solve(type="dc", absolute_error=1.0, relative_error=1e-10, maximum_iterations=30)
 
 # test exception
-import ds
+import devsim
 node_model(device=device, region="MySiRegion", name="test", equation="log(-1)")
 try:
   print(get_node_model_values(device=device, region="MySiRegion", name="test"))
-except ds.error as x:
+except devsim.error as x:
   print(x)
 print("The DEVSIM FATAL message is part of the test.  The FPE exception was caught and the program will terminate normally.")
 
diff --git a/testing/cap3.py b/testing/cap3.py
@@ -16,7 +16,7 @@
 #### cap2.py
 #### tests physics of cap made of two insulating regions
 ####
-from ds import *
+from devsim import *
 device="MyDevice"
 interface="MySiOx"
 regions =("MyOxRegion", "MySiRegion")
@@ -163,8 +163,6 @@ def get_ilist():
 cl = get_clist()
 il = get_ilist()
 
-print()
-print()
 
 for i in rl:
   delete_equation(device=i['device'], region=i['region'], name=i['name'])
@@ -204,11 +202,11 @@ def get_ilist():
 solve(type="dc", absolute_error=1.0, relative_error=1e-10, maximum_iterations=30)
 
 # test exception
-import ds
+import devsim
 node_model(device=device, region="MySiRegion", name="test", equation="log(-1)")
 try:
   print(get_node_model_values(device=device, region="MySiRegion", name="test"))
-except ds.error as x:
+except devsim.error as x:
   print(x)
 print("The DEVSIM FATAL message is part of the test.  The FPE exception was caught and the program will terminate normally.")
 
diff --git a/testing/cap_mesh.py b/testing/cap_mesh.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 def cap_mesh(region_name, material_name):
   '''
     Creates a simple cap mesh named cap1 for test purposes with a given region name
diff --git a/testing/equation1.py b/testing/equation1.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 # basic linear circuit solved by itself
 add_circuit_node(name="n1", variable_update="default")
 add_circuit_node(name="n2", variable_update="default")
diff --git a/testing/laux1.py b/testing/laux1.py
@@ -42,7 +42,7 @@
   sys.exit(-1)
 
 
-from ds import *
+from devsim import *
 
 def calculateValues(scalar_efield, eecouple, sx, sy):
   row0 = numpy.array([0, 0, 1])
diff --git a/testing/ptest2.py b/testing/ptest2.py
@@ -15,7 +15,7 @@
 ####
 #### package test for drift diffusion
 ####
-from ds import *
+from devsim import *
 from python_packages.simple_physics import *
 
 device="MyDevice"
diff --git a/testing/pythonmesh1d.py b/testing/pythonmesh1d.py
@@ -1,4 +1,6 @@
 
+from devsim import *
+
 print "coordinates"
 coordinates=[]
 for i in range(0,11):
@@ -39,7 +41,6 @@
 print physical_names
 print
 
-from ds import *
 create_gmsh_mesh(mesh="toy", coordinates=coordinates, physical_names=physical_names, elements=elements)
 add_gmsh_region(mesh="toy", gmsh_name="top", region="top", material="silicon")
 add_gmsh_region(mesh="toy", gmsh_name="bot", region="bot", material="silicon")
diff --git a/testing/sqlite2.py b/testing/sqlite2.py
@@ -24,7 +24,7 @@
 #set x [db1 eval {INSERT INTO t1 VALUES('global', 'm0', '9.10938188e-31', 'kg', 'Electron Mass')}];
 #set x [db1 eval {SELECT * FROM t1 ORDER BY material}] 
 #puts $x
-from ds import *
+from devsim import *
 create_db(filename="foodb")
 add_db_entry(material="global", parameter="q", value=1.60217646e-19, unit="coul", description="Electron Charge")
 add_db_entry(material="global", parameter="one", value=2, unit="", description="")
diff --git a/testing/sqlite3.py b/testing/sqlite3.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 #print region_info
 device ="d1"
 region ="r1"
diff --git a/testing/testfunc.py b/testing/testfunc.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ds import *
+from devsim import *
 from math import cos
 from math import sin
 device = "MyDevice"
diff --git a/testing/utf8_2.py b/testing/utf8_2.py
@@ -15,7 +15,7 @@
 
 ##Title: cap1.py
 ##Purpose: Simple example for 1D capacitor
-from ds import *
+from devsim import *
 
 device_info = {'device' : 'MyDevice'}
 region_info = device_info

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from ds import *`
	`1`	`+from devsim import *`
`2`	`2`
`3`	`3`	`def parse_gmsh_file(file):`
`4`	`4`	`sections=set(['$MeshFormat', '$PhysicalNames', '$Nodes', '$Elements'])`