more fixes to tests and examples

tcaduser · tcaduser · commit 4cdfb7c4b740 · 2018-10-21T09:18:35.000-05:00
diff --git a/examples/mobility/gmsh_mos2d_create.py b/examples/mobility/gmsh_mos2d_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 *
 device ="mos2d"
 
 device_width    =1.0e-4
diff --git a/examples/mobility/gmsh_mos2d_kla.py b/examples/mobility/gmsh_mos2d_kla.py
@@ -15,7 +15,7 @@
 #set_parameter -name threads_available -value 1
 #set_parameter -name threads_task_size -value 1024
 import gmsh_mos2d_create
-from ds import *
+from devsim import *
 from python_packages.simple_physics import *
 from python_packages.ramp import *
 from python_packages.Klaassen import *
diff --git a/examples/mobility/pythonmesh2d.py b/examples/mobility/pythonmesh2d.py
@@ -1,4 +1,4 @@
-from ds import *
+from devsim import *
 import python_packages.pythonmesh
 
 def gmsh_reader(mesh, device, filename="", coordinates="", physical_names="", elements=""):
diff --git a/examples/vectorpotential/twowire.py b/examples/vectorpotential/twowire.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="twowire"
 
 create_gmsh_mesh(file="twowire.msh", mesh="twowire")
diff --git a/python_packages/ramp.py b/python_packages/ramp.py
@@ -15,7 +15,7 @@
 import sys
 sys.path.append('../../python_packages')
 from devsim import *
-import ds
+import devsim
 from simple_physics import *
 
 def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error, abs_error, callback):
@@ -43,7 +43,7 @@ def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error
     set_parameter(device=device, name=GetContactBiasName(contact), value=next_bias)
     try:
       solve(type="dc", absolute_error=abs_error, relative_error=rel_error, maximum_iterations=max_iter)
-    except ds.error as msg:
+    except devsim.error as msg:
       if msg[0].find("Convergence failure") != 0:
         raise
       set_parameter(device=device, name=GetContactBiasName(contact), value=last_bias)
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
@@ -218,4 +218,7 @@ ADD_TEST("testing/laux1" ${RUNDIFFTEST} "${DEVSIM_PY} laux1.py" ${GOLDENDIR}/tes
 # this is weird since it is dependent on one of our tcl tests
 set_tests_properties("testing/laux1" PROPERTIES DEPENDS testing/trimesh2)
 
-set_tests_properties("${DIODE_DIR}/laux2d" PROPERTIES ENVIRONMENT "DYLD_INSERT_LIBRARIES=$ENV{DYLD_INSERT_LIBRARIES};PYTHONHOME=$ENV{PYTHONHOME}")
+#set_tests_properties("${DIODE_DIR}/laux2d" PROPERTIES ENVIRONMENT "DYLD_INSERT_LIBRARIES=$ENV{DYLD_INSERT_LIBRARIES};PYTHONHOME=$ENV{PYTHONHOME}")
+
+
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from ds import *`
	`1`	`+from devsim import *`
`2`	`2`	`import python_packages.pythonmesh`
`3`	`3`
`4`	`4`	`def gmsh_reader(mesh, device, filename="", coordinates="", physical_names="", elements=""):`