13 files changed, 0 insertions, 813 deletions
diff --git a/Windows/spice/tests/mesa/Makefile.am b/Windows/spice/tests/mesa/Makefile.am
deleted file mode 100644
index a516408b..00000000
--- a/Windows/spice/tests/mesa/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-TESTS = \
-	mesa11.cir		\
-	mesa13.cir		\
-	mesa14.cir		\
-	mesa15.cir		\
-	mesa21.cir		\
-	mesa.cir		\
-	mesgout.cir		\
-	mesinv.cir		\
-	mesosc.cir
-
-TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice
-
-EXTRA_DIST = \
-	$(TESTS) \
-	$(TESTS:.cir=.out)
-
-EXTRA_DIST += mesa12.cir mesa-12.cir
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/Windows/spice/tests/mesa/Makefile.in b/Windows/spice/tests/mesa/Makefile.in
deleted file mode 100644
index 304d4e92..00000000
--- a/Windows/spice/tests/mesa/Makefile.in
+++ /dev/null
@@ -1,519 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = tests/mesa
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/include/ngspice/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADMSXML = @ADMSXML@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NOTVLADEVDIR = @NOTVLADEVDIR@
-NOTXGRAPH = @NOTXGRAPH@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENMP_CFLAGS = @OPENMP_CFLAGS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STATIC = @STATIC@
-STRIP = @STRIP@
-TCL_LIB_SPEC = @TCL_LIB_SPEC@
-TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
-VERSION = @VERSION@
-VLADEV = @VLADEV@
-VLADEVDIR = @VLADEVDIR@
-XGRAPHDIR = @XGRAPHDIR@
-XMKMF = @XMKMF@
-XSPICEDLLIBS = @XSPICEDLLIBS@
-XSPICEINIT = @XSPICEINIT@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-TESTS = \
-	mesa11.cir		\
-	mesa13.cir		\
-	mesa14.cir		\
-	mesa15.cir		\
-	mesa21.cir		\
-	mesa.cir		\
-	mesgout.cir		\
-	mesinv.cir		\
-	mesosc.cir
-
-TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice
-EXTRA_DIST = $(TESTS) $(TESTS:.cir=.out) mesa12.cir mesa-12.cir
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/mesa/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/mesa/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: all all-am check check-TESTS check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/Windows/spice/tests/mesa/mesa-12.cir b/Windows/spice/tests/mesa/mesa-12.cir
deleted file mode 100644
index 69eef9ba..00000000
--- a/Windows/spice/tests/mesa/mesa-12.cir
+++ /dev/null
@@ -1,23 +0,0 @@
-* MESA1 transient test - 
-* Taken from macspice3f4
-*
-* This netlist shows convergence problems in ngspice.
-* Paolo Nenzi (rework-14)
-
-rd 1 3 10k
-z1 3 2 0 mesa1 l=1u w=20u
-vgs 2 0 dc 0 pulse(-3 0 0 0.5n 0.5n 2n 4n)
-vdd  1 0 5v
-.model mesa1 nmf(level=2 rd=31 rs=31)
-
-.options noacct
-
-.dc vgs -2 0 0.02
-.tran 0.1n 5n
-.print v(3) v(2)
-.end
-
-.control
-run
-plot v(2) v(3)
-.endc
diff --git a/Windows/spice/tests/mesa/mesa.cir b/Windows/spice/tests/mesa/mesa.cir
deleted file mode 100644
index 2df40984..00000000
--- a/Windows/spice/tests/mesa/mesa.cir
+++ /dev/null
@@ -1,16 +0,0 @@
-* DCFL GaAs MESFET Gate\
-* Taken from macspice3f4
-
-vdd 1 0 dc 3
-vin 3 0 dc 0
-z1 2 3 0 enha l=1u w=10u
-z2 1 2 2 depl l=1u w=10u
-
-.model enha nmf level=2 rd=31 rs=31 vto=0.1 astar=0
-.model depl nmf level=2 rd=31 rs=31 vto=-1.0 astar=0
-
-.options noacct
-
-.dc vin 0 3.0 0.05
-.print dc v(2) vin#branch
-.end
diff --git a/Windows/spice/tests/mesa/mesa11.cir b/Windows/spice/tests/mesa/mesa11.cir
deleted file mode 100644
index 45978b43..00000000
--- a/Windows/spice/tests/mesa/mesa11.cir
+++ /dev/null
@@ -1,18 +0,0 @@
-* Mesa Level 2 test
-* Taken from macspice3f4 archive.
-
-vds 1 0
-vids 1 2 dc 0
-vgs 3 0 dc 0
-z1 2 3 0 mesmod l=1u w=20u
-
-.options noacct
-.op
-.dc vds 0 2 0.05 vgs -1.2 0 0.4
-.print  DC vids#branch
-
-.model mesmod nmf level=2
-*d=0.12u mu=0.23 vs=1.5e5 m=2.5
-*+ vto=-1.26 eta=1.73 lambda=0.045 sigma0=0.081 vsigma=0.1
-*+ vsigmat=1 rd=31 rs=31
-.end
diff --git a/Windows/spice/tests/mesa/mesa12.cir b/Windows/spice/tests/mesa/mesa12.cir
deleted file mode 100644
index 71efea97..00000000
--- a/Windows/spice/tests/mesa/mesa12.cir
+++ /dev/null
@@ -1,17 +0,0 @@
-* MESA1 transient test 
-* Taken from macspice3f4
-* 
-* This netlist shows convergence problems in ngspice
-
-rd 1 3 10k
-z1 3 2 0 mesa1 l=1u w=20u
-vgs 2 0 dc 0 pulse(-3 0 0 0.5n 0.5n 2n 4n)
-vdd  1 0 5v
-.model mesa1 nmf(level=2 rd=31 rs=31)
-
-.options noacct
-.dc vgs -2 0 0.02
-.tran 0.1n 5n
-.print tran v(2) v(3)
-
-.print 
diff --git a/Windows/spice/tests/mesa/mesa13.cir b/Windows/spice/tests/mesa/mesa13.cir
deleted file mode 100644
index d1514501..00000000
--- a/Windows/spice/tests/mesa/mesa13.cir
+++ /dev/null
@@ -1,16 +0,0 @@
-* MESA1 - Gate Leakage Test 
-* Taken from macspice3f4
-*
-
-z1 0 2 0 mesmod l=1u w=20u
-vgs 1 0 dc 0
-vig 1 2 dc 0
-.model mesmod nmf(level=2 rd=31 rs=31 rg=10)
-
-.options noacct
-
-.dc vgs -3 0.4 0.05
-.print vig#branch
-
-.end
-
diff --git a/Windows/spice/tests/mesa/mesa14.cir b/Windows/spice/tests/mesa/mesa14.cir
deleted file mode 100644
index 5d2e6031..00000000
--- a/Windows/spice/tests/mesa/mesa14.cir
+++ /dev/null
@@ -1,19 +0,0 @@
-* MESA1 - DCFL GaAs MESFET Gate 
-* Taken from macspice3f4
-*
-* Removed: jsdf = 0 in modelcards
-
-vdd 1 0 dc 3
-vin 3 0 dc 0
-z1 2 3 0 enha l=1u w=10u
-z2 1 2 2 depl l=1u w=10u
-
-.model enha nmf level=2 rd=31 rs=31 vto=0.1
-.model depl nmf level=2 rd=31 rs=31 vto=-1.0
-
-.options noacct
-
-.dc vin 0 3.0 0.05
-.print DC V(2)
-
-.end
diff --git a/Windows/spice/tests/mesa/mesa15.cir b/Windows/spice/tests/mesa/mesa15.cir
deleted file mode 100644
index c5361a93..00000000
--- a/Windows/spice/tests/mesa/mesa15.cir
+++ /dev/null
@@ -1,17 +0,0 @@
-* MESA1 subtreshold characteristics (T=400) 
-* Taken form macspice3f4
-
-vds 1 0 dc 0.1
-vids 1 2 dc 0
-vgs 3 0 dc 0
-
-z1 2 3 0 mesmod l=1u w=20u ts=400 td=400
-.model mesmod nmf level=2 rd=31 rs=31
-
-.options noacct
-
-.dc vgs -3 0 0.05
-.print DC vids#branch
-
-.end
-
diff --git a/Windows/spice/tests/mesa/mesa21.cir b/Windows/spice/tests/mesa/mesa21.cir
deleted file mode 100644
index e1c342e4..00000000
--- a/Windows/spice/tests/mesa/mesa21.cir
+++ /dev/null
@@ -1,19 +0,0 @@
-* Mesa Test
-* Taken from macspice3f4
-
-z1 3 2 0 mesmod l=1u w=150u
-vgs 2 0 dc 0
-vds 1 0 dc 0
-vids 1 3 dc 0
-
-.model mesmod nmf level=3 rdi=2.7 rsi=2.7 mu=0.2 m=2.2 vto=-2.04
-+ eta=1.5 lambda=0.04 tc=0.001 sigma0=0.02 vsigma=0.1 vsigmat=1.37
-+ delta=5 beta=0.0085
-
-.options noacct
-
-.dc vds 0 4 0.05 vgs -1.5 0.5 0.5
-.print vids#branch
-
-.end
-
diff --git a/Windows/spice/tests/mesa/mesgout.cir b/Windows/spice/tests/mesa/mesgout.cir
deleted file mode 100644
index e84c46fb..00000000
--- a/Windows/spice/tests/mesa/mesgout.cir
+++ /dev/null
@@ -1,37 +0,0 @@
-* Simulation of MESFET output conductance
-* Taken from macspice3f4
-*
-
-rd 1 2 20
-z1 3 4 0 driver l=1u w=10u
-rs 5 0 20
-vgs 4 0 dc 0.5 ac 0.01
-vds 1 0 dc 1.0
-vid 2 3 dc 0
-
-.model driver nmf
-+ level=2
-*+ jsdf=1e-100
-+ n=1.44
-+ rd=0
-+ rs=0
-+ vs=1.5e5
-+ mu=0.25
-+ d=2e-7
-+ vto=0.1
-+ m=2
-+ lambda=0
-+ sigma0=0
-+ delfo=5
-+ flo=0.5
-+ tf=100000
-+ lambdahf=120
-
-.options noacct
-
-.ac DEC 10 0.001 1e6
-
-.print ac V(3)
-
-.end
-
diff --git a/Windows/spice/tests/mesa/mesinv.cir b/Windows/spice/tests/mesa/mesinv.cir
deleted file mode 100644
index 33624ff3..00000000
--- a/Windows/spice/tests/mesa/mesinv.cir
+++ /dev/null
@@ -1,49 +0,0 @@
-* Mesfet Inverter with ungated load/Wload=2e-6
-* Taken from macspice3f4 package
-*
-* Output node is 70
-*
-
-bl1 10 40 i=0.0005*tanh(v(10,40)/0.0005/1120)*(1+v(10,40)*0.027)
-bl2 20 50 i=0.0005*tanh(v(20,50)/0.0005/1120)*(1+v(20,50)*0.027)
-
-zd1 70 2 0 driver l=0.7u w=20u
-zd2 80 70 0 driver l=0.7u w=20u
-
-rdl1 1 10 20
-rdl2 1 20 20
-rsl1 40 70 20
-rsl2 50 80 20
-
-vin 1000 0 dc 0
-vdd 2000 0 dc 1.6
-visrc 2000 1 dc 0
-vig  1000 2 dc 0
-
-.model driver nmf
-+ level=2
-+ n=1.44
-+ rd=20
-+ rs=20
-+ ri=10
-+ rf=10
-+ vs=1.9e5
-+ mu=0.25
-+ d=1e-7
-+ vto=0.15
-+ m=2
-+ lambda=0.15
-+ sigma0=0.02
-+ vsigmat=0.5
-
-*.nodeset v(10)=1.6 v(40)=1.6 v(70)=1.6 v(20)=0.2 v(50)=0.2
-*+ v(80)=0.2
-
-.options noacct
-
-.dc vin 0 1 0.01
-
-.print dc v(70)
-
-.end
-
diff --git a/Windows/spice/tests/mesa/mesosc.cir b/Windows/spice/tests/mesa/mesosc.cir
deleted file mode 100644
index e81b4ee7..00000000
--- a/Windows/spice/tests/mesa/mesosc.cir
+++ /dev/null
@@ -1,41 +0,0 @@
-* Mesfet Ring Oscillator with ungated load
-* Taken form macspice3f4
-*
-
-.subckt mesinv 10 20 3
-* Node 10: Power Supply
-* Node 20: Input
-* Node 30: Output
-rdl 10 1 20
-bl1 1 2 i=0.00025*tanh(v(1,2)/0.00025/2240)*(1+v(1,2)*0.027)
-rsl 2 3 20
-zd 3 20 0 driver l=0.7u w=20u
-ci 3 0 20f
-.ends mesinv
-
-.options noacct
-.model driver nmf level=2 n=1.44 rd=20 rs=20 vs=1.9e5
-+ mu=0.25 d=1e-7 vto=0.15 m=2 lambda=0.15 sigma0=0.02
-+ vsigmat=0.5
-
-vdd 1 0 dc 1.6
-
-xinv01 1 2 3 mesinv
-xinv02 1 3 4 mesinv
-xinv03 1 4 5 mesinv
-xinv04 1 5 6 mesinv
-xinv05 1 6 7 mesinv
-xinv06 1 7 8 mesinv
-xinv07 1 8 9 mesinv
-xinv08 1 9 10 mesinv
-xinv09 1 10 11 mesinv
-xinv10 1 11 12 mesinv
-xinv11 1 12 2000 mesinv
-
-vnoise 2000 2 dc 0 pwl(0 0 0.2n 0 0.3n 0.1 0.4n 0)
-
-.tran 1p 5n 1n 20p
-
-.print tran V(8)
-
-.end