diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c index 76b7a8abf..6b0df65aa 100644 --- a/src/frontend/outitf.c +++ b/src/frontend/outitf.c @@ -84,11 +84,6 @@ OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, { char *name; -#ifdef PARALLEL_ARCH - if (ARCHme != 0) - return (OK); -#endif - if (ft_curckt->ci_ckt == circuitPtr) name = ft_curckt->ci_name; else @@ -108,11 +103,6 @@ OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, int numNames, IFuid *dataNames, int dataType, runDesc **plotPtr) { -#ifdef PARALLEL_ARCH - if (ARCHme != 0) - return (OK); -#endif - return (beginPlot(analysisPtr, circuitPtr, "circuit name", analName, refName, refType, numNames, dataNames, dataType, TRUE, @@ -448,11 +438,6 @@ OUTpData(runDesc *plotPtr, IFvalue *refValue, IFvalue *valuePtr) runDesc *run = plotPtr; // FIXME int i; -#ifdef PARALLEL_ARCH - if (ARCHme != 0) - return (OK); -#endif - run->pointCount++; #ifdef TCL_MODULE @@ -675,11 +660,6 @@ OUTendPlot(runDesc *plotPtr) { runDesc *run = plotPtr; // FIXME -#ifdef PARALLEL_ARCH - if (ARCHme != 0) - return (OK); -#endif - if (run->writeOut) { fileEnd(run); } else { diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c index 8231c440e..eada360d1 100644 --- a/src/frontend/runcoms.c +++ b/src/frontend/runcoms.c @@ -250,9 +250,6 @@ dosim( ft_intrpt = FALSE; /* command "run" is given with rawfile name in wl */ if (dofile) { -#ifdef PARALLEL_ARCH - if (ARCHme == 0) { -#endif /* PARALLEL_ARCH */ if (!*wl->wl_word) rawfileFp = stdout; #if defined(__MINGW32__) || defined(_MSC_VER) @@ -283,11 +280,6 @@ dosim( } #endif /* __MINGW32__ */ rawfileBinary = !ascii; -#ifdef PARALLEL_ARCH - } else { - rawfileFp = NULL; - } -#endif /* PARALLEL_ARCH */ } else { rawfileFp = NULL; } diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c index 8a12ff3b0..85c671d18 100644 --- a/src/frontend/runcoms2.c +++ b/src/frontend/runcoms2.c @@ -98,9 +98,6 @@ com_resume(wordlist *wl) } if (dofile) { -#ifdef PARALLEL_ARCH - if (ARCHme == 0) { -#endif /* PARALLEL_ARCH */ if (!last_used_rawfile) rawfileFp = stdout; #if defined(__MINGW32__) || defined(_MSC_VER) @@ -129,11 +126,6 @@ com_resume(wordlist *wl) return; } #endif -#ifdef PARALLEL_ARCH - } else { - rawfileFp = NULL; - } -#endif /* PARALLEL_ARCH */ rawfileBinary = !ascii; } else { rawfileFp = NULL; diff --git a/src/include/ngspice/cktdefs.h b/src/include/ngspice/cktdefs.h index abd5f64bf..555f685d7 100644 --- a/src/include/ngspice/cktdefs.h +++ b/src/include/ngspice/cktdefs.h @@ -345,7 +345,6 @@ extern int CKTop(CKTcircuit *, long, long, int); extern int CKTpModName(char *, IFvalue *, CKTcircuit *, int , IFuid , GENmodel **); extern int CKTpName(char *, IFvalue *, CKTcircuit *, int , char *, GENinstance **); extern int CKTparam(CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *); -extern int CKTpartition(register CKTcircuit *ckt); extern int CKTpzFindZeros(CKTcircuit *, PZtrial **, int *); extern int CKTpzLoad(CKTcircuit *, SPcomplex *); extern int CKTpzSetup(CKTcircuit *, int); diff --git a/src/include/ngspice/gendefs.h b/src/include/ngspice/gendefs.h index d28ba2467..2ae3067fa 100644 --- a/src/include/ngspice/gendefs.h +++ b/src/include/ngspice/gendefs.h @@ -20,7 +20,6 @@ struct GENinstance { GENinstance *GENnextInstance; /* pointer to next instance of * current model*/ IFuid GENname; /* pointer to character string naming this instance */ - int GENowner; /* number of owner process */ int GENstate; /* state index number */ int GENnode1; /* appropriate node numbers */ int GENnode2; /* appropriate node numbers */ diff --git a/src/include/ngspice/ngspice.h b/src/include/ngspice/ngspice.h index 05ebf2073..b5c7f7738 100644 --- a/src/include/ngspice/ngspice.h +++ b/src/include/ngspice/ngspice.h @@ -232,9 +232,6 @@ extern char *Help_Path; extern char *Lib_Path; extern char *Inp_Path; -extern int ARCHme; /* My logical process number */ -extern int ARCHsize; /* Total number of processes */ - #if ADMS >= 3 int load_vadev(CKTcircuit *ckt, char *name); #endif diff --git a/src/include/ngspice/optdefs.h b/src/include/ngspice/optdefs.h index 95c577db2..a2b81aadd 100644 --- a/src/include/ngspice/optdefs.h +++ b/src/include/ngspice/optdefs.h @@ -33,20 +33,17 @@ typedef struct { double STATdecompTime; /* total time spent in LU decomposition */ double STATsolveTime; /* total time spent in F-B subst. */ double STATreorderTime; /* total time spent reordering */ - double STATcombineTime; /* total time spent combining */ double STATsyncTime; /* total time spent sync'ing after load */ double STATtranTime; /* transient analysis time */ double STATtranDecompTime; /* time spent in transient LU decomposition */ double STATtranSolveTime; /* time spent in transient F-B subst. */ double STATtranLoadTime; /* time spent in transient device loading */ double STATtranTruncTime; /* time spent calculating LTE and new step */ - double STATtranCombTime; /* time spent in transient combining */ double STATtranSyncTime; /* time spent in transient sync'ing */ double STATacTime; /* AC analysis time */ double STATacDecompTime; /* time spent in AC LU decomposition */ double STATacSolveTime; /* time spent in AC F-B subst. */ double STATacLoadTime; /* time spent in AC device loading */ - double STATacCombTime; /* time spent in AC combining */ double STATacSyncTime; /* time spent in transient sync'ing */ STATdevList *STATdevNum; /* PN: Number of instances and models for each device */ } STATistics; @@ -106,9 +103,6 @@ typedef struct { #define OPT_ORIGNZ 52 #define OPT_FILLNZ 53 #define OPT_TOTALNZ 54 -#define OPT_COMBTIME 55 -#define OPT_TRANCOMB 56 -#define OPT_ACCOMB 57 #define OPT_SYNCTIME 58 #define OPT_TRANSYNC 59 #define OPT_ACSYNC 60 diff --git a/src/include/ngspice/smpdefs.h b/src/include/ngspice/smpdefs.h index 765bcc458..ec982e99a 100644 --- a/src/include/ngspice/smpdefs.h +++ b/src/include/ngspice/smpdefs.h @@ -39,10 +39,5 @@ SMPelement * SMPfindElt( SMPmatrix *, int , int , int ); int SMPcZeroCol(SMPmatrix *eMatrix, int Col); int SMPcAddCol(SMPmatrix *eMatrix, int Accum_Col, int Addend_Col); int SMPzeroRow(SMPmatrix *eMatrix, int Row); -#ifdef PARALLEL_ARCH -void SMPcombine(SMPmatrix *Matrix, double RHS[], double Spare[]); -void SMPcCombine(SMPmatrix *Matrix, double RHS[], double Spare[], - double iRHS[], double iSpare[]); -#endif #endif /*SMP*/ diff --git a/src/include/ngspice/sperror.h b/src/include/ngspice/sperror.h index 15dcd1cab..d21249102 100644 --- a/src/include/ngspice/sperror.h +++ b/src/include/ngspice/sperror.h @@ -30,9 +30,6 @@ Author: 1985 Thomas L. Quarles #define E_NOF2SRC (E_PRIVATE+15) /* no source at F2 for IM disto analysis */ #define E_NODISTO (E_PRIVATE+16) /* no distortion analysis - NODISTO defined */ #define E_NONOISE (E_PRIVATE+17) /* no noise analysis - NONOISE defined */ -#ifdef PARALLEL_ARCH -#define E_MULTIERR (E_PRIVATE+18) /* multiple errors from diff. processes */ -#endif /* PARALLEL_ARCH */ const char *SPerror(int type); diff --git a/src/main.c b/src/main.c index 66e209e39..1cb692577 100644 --- a/src/main.c +++ b/src/main.c @@ -105,10 +105,6 @@ char *ft_rawfile = "rawspice.raw"; /* Frontend and circuit options */ IFsimulator *ft_sim = NULL; -/* (Virtual) Machine architecture parameters */ -int ARCHme; -int ARCHsize; - char *errRtn; /* name of the routine declaring error */ char *errMsg; /* descriptive message about what went wrong */ char *cp_program; /* program name 'ngspice' */ @@ -494,13 +490,6 @@ static void sp_shutdown(int exitval) { destroy_ivars(); -#ifdef PARALLEL_ARCH - { - Error("Fatal error in SPICE", -1); - } else { - PEND_(); - } -#endif /* PARALLEL_ARCH */ #ifdef HAS_WINDOWS if (exitval == EXIT_BAD) winmessage("Fatal error in SPICE"); @@ -833,19 +822,6 @@ main(int argc, char **argv) application_name = argv[0]; #endif -#ifdef PARALLEL_ARCH - PBEGIN_(argc, argv); - ARCHme = NODEID_(); - ARCHsize = NNODES_(); - SETDBG_(&debug_flag); - fprintf( stderr, "On-line: process %d of %d total.\n", ARCHme, ARCHsize ); - evlog(EVKEY_ENABLE, EVKEY_EVENT, "On-line", EVKEY_DUMP, EVKEY_DISABLE, - EVKEY_LAST_ARG); -#else - ARCHme = 0; - ARCHsize = 1; -#endif - ivars(argv[0]); cp_in = stdin; @@ -950,11 +926,7 @@ main(int argc, char **argv) if (optarg) { /* turn off buffering for stdout */ setbuf(stdout, NULL); -#ifdef PARALLEL_ARCH - sprintf (log_file, "%s%03d", optarg, ARCHme); -#else sprintf (log_file, "%s", optarg); -#endif orflag = TRUE; } break; diff --git a/src/maths/sparse/Makefile.am b/src/maths/sparse/Makefile.am index 6e5cdc493..ccbdcf969 100644 --- a/src/maths/sparse/Makefile.am +++ b/src/maths/sparse/Makefile.am @@ -5,7 +5,6 @@ noinst_LTLIBRARIES = libsparse.la libsparse_la_SOURCES = \ spalloc.c \ spbuild.c \ - spcombin.c \ spconfig.h \ spdefs.h \ spextra.c \ diff --git a/src/maths/sparse/spalloc.c b/src/maths/sparse/spalloc.c index b2e9a5511..fe8713e8b 100644 --- a/src/maths/sparse/spalloc.c +++ b/src/maths/sparse/spalloc.c @@ -66,10 +66,6 @@ #include "spconfig.h" #include "ngspice/spmatrix.h" #include "spdefs.h" -#ifdef PARALLEL_ARCH -#define COMBINE 1 -#endif /* PARALLEL_ARCH */ - /* * Function declarations diff --git a/src/maths/sparse/spcombin.c b/src/maths/sparse/spcombin.c deleted file mode 100644 index a828c2b1d..000000000 --- a/src/maths/sparse/spcombin.c +++ /dev/null @@ -1,300 +0,0 @@ -/* - * MATRIX UTILITY MODULE - * - * Author: Advising professor: - * Kenneth S. Kundert Alberto Sangiovanni-Vincentelli - * UC Berkeley - * - * This file contains various optional utility routines. - * - * >>> User accessible functions contained in this file: - * spCombine - * - * >>> Other functions contained in this file: - */ - - -/* - * Revision and copyright information. - * - * Copyright (c) 1985,86,87,88,89,90 - * by Kenneth S. Kundert and the University of California. - * - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby granted, - * provided that the copyright notices appear in all copies and - * supporting documentation and that the authors and the University of - * California are properly credited. The authors and the University of - * California make no representations as to the suitability of this - * software for any purpose. It is provided `as is', without express - * or implied warranty. - */ - -/* - * IMPORTS - * - * >>> Import descriptions: - * spConfig.h - * Macros that customize the sparse matrix routines. - * spMatrix.h - * Macros and declarations to be imported by the user. - * spDefs.h - * Matrix type and macro definitions for the sparse matrix routines. - */ - -#define spINSIDE_SPARSE -#include "spconfig.h" -#include "ngspice/spmatrix.h" -#include "spdefs.h" - - - - - - -#ifdef PARALLEL_ARCH -#define COMBINE 1 -#endif /* PARALLEL_ARCH */ - - -#if COMBINE -static void CombineComplexMatrix( MatrixPtr, - RealVector, RealVector, RealVector, RealVector ); -static void ClearBuffer( MatrixPtr, int, int, ElementPtr ); -static void ClearComplexBuffer( MatrixPtr, int, int, ElementPtr ); - -/* - * COMBINE MATRICES ON A MULTIPROCESSOR - * - * >>> Arguments: - * eMatrix (char *) - * Pointer to the matrix to be combined. - * - * >>> Local variables: - * Size (int) - * Local version of the size of the matrix. - * pElement (ElementPtr) - * Pointer to an element in the matrix. - */ - -#define SPBSIZE 256*1024 -static double Buffer[SPBSIZE]; - -void -spCombine( eMatrix, RHS, Spare, iRHS, iSolution ) - -char *eMatrix; -RealVector RHS, Spare, iRHS, iSolution; -{ -MatrixPtr Matrix = (MatrixPtr)eMatrix; -register ElementPtr pElement; -register int I, Size; -ElementPtr FirstBufElement, pLastElement; -int FirstBufCol, BufIndex; -struct ElementListNodeStruct *pListNode; -long type = MT_COMBINE, length = Matrix->Size + 1; - -/* Begin `spCombine'. */ - assert( IS_VALID(Matrix) && !Matrix->Factored ); - if (!Matrix->InternalVectorsAllocated) - spcCreateInternalVectors( Matrix ); - - if (Matrix->Complex) { - CombineComplexMatrix( Matrix, RHS, Spare, iRHS, iSolution ); - return; - } - - Size = Matrix->Size; - -/* Mark original non-zeroes. */ - pListNode = Matrix->FirstElementListNode; - while (pListNode != NULL) - { pElement = pListNode->pElementList; - if (pListNode == Matrix->LastElementListNode) { - pLastElement = Matrix->NextAvailElement - 1; - } else { - pLastElement = &(pElement[ pListNode->NumberOfElementsInList - 1 ]); - } - while (pElement <= pLastElement) - { - (pElement++)->Col = -1; - } - pListNode = pListNode->Next; - } - -/* Stripmine the communication to reduce overhead */ - BufIndex = 0; - FirstBufCol = 1; - FirstBufElement = Matrix->FirstInCol[ FirstBufCol ]; - for (I = 1; I <= Size; I++) - { - pElement = Matrix->FirstInCol[I]; - while (pElement != NULL) - { - if ( BufIndex >= SPBSIZE ) - { /* Buffer is Full. */ - ClearBuffer( Matrix, BufIndex, FirstBufCol, FirstBufElement ); - BufIndex = 0; - FirstBufCol = I; - FirstBufElement = pElement; - } - if ( pElement->Col == -1 ) { - Buffer[ BufIndex++ ] = pElement->Real; - } - pElement = pElement->NextInCol; - } - } -/* Clean out the last, partially full buffer. */ - if ( BufIndex != 0 ) - { - ClearBuffer( Matrix, BufIndex, FirstBufCol, FirstBufElement ); - } - -/* Sum all RHS's together */ - DGOP_( &type, RHS, &length, "+" ); - - return; -} - - -static void -CombineComplexMatrix( Matrix, RHS, Spare, iRHS, iSolution ) - -MatrixPtr Matrix; -RealVector RHS, Spare, iRHS, iSolution; -{ -register ElementPtr pElement; -register int I, Size; -ElementPtr FirstBufElement, pLastElement; -int FirstBufCol, BufIndex; -struct ElementListNodeStruct *pListNode; -long type = MT_COMBINE, length = Matrix->Size + 1; - -/* Begin `CombineComplexMatrix'. */ - assert(Matrix->Complex); - Size = Matrix->Size; - -/* Mark original non-zeroes. */ - pListNode = Matrix->FirstElementListNode; - while (pListNode != NULL) - { pElement = pListNode->pElementList; - if (pListNode == Matrix->LastElementListNode) { - pLastElement = Matrix->NextAvailElement - 1; - } else { - pLastElement = &(pElement[ pListNode->NumberOfElementsInList - 1 ]); - } - while (pElement <= pLastElement) - { - (pElement++)->Col = -1; - } - pListNode = pListNode->Next; - } - -/* Stripmine the communication to reduce overhead */ - BufIndex = 0; - FirstBufCol = 1; - FirstBufElement = Matrix->FirstInCol[ FirstBufCol ]; - for (I = 1; I <= Size; I++) - { - pElement = Matrix->FirstInCol[I]; - while (pElement != NULL) - { - if ( BufIndex >= SPBSIZE/2 ) - { /* Buffer is Full. */ - ClearComplexBuffer( Matrix, BufIndex, FirstBufCol, - FirstBufElement ); - BufIndex = 0; - FirstBufCol = I; - FirstBufElement = pElement; - } - if ( pElement->Col == -1 ) { - Buffer[ BufIndex++ ] = pElement->Real; - Buffer[ BufIndex++ ] = pElement->Imag; - } - pElement = pElement->NextInCol; - } - } -/* Clean out the last, partially full buffer. */ - if ( BufIndex != 0 ) - { - ClearComplexBuffer( Matrix, BufIndex, FirstBufCol, FirstBufElement ); - } - -/* Sum all RHS's together */ - DGOP_( &type, RHS, &length, "+" ); - DGOP_( &type, iRHS, &length, "+" ); - - return; -} - - -static void -ClearBuffer( Matrix, NumElems, StartCol, StartElement ) - -MatrixPtr Matrix; -int NumElems, StartCol; -ElementPtr StartElement; -{ - register ElementPtr pElement = StartElement; - register int Index, Col = StartCol; - long type = MT_COMBINE; - -/* First globalize the buffer. */ - DGOP_( &type, Buffer, &NumElems, "+" ); - -/* Now, copy all of the data back into the matrix. */ - for ( Index = 0; Index < NumElems; Index++ ) - { - if ( pElement == NULL ) - { - pElement = Matrix->FirstInCol[ ++Col ]; - } - while ( pElement->Col != -1 ) { - pElement = pElement->NextInCol; - if ( pElement == NULL ) - { - pElement = Matrix->FirstInCol[ ++Col ]; - } - } - pElement->Real = Buffer[ Index ]; - pElement->Col = Col; - pElement = pElement->NextInCol; - } -} - - -static void -ClearComplexBuffer( Matrix, DataCount, StartCol, StartElement ) - -MatrixPtr Matrix; -int DataCount, StartCol; -ElementPtr StartElement; -{ - register ElementPtr pElement = StartElement; - register int Index, Col = StartCol; - long type = MT_COMBINE; - -/* First globalize the buffer. */ - DGOP_( &type, Buffer, &DataCount, "+" ); - -/* Now, copy all of the data back into the matrix. */ - for ( Index = 0; Index < DataCount; ) - { - if ( pElement == NULL ) - { - pElement = Matrix->FirstInCol[ ++Col ]; - } - while ( pElement->Col != -1 ) { - pElement = pElement->NextInCol; - if ( pElement == NULL ) - { - pElement = Matrix->FirstInCol[ ++Col ]; - } - } - pElement->Real = Buffer[ Index++ ]; - pElement->Imag = Buffer[ Index++ ]; - pElement->Col = Col; - pElement = pElement->NextInCol; - } -} -#endif /* COMBINE */ diff --git a/src/maths/sparse/spsmp.c b/src/maths/sparse/spsmp.c index 245543dd7..2d66a44a8 100644 --- a/src/maths/sparse/spsmp.c +++ b/src/maths/sparse/spsmp.c @@ -31,8 +31,6 @@ * SMPcProdDiag * LoadGmin * SMPfindElt - * SMPcombine - * SMPcCombine */ /* @@ -558,26 +556,3 @@ SMPzeroRow(SMPmatrix *eMatrix, int Row) return spError( Matrix ); } - -#ifdef PARALLEL_ARCH -/* - * SMPcombine() - */ -void -SMPcombine(SMPmatrix *Matrix, double RHS[], double Spare[]) -{ - spSetReal( Matrix ); - spCombine( Matrix, RHS, Spare, NULL, NULL ); -} - -/* - * SMPcCombine() - */ -void -SMPcCombine(SMPmatrix *Matrix, double RHS[], double Spare[], - double iRHS[], double iSpare[]) -{ - spSetComplex( Matrix ); - spCombine( Matrix, RHS, Spare, iRHS, iSpare ); -} -#endif /* PARALLEL_ARCH */ diff --git a/src/misc/misc_time.c b/src/misc/misc_time.c index 7ee2b0c1d..9df4367ce 100644 --- a/src/misc/misc_time.c +++ b/src/misc/misc_time.c @@ -100,9 +100,6 @@ seconds(void) int ret; struct rusage ruse; -#ifdef PARALLEL_ARCH - return (TCGTIME_()); -#else memset(&ruse, 0, sizeof(ruse)); ret = getrusage(RUSAGE_SELF, &ruse); if(ret == -1) { @@ -110,7 +107,6 @@ seconds(void) return 1; } return ((double)ruse.ru_utime.tv_sec + (double) ruse.ru_utime.tv_usec / 1000000.0); -#endif /* PARALLEL_ARCH */ #else #ifdef HAVE_TIMES diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am index 0799ada1b..86d6b7371 100644 --- a/src/spicelib/analysis/Makefile.am +++ b/src/spicelib/analysis/Makefile.am @@ -50,7 +50,6 @@ libckt_la_SOURCES = \ cktnum2n.c \ cktop.c \ cktparam.c \ - cktpartn.c \ cktpmnam.c \ cktpname.c \ cktpzld.c \ diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index cd6b86cd9..79b1d2b2e 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -29,7 +29,6 @@ do { \ startdTime = ckt->CKTstat->STATdecompTime; \ startsTime = ckt->CKTstat->STATsolveTime; \ startlTime = ckt->CKTstat->STATloadTime; \ - startcTime = ckt->CKTstat->STATcombineTime; \ startkTime = ckt->CKTstat->STATsyncTime; \ } while(0) @@ -40,7 +39,6 @@ do { \ ckt->CKTstat->STATacDecompTime += ckt->CKTstat->STATdecompTime - startdTime; \ ckt->CKTstat->STATacSolveTime += ckt->CKTstat->STATsolveTime - startsTime; \ ckt->CKTstat->STATacLoadTime += ckt->CKTstat->STATloadTime - startlTime; \ - ckt->CKTstat->STATacCombTime += ckt->CKTstat->STATcombineTime - startcTime; \ ckt->CKTstat->STATacSyncTime += ckt->CKTstat->STATsyncTime - startkTime; \ } while(0) @@ -55,7 +53,6 @@ ACan(CKTcircuit *ckt, int restart) double startdTime; double startsTime; double startlTime; - double startcTime; double startkTime; double startTime; int error; @@ -405,9 +402,6 @@ CKTacLoad(CKTcircuit *ckt) int i; int size; int error; -#ifdef PARALLEL_ARCH - long type = MT_ACLOAD, length = 1; -#endif /* PARALLEL_ARCH */ double startTime; startTime = SPfrontEnd->IFseconds(); @@ -421,11 +415,7 @@ CKTacLoad(CKTcircuit *ckt) for (i=0;iDEVacLoad && ckt->CKThead[i] ) { error = DEVices[i]->DEVacLoad (ckt->CKThead[i], ckt); -#ifdef PARALLEL_ARCH - if (error) goto combine; -#else if(error) return(error); -#endif /* PARALLEL_ARCH */ } } @@ -457,24 +447,6 @@ CKTacLoad(CKTcircuit *ckt) #endif -#ifdef PARALLEL_ARCH -combine: - ckt->CKTstat->STATloadTime += SPfrontEnd->IFseconds() - startTime; - startTime = SPfrontEnd->IFseconds(); - /* See if any of the DEVload functions bailed. If not, proceed. */ - IGOP_( &type, &error, &length, "max" ); - ckt->CKTstat->STATsyncTime += SPfrontEnd->IFseconds() - startTime; - if (error == OK) { - startTime = SPfrontEnd->IFseconds(); - SMPcCombine( ckt->CKTmatrix, ckt->CKTrhs, ckt->CKTrhsSpare, - ckt->CKTirhs, ckt->CKTirhsSpare ); - ckt->CKTstat->STATcombineTime += SPfrontEnd->IFseconds() - startTime; - return(OK); - } else { - return(error); - } -#else ckt->CKTstat->STATloadTime += SPfrontEnd->IFseconds() - startTime; return(OK); -#endif /* PARALLEL_ARCH */ } diff --git a/src/spicelib/analysis/cktacct.c b/src/spicelib/analysis/cktacct.c index e4fe39afe..63b0a1063 100644 --- a/src/spicelib/analysis/cktacct.c +++ b/src/spicelib/analysis/cktacct.c @@ -85,9 +85,6 @@ CKTacct(CKTcircuit *ckt, JOB *anal, int which, IFvalue *val) case OPT_SYNCTIME: val->rValue = ckt->CKTstat->STATsyncTime; break; - case OPT_COMBTIME: - val->rValue = ckt->CKTstat->STATcombineTime; - break; case OPT_REORDTIME: val->rValue = ckt->CKTstat->STATreorderTime; break; @@ -103,9 +100,6 @@ CKTacct(CKTcircuit *ckt, JOB *anal, int which, IFvalue *val) case OPT_TRANSYNC: val->rValue = ckt->CKTstat->STATtranSyncTime; break; - case OPT_TRANCOMB: - val->rValue = ckt->CKTstat->STATtranCombTime; - break; case OPT_TRANDECOMP: val->rValue = ckt->CKTstat->STATtranDecompTime; break; @@ -121,9 +115,6 @@ CKTacct(CKTcircuit *ckt, JOB *anal, int which, IFvalue *val) case OPT_ACSYNC: val->rValue = ckt->CKTstat->STATacSyncTime; break; - case OPT_ACCOMB: - val->rValue = ckt->CKTstat->STATacCombTime; - break; case OPT_ACDECOMP: val->rValue = ckt->CKTstat->STATacDecompTime; break; diff --git a/src/spicelib/analysis/cktload.c b/src/spicelib/analysis/cktload.c index f7e4b7ac0..aeeb9a455 100644 --- a/src/spicelib/analysis/cktload.c +++ b/src/spicelib/analysis/cktload.c @@ -34,10 +34,6 @@ CKTload(CKTcircuit *ckt) double startTime; CKTnode *node; int error; -#ifdef PARALLEL_ARCH - int ibuf[2]; - long type = MT_LOAD, length = 2; -#endif /* PARALLEL_ARCH */ #ifdef STEPDEBUG int noncon; #endif /* STEPDEBUG */ @@ -74,11 +70,7 @@ CKTload(CKTcircuit *ckt) noncon = ckt->CKTnoncon; } #endif /* STEPDEBUG */ -#ifdef PARALLEL_ARCH - if (error) goto combine; -#else if (error) return(error); -#endif /* PARALLEL_ARCH */ } } @@ -167,31 +159,8 @@ CKTload(CKTcircuit *ckt) /* SMPprint(ckt->CKTmatrix, stdout); if you want to debug, this is a good place to start ... */ -#ifdef PARALLEL_ARCH -combine: - ckt->CKTstat->STATloadTime += SPfrontEnd->IFseconds() - startTime; - startTime = SPfrontEnd->IFseconds(); - /* See if any of the DEVload functions bailed. If not, proceed. */ - ibuf[0] = error; - ibuf[1] = ckt->CKTnoncon; - IGOP_(&type, ibuf, &length, "+"); - ckt->CKTnoncon = ibuf[1]; - ckt->CKTstat->STATsyncTime += SPfrontEnd->IFseconds() - startTime; - if (ibuf[0] == OK) { - startTime = SPfrontEnd->IFseconds(); - SMPcombine(ckt->CKTmatrix, ckt->CKTrhs, ckt->CKTrhsSpare); - ckt->CKTstat->STATcombineTime += SPfrontEnd->IFseconds() - startTime; - return(OK); - } else { - if (ibuf[0] != error) { - error = E_MULTIERR; - } - return(error); - } -#else ckt->CKTstat->STATloadTime += SPfrontEnd->IFseconds()-startTime; return(OK); -#endif /* PARALLEL_ARCH */ } static int diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c index a484a15f2..91d1d993d 100644 --- a/src/spicelib/analysis/cktop.c +++ b/src/spicelib/analysis/cktop.c @@ -95,10 +95,6 @@ CKTconvTest (CKTcircuit * ckt) { int i; int error = OK; -#ifdef PARALLEL_ARCH - int ibuf[2]; - long type = MT_CONV, length = 2; -#endif /* PARALLEL_ARCH */ for (i = 0; i < DEVmaxnum; i++) { @@ -106,10 +102,6 @@ CKTconvTest (CKTcircuit * ckt) { error = DEVices[i]->DEVconvTest (ckt->CKThead[i], ckt); } -#ifdef PARALLEL_ARCH - if (error || ckt->CKTnoncon) - goto combine; -#else if (error) return (error); if (ckt->CKTnoncon) @@ -118,23 +110,8 @@ CKTconvTest (CKTcircuit * ckt) * DEVices[i]->DEVpublic.name); */ return (OK); } -#endif /* PARALLEL_ARCH */ } -#ifdef PARALLEL_ARCH -combine: - /* See if any of the DEVconvTest functions bailed. If not, proceed. */ - ibuf[0] = error; - ibuf[1] = ckt->CKTnoncon; - IGOP_ (&type, ibuf, &length, "+"); - ckt->CKTnoncon = ibuf[1]; - if (ibuf[0] != error) - { - error = E_MULTIERR; - } - return (error); -#else return (OK); -#endif /* PARALLEL_ARCH */ } diff --git a/src/spicelib/analysis/cktpartn.c b/src/spicelib/analysis/cktpartn.c deleted file mode 100644 index 7bfcf78d2..000000000 --- a/src/spicelib/analysis/cktpartn.c +++ /dev/null @@ -1,46 +0,0 @@ -/********** -Copyright 1990 Regents of the University of California. All rights reserved. -Author: 1992 David A. Gates, UC Berkeley CADgroup -**********/ - - /* CKTpartition(ckt) - * this labels each instance of a circuit as belonging to a - * particular processor in a multiprocessor computer. - */ - -#include "ngspice/ngspice.h" -#include "ngspice/smpdefs.h" -#include "ngspice/cktdefs.h" -#include "ngspice/const.h" -#include "ngspice/devdefs.h" -#include "ngspice/sperror.h" - - -#ifdef XSPICE -extern int *DEVicesfl; -#endif - -int -CKTpartition(CKTcircuit *ckt) -{ - int i, instNum = 0; - GENmodel *model; - GENinstance *inst; - - for (i=0;iCKThead[i] != NULL) -#ifdef XSPICE -&& DEVicesfl[i] == 0 -#endif - ){ - for (model = ckt->CKThead[i]; model; model = model->GENnextModel) { - for (inst = model->GENinstances; inst; - inst = inst->GENnextInstance) { - inst->GENowner = instNum % ARCHsize; - instNum++; - } - } - } - } - return(OK); -} diff --git a/src/spicelib/analysis/cktpzld.c b/src/spicelib/analysis/cktpzld.c index 8c5725cac..26bf77876 100644 --- a/src/spicelib/analysis/cktpzld.c +++ b/src/spicelib/analysis/cktpzld.c @@ -18,9 +18,6 @@ CKTpzLoad(CKTcircuit *ckt, SPcomplex *s) int error; int i; -#ifdef PARALLEL_ARCH - long type = MT_PZLOAD, length = 1; -#endif /* PARALLEL_ARCH */ for (i = 0; i <= SMPmatSize(ckt->CKTmatrix); i++) { ckt->CKTrhs[i] = 0.0; @@ -31,24 +28,9 @@ CKTpzLoad(CKTcircuit *ckt, SPcomplex *s) for (i = 0; i < DEVmaxnum; i++) { if (DEVices[i] && DEVices[i]->DEVpzLoad != NULL && ckt->CKThead[i] != NULL) { error = DEVices[i]->DEVpzLoad (ckt->CKThead[i], ckt, s); -#ifdef PARALLEL_ARCH - if (error) goto combine; -#else if(error) return(error); -#endif /* PARALLEL_ARCH */ } } -#ifdef PARALLEL_ARCH -combine: - /* See if any of the DEVload functions bailed. If not, proceed. */ - IGOP_( &type, &error, &length, "max" ); - if (error == OK) { - SMPcCombine(ckt->CKTmatrix, ckt->CKTrhs, ckt->CKTrhsSpare, - ckt->CKTirhs, ckt->CKTirhsSpare ); - } else { - return(error); - } -#endif /* PARALLEL_ARCH */ if (job->PZbalance_col && job->PZsolution_col) { SMPcAddCol(ckt->CKTmatrix, job->PZbalance_col, job->PZsolution_col); diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c index 028038dc5..a3609dd36 100644 --- a/src/spicelib/analysis/cktsetup.c +++ b/src/spicelib/analysis/cktsetup.c @@ -54,8 +54,6 @@ CKTsetup(CKTcircuit *ckt) if (ckt->CKTisSetup) return E_NOCHANGE; - CKTpartition(ckt); - error = NIinit(ckt); if (error) return(error); ckt->CKTisSetup = 1; diff --git a/src/spicelib/analysis/cktsopt.c b/src/spicelib/analysis/cktsopt.c index 1d557a1c9..22249abcd 100644 --- a/src/spicelib/analysis/cktsopt.c +++ b/src/spicelib/analysis/cktsopt.c @@ -282,14 +282,12 @@ static IFparm OPTtbl[] = { { "time", OPT_TOTANALTIME, IF_ASK|IF_REAL,"Total analysis time" }, { "loadtime", OPT_LOADTIME, IF_ASK|IF_REAL,"Matrix load time" }, { "synctime", OPT_SYNCTIME, IF_ASK|IF_REAL,"Matrix synchronize time" }, - { "combinetime", OPT_COMBTIME, IF_ASK|IF_REAL,"Matrix combine time" }, { "reordertime", OPT_REORDTIME, IF_ASK|IF_REAL,"Matrix reorder time" }, { "factortime", OPT_DECOMP, IF_ASK|IF_REAL,"Matrix factor time" }, { "solvetime", OPT_SOLVE, IF_ASK|IF_REAL,"Matrix solve time" }, { "trantime", OPT_TRANTIME, IF_ASK|IF_REAL,"Transient analysis time" }, { "tranloadtime", OPT_TRANLOAD, IF_ASK|IF_REAL,"Transient load time" }, { "transynctime", OPT_TRANSYNC, IF_ASK|IF_REAL,"Transient sync time" }, - { "trancombinetime", OPT_TRANCOMB, IF_ASK|IF_REAL,"Transient combine time" }, { "tranfactortime", OPT_TRANDECOMP,IF_ASK|IF_REAL,"Transient factor time" }, { "transolvetime", OPT_TRANSOLVE, IF_ASK|IF_REAL,"Transient solve time" }, { "trantrunctime", OPT_TRANTRUNC, IF_ASK|IF_REAL,"Transient trunc time" }, @@ -298,7 +296,6 @@ static IFparm OPTtbl[] = { { "actime", OPT_ACTIME, IF_ASK|IF_REAL,"AC analysis time" }, { "acloadtime", OPT_ACLOAD, IF_ASK|IF_REAL,"AC load time" }, { "acsynctime", OPT_ACSYNC, IF_ASK|IF_REAL,"AC sync time" }, - { "accombinetime", OPT_ACCOMB, IF_ASK|IF_REAL,"AC combine time" }, { "acfactortime", OPT_ACDECOMP,IF_ASK|IF_REAL,"AC factor time" }, { "acsolvetime", OPT_ACSOLVE, IF_ASK|IF_REAL,"AC solve time" }, { "trytocompact", OPT_TRYTOCOMPACT, IF_SET|IF_FLAG, diff --git a/src/spicelib/analysis/ckttrunc.c b/src/spicelib/analysis/ckttrunc.c index fd988d8b9..c163a340a 100644 --- a/src/spicelib/analysis/ckttrunc.c +++ b/src/spicelib/analysis/ckttrunc.c @@ -22,9 +22,6 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep) #ifndef NEWTRUNC int i; double timetemp; -#ifdef PARALLEL_ARCH - long type = MT_TRUNC, length = 1; -#endif /* PARALLEL_ARCH */ #ifdef STEPDEBUG double debugtemp; #endif /* STEPDEBUG */ @@ -55,10 +52,6 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep) } *timeStep = MIN(2 * *timeStep,timetemp); -#ifdef PARALLEL_ARCH - DGOP_( &type, timeStep, &length, "min" ); -#endif /* PARALLEL_ARCH */ - ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime; return(OK); #else /* NEWTRUNC */ @@ -188,9 +181,6 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep) } *timeStep = MIN(2 * *timeStep,timetemp); -#ifdef PARALLEL_ARCH - DGOP_( &type, timeStep, &length, "min" ); -#endif /* PARALLEL_ARCH */ ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime; return(OK); #endif /* NEWTRUNC */ diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c index 939a6a681..a0a7ead68 100644 --- a/src/spicelib/analysis/dcpss.c +++ b/src/spicelib/analysis/dcpss.c @@ -51,7 +51,6 @@ do { \ startdTime = ckt->CKTstat->STATdecompTime; \ startsTime = ckt->CKTstat->STATsolveTime; \ startlTime = ckt->CKTstat->STATloadTime; \ - startcTime = ckt->CKTstat->STATcombineTime; \ startkTime = ckt->CKTstat->STATsyncTime; \ } while(0) @@ -63,7 +62,6 @@ do { \ ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime - startdTime; \ ckt->CKTstat->STATtranSolveTime += ckt->CKTstat->STATsolveTime - startsTime; \ ckt->CKTstat->STATtranLoadTime += ckt->CKTstat->STATloadTime - startlTime; \ - ckt->CKTstat->STATtranCombTime += ckt->CKTstat->STATcombineTime - startcTime; \ ckt->CKTstat->STATtranSyncTime += ckt->CKTstat->STATsyncTime - startkTime; \ } while(0) @@ -84,7 +82,6 @@ DCpss(CKTcircuit *ckt, int restart) double startdTime; double startsTime; double startlTime; - double startcTime; double startkTime; double startTime; int startIters; @@ -106,9 +103,6 @@ DCpss(CKTcircuit *ckt, int restart) int ltra_num; CKTnode *node; -#ifdef PARALLEL_ARCH - long type = MT_TRANAN, length = 1; -#endif /* PARALLEL_ARCH */ #ifdef XSPICE /* gtri - add - wbk - 12/19/90 - Add IPC stuff */ Ipc_Boolean_t ipc_firsttime = IPC_TRUE; @@ -970,9 +964,6 @@ resume: exit(0); } #endif -#ifdef PARALLEL_ARCH - DGOP_( &type, &(ckt->CKTdelta), &length, "min" ); -#endif /* PARALLEL_ARCH */ #endif /* XSPICE */ @@ -1271,9 +1262,6 @@ resume: #endif } } -#ifdef PARALLEL_ARCH - DGOP_( &type, &(ckt->CKTdelta), &length, "min" ); -#endif /* PARALLEL_ARCH */ if (ckt->CKTdelta <= ckt->CKTdelmin) { if (olddelta > ckt->CKTdelmin) { diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index 71c3b96c3..1b20bf028 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -50,7 +50,6 @@ do { \ startdTime = ckt->CKTstat->STATdecompTime; \ startsTime = ckt->CKTstat->STATsolveTime; \ startlTime = ckt->CKTstat->STATloadTime; \ - startcTime = ckt->CKTstat->STATcombineTime; \ startkTime = ckt->CKTstat->STATsyncTime; \ } while(0) @@ -62,7 +61,6 @@ do { \ ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime - startdTime; \ ckt->CKTstat->STATtranSolveTime += ckt->CKTstat->STATsolveTime - startsTime; \ ckt->CKTstat->STATtranLoadTime += ckt->CKTstat->STATloadTime - startlTime; \ - ckt->CKTstat->STATtranCombTime += ckt->CKTstat->STATcombineTime - startcTime; \ ckt->CKTstat->STATtranSyncTime += ckt->CKTstat->STATsyncTime - startkTime; \ } while(0) @@ -81,7 +79,6 @@ DCtran(CKTcircuit *ckt, double startdTime; double startsTime; double startlTime; - double startcTime; double startkTime; double startTime; int startIters; @@ -102,9 +99,6 @@ DCtran(CKTcircuit *ckt, int ltra_num; CKTnode *node; -#ifdef PARALLEL_ARCH - long type = MT_TRANAN, length = 1; -#endif /* PARALLEL_ARCH */ #ifdef XSPICE /* gtri - add - wbk - 12/19/90 - Add IPC stuff */ Ipc_Boolean_t ipc_firsttime = IPC_TRUE; @@ -629,9 +623,6 @@ resume: exit(0); } #endif -#ifdef PARALLEL_ARCH - DGOP_( &type, &(ckt->CKTdelta), &length, "min" ); -#endif /* PARALLEL_ARCH */ #endif /* XSPICE */ @@ -894,9 +885,6 @@ resume: #endif } } -#ifdef PARALLEL_ARCH - DGOP_( &type, &(ckt->CKTdelta), &length, "min" ); -#endif /* PARALLEL_ARCH */ if (ckt->CKTdelta <= ckt->CKTdelmin) { if (olddelta > ckt->CKTdelmin) { diff --git a/src/spicelib/devices/adms/admst/ngspice.xml b/src/spicelib/devices/adms/admst/ngspice.xml index 6d6102a14..60736a8cb 100644 --- a/src/spicelib/devices/adms/admst/ngspice.xml +++ b/src/spicelib/devices/adms/admst/ngspice.xml @@ -3563,7 +3563,6 @@ typedef struct s$(module)instance { struct s$(module)model *$(module)modPtr; /* pointer to model */ struct s$(module)instance *$(module)nextInstance; /* pointer to next instance of current model*/ IFuid $(module)name; /* pointer to character string naming this instance */ - int $(module)owner; /* number of owner process */ int $(module)state; /* index into state table for this device */ /* node */ diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml index eb1935c12..9070045e9 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml @@ -191,7 +191,6 @@ typedef struct s$(module)instance { struct s$(module)model *$(module)modPtr; /* pointer to model */ struct s$(module)instance *$(module)nextInstance; /* pointer to next instance of current model*/ IFuid $(module)name; /* pointer to character string naming this instance */ - int $(module)owner; /* number of owner process */ int $(module)state; /* index into state table for this device */ /* node */ diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml index 52aa8f3f4..a2c809d64 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEnoise.c.xml @@ -52,7 +52,6 @@ $(module)noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Nd { for (inst=model->$(module)instances; inst != NULL; inst=inst->$(module)nextInstance) { - if (inst->$(module)owner != ARCHme) continue; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/asrc/asrcacld.c b/src/spicelib/devices/asrc/asrcacld.c index 40fa798ef..248dedef6 100644 --- a/src/spicelib/devices/asrc/asrcacld.c +++ b/src/spicelib/devices/asrc/asrcacld.c @@ -41,9 +41,6 @@ ASRCacLoad(GENmodel *inModel, CKTcircuit *ckt) for (here = model->ASRCinstances; here != NULL ; here = here->ASRCnextInstance) { - if (here->ASRCowner != ARCHme) - continue; - difference = (here->ASRCtemp + here->ASRCdtemp) - 300.15; factor = 1.0 + (here->ASRCtc1)*difference + (here->ASRCtc2)*difference*difference; diff --git a/src/spicelib/devices/asrc/asrcconv.c b/src/spicelib/devices/asrc/asrcconv.c index 704c33d37..bf2f666f8 100644 --- a/src/spicelib/devices/asrc/asrcconv.c +++ b/src/spicelib/devices/asrc/asrcconv.c @@ -23,7 +23,6 @@ ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->ASRCnextModel) { for( here = model->ASRCinstances; here != NULL; here = here->ASRCnextInstance) { - if (here->ASRCowner != ARCHme) continue; i = here->ASRCtree->numVars; if (asrc_nvals < i) { diff --git a/src/spicelib/devices/asrc/asrcdefs.h b/src/spicelib/devices/asrc/asrcdefs.h index f50142b50..18945b65a 100644 --- a/src/spicelib/devices/asrc/asrcdefs.h +++ b/src/spicelib/devices/asrc/asrcdefs.h @@ -21,7 +21,6 @@ typedef struct sASRCinstance { struct sASRCinstance *ASRCnextInstance; /* pointer to next instance of * current model */ IFuid ASRCname; /* pointer to character string naming this instance */ - int ASRCowner; /* number of owner process */ int ASRCstates; /* state info */ int ASRCposNode; /* number of positive node of source */ int ASRCnegNode; /* number of negative node of source */ diff --git a/src/spicelib/devices/asrc/asrcload.c b/src/spicelib/devices/asrc/asrcload.c index 0bf7f4324..9fae882ca 100644 --- a/src/spicelib/devices/asrc/asrcload.c +++ b/src/spicelib/devices/asrc/asrcload.c @@ -38,9 +38,6 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt) for (here = model->ASRCinstances; here != NULL ; here=here->ASRCnextInstance) { - if (here->ASRCowner != ARCHme) - continue; - difference = (here->ASRCtemp + here->ASRCdtemp) - 300.15; factor = 1.0 + (here->ASRCtc1)*difference + (here->ASRCtc2)*difference*difference; if(here->ASRCreciproctc == 1) { diff --git a/src/spicelib/devices/asrc/asrcpzld.c b/src/spicelib/devices/asrc/asrcpzld.c index 395851058..695979f1e 100644 --- a/src/spicelib/devices/asrc/asrcpzld.c +++ b/src/spicelib/devices/asrc/asrcpzld.c @@ -34,9 +34,6 @@ ASRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for (here = model->ASRCinstances; here != NULL ; here=here->ASRCnextInstance) { - if (here->ASRCowner != ARCHme) - continue; - difference = (here->ASRCtemp + here->ASRCdtemp) - 300.15; factor = 1.0 + (here->ASRCtc1)*difference + (here->ASRCtc2)*difference*difference; diff --git a/src/spicelib/devices/asrc/asrctemp.c b/src/spicelib/devices/asrc/asrctemp.c index 29788cf20..64a034d8e 100644 --- a/src/spicelib/devices/asrc/asrctemp.c +++ b/src/spicelib/devices/asrc/asrctemp.c @@ -21,8 +21,6 @@ ASRCtemp(GENmodel *inModel, CKTcircuit *ckt) for (here = model->ASRCinstances; here != NULL ; here=here->ASRCnextInstance) { - if (here->ASRCowner != ARCHme) continue; - /* Default Value Processing for Source Instance */ if(!here->ASRCtempGiven) { diff --git a/src/spicelib/devices/bjt/bjtacld.c b/src/spicelib/devices/bjt/bjtacld.c index b908c8387..30bc78ee1 100644 --- a/src/spicelib/devices/bjt/bjtacld.c +++ b/src/spicelib/devices/bjt/bjtacld.c @@ -40,7 +40,6 @@ BJTacLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->BJTnextModel) { for( here = model->BJTinstances; here!= NULL; here = here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; m = here->BJTm; diff --git a/src/spicelib/devices/bjt/bjtconv.c b/src/spicelib/devices/bjt/bjtconv.c index d55f6806f..21201e7b8 100644 --- a/src/spicelib/devices/bjt/bjtconv.c +++ b/src/spicelib/devices/bjt/bjtconv.c @@ -34,7 +34,6 @@ BJTconvTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->BJTnextModel) { for(here=model->BJTinstances;here!=NULL;here = here->BJTnextInstance){ - if (here->BJTowner != ARCHme) continue; vbe=model->BJTtype*( *(ckt->CKTrhsOld+here->BJTbasePrimeNode)- diff --git a/src/spicelib/devices/bjt/bjtdefs.h b/src/spicelib/devices/bjt/bjtdefs.h index 47ba5aad4..7fdd73070 100644 --- a/src/spicelib/devices/bjt/bjtdefs.h +++ b/src/spicelib/devices/bjt/bjtdefs.h @@ -21,7 +21,6 @@ typedef struct sBJTinstance { struct sBJTinstance *BJTnextInstance; /* pointer to next instance of * current model*/ IFuid BJTname; /* pointer to character string naming this instance */ - int BJTowner; /* number of owner process */ int BJTstate; /* pointer to start of state vector for bjt */ int BJTcolNode; /* number of collector node of bjt */ diff --git a/src/spicelib/devices/bjt/bjtdisto.c b/src/spicelib/devices/bjt/bjtdisto.c index 312bdc69b..ff85a4625 100644 --- a/src/spicelib/devices/bjt/bjtdisto.c +++ b/src/spicelib/devices/bjt/bjtdisto.c @@ -58,7 +58,6 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->BJTinstances; here != NULL ; here=here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; /* getting Volterra kernels */ /* until further notice x = vbe, y = vbc, z= vbed */ diff --git a/src/spicelib/devices/bjt/bjtgetic.c b/src/spicelib/devices/bjt/bjtgetic.c index dd52f995a..9fa51f32b 100644 --- a/src/spicelib/devices/bjt/bjtgetic.c +++ b/src/spicelib/devices/bjt/bjtgetic.c @@ -31,7 +31,6 @@ BJTgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->BJTnextModel) { for(here = model->BJTinstances; here ; here = here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; if(!here->BJTicVBEGiven) { here->BJTicVBE = diff --git a/src/spicelib/devices/bjt/bjtload.c b/src/spicelib/devices/bjt/bjtload.c index 407b9d963..bd7bf02c8 100644 --- a/src/spicelib/devices/bjt/bjtload.c +++ b/src/spicelib/devices/bjt/bjtload.c @@ -144,7 +144,6 @@ BJTload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->BJTinstances; here != NULL ; here=here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; vt = here->BJTtemp * CONSTKoverQ; diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c index 28f943afc..17c676484 100644 --- a/src/spicelib/devices/bjt/bjtnoise.c +++ b/src/spicelib/devices/bjt/bjtnoise.c @@ -54,7 +54,6 @@ BJTnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->BJTnextModel) { for (inst=model->BJTinstances; inst != NULL; inst=inst->BJTnextInstance) { - if (inst->BJTowner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/bjt/bjtpzld.c b/src/spicelib/devices/bjt/bjtpzld.c index 8600cbee4..92de1f2eb 100644 --- a/src/spicelib/devices/bjt/bjtpzld.c +++ b/src/spicelib/devices/bjt/bjtpzld.c @@ -36,7 +36,6 @@ BJTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->BJTnextModel) { for( here = model->BJTinstances; here!= NULL; here = here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; m = here->BJTm; diff --git a/src/spicelib/devices/bjt/bjtsetup.c b/src/spicelib/devices/bjt/bjtsetup.c index 6915293c0..5c94f2edf 100644 --- a/src/spicelib/devices/bjt/bjtsetup.c +++ b/src/spicelib/devices/bjt/bjtsetup.c @@ -341,9 +341,6 @@ BJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - if (here->BJTowner != ARCHme) - goto matrixpointers; - if(!here->BJTareaGiven) { here->BJTarea = 1.0; } @@ -363,7 +360,6 @@ BJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) *states += 8 * (ckt->CKTsenInfo->SENparms); } -matrixpointers: if(model->BJTcollectorResist == 0) { here->BJTcolPrimeNode = here->BJTcolNode; } else if(here->BJTcolPrimeNode == 0) { diff --git a/src/spicelib/devices/bjt/bjtsload.c b/src/spicelib/devices/bjt/bjtsload.c index e354e846f..09abc5f14 100644 --- a/src/spicelib/devices/bjt/bjtsload.c +++ b/src/spicelib/devices/bjt/bjtsload.c @@ -91,7 +91,6 @@ BJTsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->BJTinstances; here != NULL ; here=here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; #ifdef SENSDEBUG printf("base = %d , baseprm = %d ,col = %d, colprm = %d\n", diff --git a/src/spicelib/devices/bjt/bjtsprt.c b/src/spicelib/devices/bjt/bjtsprt.c index 441b2c7a7..dcc947ddb 100644 --- a/src/spicelib/devices/bjt/bjtsprt.c +++ b/src/spicelib/devices/bjt/bjtsprt.c @@ -34,7 +34,6 @@ BJTsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->BJTinstances; here != NULL ; here=here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; ckt->CKTsenInfo->SEN_parmVal[here->BJTsenParmNo] = here->BJTarea; @@ -50,4 +49,3 @@ BJTsPrint(GENmodel *inModel, CKTcircuit *ckt) } } } - diff --git a/src/spicelib/devices/bjt/bjtsset.c b/src/spicelib/devices/bjt/bjtsset.c index c77968eb3..1b7664ebc 100644 --- a/src/spicelib/devices/bjt/bjtsset.c +++ b/src/spicelib/devices/bjt/bjtsset.c @@ -36,7 +36,6 @@ BJTsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->BJTinstances; here != NULL ; here=here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; if(here->BJTsenParmNo){ here->BJTsenParmNo = ++(info->SENparms); @@ -48,4 +47,3 @@ BJTsSetup(SENstruct *info, GENmodel *inModel) } return(OK); } - diff --git a/src/spicelib/devices/bjt/bjtsupd.c b/src/spicelib/devices/bjt/bjtsupd.c index 254ab7e0a..f2551e6c9 100644 --- a/src/spicelib/devices/bjt/bjtsupd.c +++ b/src/spicelib/devices/bjt/bjtsupd.c @@ -48,7 +48,6 @@ BJTsUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->BJTinstances; here != NULL ; here=here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; sxpbe = 0; sxpbc = 0; diff --git a/src/spicelib/devices/bjt/bjttemp.c b/src/spicelib/devices/bjt/bjttemp.c index e778897b7..4ec833c8a 100644 --- a/src/spicelib/devices/bjt/bjttemp.c +++ b/src/spicelib/devices/bjt/bjttemp.c @@ -100,7 +100,6 @@ BJTtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->BJTinstances; here != NULL ; here=here->BJTnextInstance) { - if (here->BJTowner != ARCHme) continue; if(!here->BJTdtempGiven) here->BJTdtemp = 0.0; diff --git a/src/spicelib/devices/bjt/bjttrunc.c b/src/spicelib/devices/bjt/bjttrunc.c index 22cf36972..b00afac97 100644 --- a/src/spicelib/devices/bjt/bjttrunc.c +++ b/src/spicelib/devices/bjt/bjttrunc.c @@ -26,7 +26,6 @@ BJTtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->BJTnextModel) { for(here=model->BJTinstances;here!=NULL;here = here->BJTnextInstance){ - if (here->BJTowner != ARCHme) continue; CKTterr(here->BJTqbe,ckt,timeStep); CKTterr(here->BJTqbc,ckt,timeStep); diff --git a/src/spicelib/devices/bsim1/b1acld.c b/src/spicelib/devices/bsim1/b1acld.c index eb03f36be..a875125d6 100644 --- a/src/spicelib/devices/bsim1/b1acld.c +++ b/src/spicelib/devices/bsim1/b1acld.c @@ -56,7 +56,6 @@ B1acLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->B1nextModel) { for(here = model->B1instances; here!= NULL; here = here->B1nextInstance) { - if (here->B1owner != ARCHme) continue; if (here->B1mode >= 0) { xnrm=1; diff --git a/src/spicelib/devices/bsim1/b1cvtest.c b/src/spicelib/devices/bsim1/b1cvtest.c index 6db3661d4..a17d7c0b1 100644 --- a/src/spicelib/devices/bsim1/b1cvtest.c +++ b/src/spicelib/devices/bsim1/b1cvtest.c @@ -46,7 +46,6 @@ B1convTest(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->B1instances; here != NULL ; here=here->B1nextInstance) { - if (here->B1owner != ARCHme) continue; vbs = model->B1type * ( *(ckt->CKTrhsOld+here->B1bNode) - diff --git a/src/spicelib/devices/bsim1/b1disto.c b/src/spicelib/devices/bsim1/b1disto.c index b805ea573..48ce2986f 100644 --- a/src/spicelib/devices/bsim1/b1disto.c +++ b/src/spicelib/devices/bsim1/b1disto.c @@ -51,7 +51,6 @@ for( ; model != NULL; model = model->B1nextModel ) { /* loop through all the instances of the model */ for (here = model->B1instances; here != NULL ; here=here->B1nextInstance) { - if (here->B1owner != ARCHme) continue; /* loading starts here */ diff --git a/src/spicelib/devices/bsim1/b1dset.c b/src/spicelib/devices/bsim1/b1dset.c index 176000f95..820e555cb 100644 --- a/src/spicelib/devices/bsim1/b1dset.c +++ b/src/spicelib/devices/bsim1/b1dset.c @@ -130,8 +130,6 @@ B1dSetup(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->B1instances; here != NULL ; here=here->B1nextInstance) { - -if (here->B1owner != ARCHme) continue; EffectiveLength=here->B1l - model->B1deltaL * 1.e-6;/* m */ DrainArea = here->B1m * here->B1drainArea; diff --git a/src/spicelib/devices/bsim1/b1getic.c b/src/spicelib/devices/bsim1/b1getic.c index 44189f933..71e073c82 100644 --- a/src/spicelib/devices/bsim1/b1getic.c +++ b/src/spicelib/devices/bsim1/b1getic.c @@ -25,7 +25,6 @@ B1getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->B1nextModel) { for(here = model->B1instances; here ; here = here->B1nextInstance) { - if (here->B1owner != ARCHme) continue; if(!here->B1icVBSGiven) { here->B1icVBS = diff --git a/src/spicelib/devices/bsim1/b1ld.c b/src/spicelib/devices/bsim1/b1ld.c index 2cbf2eafc..049b1a336 100644 --- a/src/spicelib/devices/bsim1/b1ld.c +++ b/src/spicelib/devices/bsim1/b1ld.c @@ -134,7 +134,6 @@ B1load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->B1instances; here != NULL ; here=here->B1nextInstance) { - if (here->B1owner != ARCHme) continue; EffectiveLength=here->B1l - model->B1deltaL * 1.e-6;/* m */ DrainArea = here->B1drainArea; diff --git a/src/spicelib/devices/bsim1/b1noi.c b/src/spicelib/devices/bsim1/b1noi.c index eaff0ec2b..9863f3848 100644 --- a/src/spicelib/devices/bsim1/b1noi.c +++ b/src/spicelib/devices/bsim1/b1noi.c @@ -48,7 +48,6 @@ B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->B1nextModel) { for (inst=model->B1instances; inst != NULL; inst=inst->B1nextInstance) { - if (inst->B1owner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/bsim1/b1pzld.c b/src/spicelib/devices/bsim1/b1pzld.c index e202ea085..d97a7b848 100644 --- a/src/spicelib/devices/bsim1/b1pzld.c +++ b/src/spicelib/devices/bsim1/b1pzld.c @@ -56,7 +56,6 @@ B1pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->B1nextModel) { for(here = model->B1instances; here!= NULL; here = here->B1nextInstance) { - if (here->B1owner != ARCHme) continue; if (here->B1mode >= 0) { xnrm=1; diff --git a/src/spicelib/devices/bsim1/b1set.c b/src/spicelib/devices/bsim1/b1set.c index 9bfb206b6..fc002808b 100644 --- a/src/spicelib/devices/bsim1/b1set.c +++ b/src/spicelib/devices/bsim1/b1set.c @@ -276,11 +276,9 @@ B1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, CKTnode *tmpNode; IFuid tmpName; - if (here->B1owner == ARCHme) { /* allocate a chunk of the state vector */ here->B1states = *states; *states += B1numStates; - } /* perform the parameter defaulting */ if(!here->B1drainAreaGiven) { diff --git a/src/spicelib/devices/bsim1/b1temp.c b/src/spicelib/devices/bsim1/b1temp.c index 09dcb57bd..3279bb61f 100644 --- a/src/spicelib/devices/bsim1/b1temp.c +++ b/src/spicelib/devices/bsim1/b1temp.c @@ -48,8 +48,6 @@ B1temp(GENmodel *inModel, CKTcircuit *ckt) for (here = model->B1instances; here != NULL ; here=here->B1nextInstance) { - if (here->B1owner != ARCHme) continue; - if( (EffChanLength = here->B1l - model->B1deltaL *1e-6 )<=0) { IFuid namarray[2]; namarray[0] = model->B1modName; diff --git a/src/spicelib/devices/bsim1/b1trunc.c b/src/spicelib/devices/bsim1/b1trunc.c index 0e78e318e..148cc6040 100644 --- a/src/spicelib/devices/bsim1/b1trunc.c +++ b/src/spicelib/devices/bsim1/b1trunc.c @@ -21,7 +21,6 @@ B1trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->B1nextModel) { for(here=model->B1instances;here!=NULL;here = here->B1nextInstance){ - if (here->B1owner != ARCHme) continue; #ifdef STEPDEBUG debugtemp = *timeStep; diff --git a/src/spicelib/devices/bsim1/bsim1def.h b/src/spicelib/devices/bsim1/bsim1def.h index b9ff53e7d..acbb54ac7 100644 --- a/src/spicelib/devices/bsim1/bsim1def.h +++ b/src/spicelib/devices/bsim1/bsim1def.h @@ -24,7 +24,6 @@ typedef struct sBSIM1instance { struct sBSIM1instance *B1nextInstance; /* pointer to next instance of *current model*/ IFuid B1name; /* pointer to character string naming this instance */ - int B1owner; /* number of owner process */ int B1states; /* index into state table for this device */ int B1dNode; /* number of the gate node of the mosfet */ diff --git a/src/spicelib/devices/bsim2/b2acld.c b/src/spicelib/devices/bsim2/b2acld.c index 0f91d6d91..1ba8a314d 100644 --- a/src/spicelib/devices/bsim2/b2acld.c +++ b/src/spicelib/devices/bsim2/b2acld.c @@ -57,7 +57,6 @@ B2acLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->B2nextModel) { for(here = model->B2instances; here!= NULL; here = here->B2nextInstance) { - if (here->B2owner != ARCHme) continue; if (here->B2mode >= 0) { xnrm=1; diff --git a/src/spicelib/devices/bsim2/b2cvtest.c b/src/spicelib/devices/bsim2/b2cvtest.c index 6af814ac8..4b896960a 100644 --- a/src/spicelib/devices/bsim2/b2cvtest.c +++ b/src/spicelib/devices/bsim2/b2cvtest.c @@ -46,7 +46,6 @@ B2convTest(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->B2instances; here != NULL ; here=here->B2nextInstance) { - if (here->B2owner != ARCHme) continue; vbs = model->B2type * ( *(ckt->CKTrhsOld+here->B2bNode) - diff --git a/src/spicelib/devices/bsim2/b2getic.c b/src/spicelib/devices/bsim2/b2getic.c index fb3722931..9b9fca5e9 100644 --- a/src/spicelib/devices/bsim2/b2getic.c +++ b/src/spicelib/devices/bsim2/b2getic.c @@ -25,7 +25,6 @@ B2getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->B2nextModel) { for(here = model->B2instances; here ; here = here->B2nextInstance) { - if (here->B2owner != ARCHme) continue; if(!here->B2icVBSGiven) { here->B2icVBS = diff --git a/src/spicelib/devices/bsim2/b2ld.c b/src/spicelib/devices/bsim2/b2ld.c index b081af12f..1dca6b163 100644 --- a/src/spicelib/devices/bsim2/b2ld.c +++ b/src/spicelib/devices/bsim2/b2ld.c @@ -135,7 +135,6 @@ B2load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->B2instances; here != NULL ; here=here->B2nextInstance) { - if (here->B2owner != ARCHme) continue; EffectiveLength=here->B2l - model->B2deltaL * 1.e-6;/* m */ DrainArea = here->B2drainArea; diff --git a/src/spicelib/devices/bsim2/b2noi.c b/src/spicelib/devices/bsim2/b2noi.c index e607c50a1..89e3320c5 100644 --- a/src/spicelib/devices/bsim2/b2noi.c +++ b/src/spicelib/devices/bsim2/b2noi.c @@ -48,7 +48,6 @@ B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->B2nextModel) { for (inst=model->B2instances; inst != NULL; inst=inst->B2nextInstance) { - if (inst->B2owner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/bsim2/b2pzld.c b/src/spicelib/devices/bsim2/b2pzld.c index e2f804f04..6ee62b96c 100644 --- a/src/spicelib/devices/bsim2/b2pzld.c +++ b/src/spicelib/devices/bsim2/b2pzld.c @@ -56,7 +56,6 @@ B2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->B2nextModel) { for(here = model->B2instances; here!= NULL; here = here->B2nextInstance) { - if (here->B2owner != ARCHme) continue; if (here->B2mode >= 0) { xnrm=1; diff --git a/src/spicelib/devices/bsim2/b2set.c b/src/spicelib/devices/bsim2/b2set.c index 75a466c81..ed97eb149 100644 --- a/src/spicelib/devices/bsim2/b2set.c +++ b/src/spicelib/devices/bsim2/b2set.c @@ -434,11 +434,9 @@ B2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) for (here = model->B2instances; here != NULL ; here=here->B2nextInstance) { - if (here->B2owner == ARCHme) { /* allocate a chunk of the state vector */ here->B2states = *states; *states += B2numStates; - } /* perform the parameter defaulting */ diff --git a/src/spicelib/devices/bsim2/b2temp.c b/src/spicelib/devices/bsim2/b2temp.c index f0843d2c7..3d984bb9d 100644 --- a/src/spicelib/devices/bsim2/b2temp.c +++ b/src/spicelib/devices/bsim2/b2temp.c @@ -52,7 +52,6 @@ B2temp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->B2instances; here != NULL ; here=here->B2nextInstance) { - if (here->B2owner != ARCHme) continue; pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; diff --git a/src/spicelib/devices/bsim2/b2trunc.c b/src/spicelib/devices/bsim2/b2trunc.c index 3833a162c..bb186089e 100644 --- a/src/spicelib/devices/bsim2/b2trunc.c +++ b/src/spicelib/devices/bsim2/b2trunc.c @@ -20,7 +20,6 @@ B2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->B2nextModel) { for(here=model->B2instances;here!=NULL;here = here->B2nextInstance){ - if (here->B2owner != ARCHme) continue; #ifdef STEPDEBUG debugtemp = *timeStep; diff --git a/src/spicelib/devices/bsim2/bsim2def.h b/src/spicelib/devices/bsim2/bsim2def.h index 3126e36e2..ddcc65a34 100644 --- a/src/spicelib/devices/bsim2/bsim2def.h +++ b/src/spicelib/devices/bsim2/bsim2def.h @@ -20,7 +20,6 @@ typedef struct sBSIM2instance { struct sBSIM2instance *B2nextInstance; /* pointer to next instance of *current model*/ IFuid B2name; /* pointer to character string naming this instance */ - int B2owner; /* number of owner process */ int B2states; /* index into state table for this device */ int B2dNode; /* number of the gate node of the mosfet */ diff --git a/src/spicelib/devices/bsim3/b3acld.c b/src/spicelib/devices/bsim3/b3acld.c index 8591a0c51..b2fe4590c 100644 --- a/src/spicelib/devices/bsim3/b3acld.c +++ b/src/spicelib/devices/bsim3/b3acld.c @@ -47,9 +47,6 @@ double m; { for (here = model->BSIM3instances; here!= NULL; here = here->BSIM3nextInstance) { - if (here->BSIM3owner != ARCHme) - continue; - Csd = -(here->BSIM3cddb + here->BSIM3cgdb + here->BSIM3cbdb); Csg = -(here->BSIM3cdgb + here->BSIM3cggb + here->BSIM3cbgb); Css = -(here->BSIM3cdsb + here->BSIM3cgsb + here->BSIM3cbsb); diff --git a/src/spicelib/devices/bsim3/b3cvtest.c b/src/spicelib/devices/bsim3/b3cvtest.c index 1d720db3e..5f949014f 100644 --- a/src/spicelib/devices/bsim3/b3cvtest.c +++ b/src/spicelib/devices/bsim3/b3cvtest.c @@ -34,9 +34,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->BSIM3instances; here != NULL ; here=here->BSIM3nextInstance) { - if (here->BSIM3owner != ARCHme) - continue; - vbs = model->BSIM3type * (*(ckt->CKTrhsOld+here->BSIM3bNode) - *(ckt->CKTrhsOld+here->BSIM3sNodePrime)); diff --git a/src/spicelib/devices/bsim3/b3getic.c b/src/spicelib/devices/bsim3/b3getic.c index 49b55b1f6..289dfe179 100644 --- a/src/spicelib/devices/bsim3/b3getic.c +++ b/src/spicelib/devices/bsim3/b3getic.c @@ -26,9 +26,6 @@ BSIM3instance *here; for (; model ; model = model->BSIM3nextModel) { for (here = model->BSIM3instances; here; here = here->BSIM3nextInstance) { - if (here->BSIM3owner != ARCHme) - continue; - if (!here->BSIM3icVBSGiven) { here->BSIM3icVBS = *(ckt->CKTrhs + here->BSIM3bNode) - *(ckt->CKTrhs + here->BSIM3sNode); diff --git a/src/spicelib/devices/bsim3/b3ld.c b/src/spicelib/devices/bsim3/b3ld.c index 2053ae914..0c2b6885f 100644 --- a/src/spicelib/devices/bsim3/b3ld.c +++ b/src/spicelib/devices/bsim3/b3ld.c @@ -186,8 +186,6 @@ for (; model != NULL; model = model->BSIM3nextModel) { for (here = model->BSIM3instances; here != NULL; here = here->BSIM3nextInstance) { - if (here->BSIM3owner != ARCHme) - continue; #endif Check = 1; ByPass = 0; diff --git a/src/spicelib/devices/bsim3/b3pzld.c b/src/spicelib/devices/bsim3/b3pzld.c index 02351d2f8..b6dc4f1b5 100644 --- a/src/spicelib/devices/bsim3/b3pzld.c +++ b/src/spicelib/devices/bsim3/b3pzld.c @@ -41,8 +41,6 @@ double m; { for (here = model->BSIM3instances; here!= NULL; here = here->BSIM3nextInstance) { - if (here->BSIM3owner != ARCHme) - continue; if (here->BSIM3mode >= 0) { Gm = here->BSIM3gm; Gmbs = here->BSIM3gmbs; diff --git a/src/spicelib/devices/bsim3/b3set.c b/src/spicelib/devices/bsim3/b3set.c index 216efece8..abcfbb651 100644 --- a/src/spicelib/devices/bsim3/b3set.c +++ b/src/spicelib/devices/bsim3/b3set.c @@ -864,12 +864,9 @@ BSIM3instance **InstArray; for (here = model->BSIM3instances; here != NULL ; here=here->BSIM3nextInstance) { - if (here->BSIM3owner == ARCHme) - { /* allocate a chunk of the state vector */ here->BSIM3states = *states; *states += BSIM3numStates; - } /* perform the parameter defaulting */ if (!here->BSIM3drainAreaGiven) here->BSIM3drainArea = 0.0; diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c index 9f6bd24a7..3b5de849d 100644 --- a/src/spicelib/devices/bsim3/b3temp.c +++ b/src/spicelib/devices/bsim3/b3temp.c @@ -145,7 +145,6 @@ int Size_Not_Found; for (here = model->BSIM3instances; here != NULL; here = here->BSIM3nextInstance) { - if (here->BSIM3owner != ARCHme) continue; pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim3/b3trunc.c b/src/spicelib/devices/bsim3/b3trunc.c index a8f3d6b3a..050041bde 100644 --- a/src/spicelib/devices/bsim3/b3trunc.c +++ b/src/spicelib/devices/bsim3/b3trunc.c @@ -32,8 +32,6 @@ BSIM3instance *here; { for (here = model->BSIM3instances; here != NULL; here = here->BSIM3nextInstance) { - if (here->BSIM3owner != ARCHme) - continue; #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim3/bsim3def.h b/src/spicelib/devices/bsim3/bsim3def.h index 17f1a825b..86efe6955 100644 --- a/src/spicelib/devices/bsim3/bsim3def.h +++ b/src/spicelib/devices/bsim3/bsim3def.h @@ -21,7 +21,6 @@ typedef struct sBSIM3instance struct sBSIM3model *BSIM3modPtr; struct sBSIM3instance *BSIM3nextInstance; IFuid BSIM3name; - int BSIM3owner; /* number of owner process */ int BSIM3states; /* index into state table for this device */ int BSIM3dNode; int BSIM3gNode; diff --git a/src/spicelib/devices/bsim3soi/b4soiacld.c b/src/spicelib/devices/bsim3soi/b4soiacld.c index 3f8c3ec5d..a3abe7678 100644 --- a/src/spicelib/devices/bsim3soi/b4soiacld.c +++ b/src/spicelib/devices/bsim3soi/b4soiacld.c @@ -81,7 +81,6 @@ double m; for (here = model->B4SOIinstances; here!= NULL; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; selfheat = (model->B4SOIshMod == 1) && (here->B4SOIrth0 != 0.0); if (here->B4SOImode >= 0) { Gm = here->B4SOIgm; diff --git a/src/spicelib/devices/bsim3soi/b4soicvtest.c b/src/spicelib/devices/bsim3soi/b4soicvtest.c index deefdffa6..90093c7cc 100644 --- a/src/spicelib/devices/bsim3soi/b4soicvtest.c +++ b/src/spicelib/devices/bsim3soi/b4soicvtest.c @@ -41,7 +41,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->B4SOIinstances; here != NULL ; here=here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; vbs = model->B4SOItype * (*(ckt->CKTrhsOld+here->B4SOIbNode) - *(ckt->CKTrhsOld+here->B4SOIsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi/b4soidef.h b/src/spicelib/devices/bsim3soi/b4soidef.h index 3433636c9..cf7c902de 100644 --- a/src/spicelib/devices/bsim3soi/b4soidef.h +++ b/src/spicelib/devices/bsim3soi/b4soidef.h @@ -29,7 +29,6 @@ typedef struct sB4SOIinstance struct sB4SOImodel *B4SOImodPtr; struct sB4SOIinstance *B4SOInextInstance; IFuid B4SOIname; - int B4SOIowner; /* number of owner process */ int B4SOIstates; /* index into state table for this device */ int B4SOIdNode; diff --git a/src/spicelib/devices/bsim3soi/b4soidest.c b/src/spicelib/devices/bsim3soi/b4soidest.c index bbcb24ca5..1f2161318 100644 --- a/src/spicelib/devices/bsim3soi/b4soidest.c +++ b/src/spicelib/devices/bsim3soi/b4soidest.c @@ -35,7 +35,6 @@ B4SOImodel *oldmod = NULL; prev = (B4SOIinstance *)NULL; for (here = mod->B4SOIinstances; here; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; if(prev) FREE(prev); prev = here; } diff --git a/src/spicelib/devices/bsim3soi/b4soigetic.c b/src/spicelib/devices/bsim3soi/b4soigetic.c index 87832a8c6..8ffc5f285 100644 --- a/src/spicelib/devices/bsim3soi/b4soigetic.c +++ b/src/spicelib/devices/bsim3soi/b4soigetic.c @@ -33,7 +33,6 @@ B4SOIinstance *here; for (; model ; model = model->B4SOInextModel) { for (here = model->B4SOIinstances; here; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; if(!here->B4SOIicVBSGiven) { here->B4SOIicVBS = *(ckt->CKTrhs + here->B4SOIbNode) - *(ckt->CKTrhs + here->B4SOIsNode); diff --git a/src/spicelib/devices/bsim3soi/b4soild.c b/src/spicelib/devices/bsim3soi/b4soild.c index 565af82d5..710dd3290 100644 --- a/src/spicelib/devices/bsim3soi/b4soild.c +++ b/src/spicelib/devices/bsim3soi/b4soild.c @@ -496,7 +496,6 @@ int B4SOILoadOMP(B4SOIinstance *here, CKTcircuit *ckt) { { for (here = model->B4SOIinstances; here != NULL; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; #endif Check = 0; ByPass = 0; diff --git a/src/spicelib/devices/bsim3soi/b4soimdel.c b/src/spicelib/devices/bsim3soi/b4soimdel.c index fc29e1c9c..4507fe039 100644 --- a/src/spicelib/devices/bsim3soi/b4soimdel.c +++ b/src/spicelib/devices/bsim3soi/b4soimdel.c @@ -45,7 +45,6 @@ delgot: *oldmod = (*model)->B4SOInextModel; /* cut deleted device out of list */ for (here = (*model)->B4SOIinstances; here; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; if(prev) FREE(prev); prev = here; } diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c index 09074c941..089b01e0d 100644 --- a/src/spicelib/devices/bsim3soi/b4soinoi.c +++ b/src/spicelib/devices/bsim3soi/b4soinoi.c @@ -152,8 +152,6 @@ double m; { for (here = model->B4SOIinstances; here != NULL; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; - m = here->B4SOIm; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim3soi/b4soipzld.c b/src/spicelib/devices/bsim3soi/b4soipzld.c index 27b1cebf7..d584f75f6 100644 --- a/src/spicelib/devices/bsim3soi/b4soipzld.c +++ b/src/spicelib/devices/bsim3soi/b4soipzld.c @@ -44,7 +44,6 @@ double m; { for (here = model->B4SOIinstances; here!= NULL; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; if (here->B4SOImode >= 0) { Gm = here->B4SOIgm; Gmbs = here->B4SOIgmbs; diff --git a/src/spicelib/devices/bsim3soi/b4soitemp.c b/src/spicelib/devices/bsim3soi/b4soitemp.c index 4528dd75a..4f10ab9d9 100644 --- a/src/spicelib/devices/bsim3soi/b4soitemp.c +++ b/src/spicelib/devices/bsim3soi/b4soitemp.c @@ -163,7 +163,6 @@ B4SOItemp( for (here = model->B4SOIinstances; here != NULL; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; here->B4SOIrbodyext = here->B4SOIbodySquares * model->B4SOIrbsh; pSizeDependParamKnot = model->pSizeDependParamKnot; diff --git a/src/spicelib/devices/bsim3soi/b4soitrunc.c b/src/spicelib/devices/bsim3soi/b4soitrunc.c index a23855ce4..3d6b6c584 100644 --- a/src/spicelib/devices/bsim3soi/b4soitrunc.c +++ b/src/spicelib/devices/bsim3soi/b4soitrunc.c @@ -38,7 +38,6 @@ register B4SOIinstance *here; { for (here = model->B4SOIinstances; here != NULL; here = here->B4SOInextInstance) { - if (here->B4SOIowner != ARCHme) continue; #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c index 7f1a95722..38cffecbb 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c @@ -54,10 +54,6 @@ double m; for (here = model->B3SOIDDinstances; here!= NULL; here = here->B3SOIDDnextInstance) { - if (here->B3SOIDDowner != ARCHme) - continue; - - selfheat = (model->B3SOIDDshMod == 1) && (here->B3SOIDDrth0 != 0.0); if (here->B3SOIDDdebugMod > 2) { diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c b/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c index dd12e4663..1f71a8bfe 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c @@ -34,10 +34,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->B3SOIDDinstances; here != NULL ; here=here->B3SOIDDnextInstance) { - - if (here->B3SOIDDowner != ARCHme) - continue; - vbs = model->B3SOIDDtype * (*(ckt->CKTrhsOld+here->B3SOIDDbNode) - *(ckt->CKTrhsOld+here->B3SOIDDsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddef.h b/src/spicelib/devices/bsim3soi_dd/b3soidddef.h index 290cfd92c..39823c04d 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soidddef.h +++ b/src/spicelib/devices/bsim3soi_dd/b3soidddef.h @@ -24,7 +24,6 @@ typedef struct sB3SOIDDinstance struct sB3SOIDDmodel *B3SOIDDmodPtr; struct sB3SOIDDinstance *B3SOIDDnextInstance; IFuid B3SOIDDname; - int B3SOIDDowner; /* number of owner process */ int B3SOIDDstates; /* index into state table for this device */ int B3SOIDDdNode; diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c b/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c index fb0400dd1..221c6d6e1 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c @@ -26,10 +26,6 @@ B3SOIDDinstance *here; for (; model ; model = model->B3SOIDDnextModel) { for (here = model->B3SOIDDinstances; here; here = here->B3SOIDDnextInstance) { - - if (here->B3SOIDDowner != ARCHme) - continue; - if(!here->B3SOIDDicVBSGiven) { here->B3SOIDDicVBS = *(ckt->CKTrhs + here->B3SOIDDbNode) - *(ckt->CKTrhs + here->B3SOIDDsNode); diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c index 9307d59c7..7ac0b4ce2 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c @@ -309,10 +309,6 @@ double m; { for (here = model->B3SOIDDinstances; here != NULL; here = here->B3SOIDDnextInstance) { - - if (here->B3SOIDDowner != ARCHme) - continue; - Check = 0; ByPass = 0; selfheat = (model->B3SOIDDshMod == 1) && (here->B3SOIDDrth0 != 0.0); diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c index be87f56cc..8a3eb1f69 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c @@ -132,10 +132,6 @@ int i; { for (here = model->B3SOIDDinstances; here != NULL; here = here->B3SOIDDnextInstance) { - - if (here->B3SOIDDowner != ARCHme) - continue; - pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c index 55fd1ce66..16980a795 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c @@ -38,10 +38,6 @@ double m; { for (here = model->B3SOIDDinstances; here!= NULL; here = here->B3SOIDDnextInstance) { - - if (here->B3SOIDDowner != ARCHme) - continue; - if (here->B3SOIDDmode >= 0) { Gm = here->B3SOIDDgm; Gmbs = here->B3SOIDDgmbs; diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddset.c b/src/spicelib/devices/bsim3soi_dd/b3soiddset.c index a5a64e2f9..0ed729e88 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddset.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddset.c @@ -877,13 +877,9 @@ IFuid tmpName; for (here = model->B3SOIDDinstances; here != NULL ; here=here->B3SOIDDnextInstance) { - - if (here->B3SOIDDowner == ARCHme) - { /* allocate a chunk of the state vector */ here->B3SOIDDstates = *states; *states += B3SOIDDnumStates; - } /* perform the parameter defaulting */ if (!here->B3SOIDDdrainAreaGiven) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c index d69947908..fe6f7c82d 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c @@ -75,10 +75,6 @@ int Size_Not_Found; for (here = model->B3SOIDDinstances; here != NULL; here = here->B3SOIDDnextInstance) { - - if (here->B3SOIDDowner != ARCHme) - continue; - here->B3SOIDDrbodyext = here->B3SOIDDbodySquares * model->B3SOIDDrbsh; pSizeDependParamKnot = model->pSizeDependParamKnot; diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c b/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c index da1062fda..a55c9923a 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c @@ -31,8 +31,6 @@ B3SOIDDinstance *here; { for (here = model->B3SOIDDinstances; here != NULL; here = here->B3SOIDDnextInstance) { - if (here->B3SOIDDowner != ARCHme) - continue; #ifdef STEPDEBUG debugtemp = *timeStep; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c index 2f15594a3..14cc38e2d 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c @@ -55,10 +55,6 @@ double m; for (here = model->B3SOIFDinstances; here!= NULL; here = here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; - selfheat = (model->B3SOIFDshMod == 1) && (here->B3SOIFDrth0 != 0.0); if (here->B3SOIFDdebugMod > 2) { diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c b/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c index b9f23c109..45139e02e 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c @@ -34,10 +34,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->B3SOIFDinstances; here != NULL ; here=here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; - vbs = model->B3SOIFDtype * (*(ckt->CKTrhsOld+here->B3SOIFDbNode) - *(ckt->CKTrhsOld+here->B3SOIFDsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddef.h b/src/spicelib/devices/bsim3soi_fd/b3soifddef.h index 13739b68e..16e55c84a 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifddef.h +++ b/src/spicelib/devices/bsim3soi_fd/b3soifddef.h @@ -24,7 +24,6 @@ typedef struct sB3SOIFDinstance struct sB3SOIFDmodel *B3SOIFDmodPtr; struct sB3SOIFDinstance *B3SOIFDnextInstance; IFuid B3SOIFDname; - int B3SOIFDowner; /* number of owner process */ int B3SOIFDstates; /* index into state table for this device */ int B3SOIFDdNode; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c b/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c index f35728b6a..4dbbb1aa5 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c @@ -26,11 +26,6 @@ B3SOIFDinstance *here; for (; model ; model = model->B3SOIFDnextModel) { for (here = model->B3SOIFDinstances; here; here = here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; - - if(!here->B3SOIFDicVBSGiven) { here->B3SOIFDicVBS = *(ckt->CKTrhs + here->B3SOIFDbNode) - *(ckt->CKTrhs + here->B3SOIFDsNode); diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c index 62917c2a4..5fcc5a838 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c @@ -279,10 +279,6 @@ for (; model != NULL; model = model->B3SOIFDnextModel) { for (here = model->B3SOIFDinstances; here != NULL; here = here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; - Check = 0; ByPass = 0; selfheat = (model->B3SOIFDshMod == 1) && (here->B3SOIFDrth0 != 0.0); diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c index 1de2bed96..3013e7707 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c @@ -132,10 +132,6 @@ int i; { for (here = model->B3SOIFDinstances; here != NULL; here = here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; - pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c index 268b7ed99..60b921680 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c @@ -37,10 +37,6 @@ double m; { for (here = model->B3SOIFDinstances; here!= NULL; here = here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; - if (here->B3SOIFDmode >= 0) { Gm = here->B3SOIFDgm; Gmbs = here->B3SOIFDgmbs; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdset.c b/src/spicelib/devices/bsim3soi_fd/b3soifdset.c index 4f6f03aba..8eb0aa82a 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdset.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdset.c @@ -878,13 +878,9 @@ IFuid tmpName; for (here = model->B3SOIFDinstances; here != NULL ; here=here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner == ARCHme) - { /* allocate a chunk of the state vector */ here->B3SOIFDstates = *states; *states += B3SOIFDnumStates; - } /* perform the parameter defaulting */ if (!here->B3SOIFDdrainAreaGiven) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c index 0803ec0bc..9ab491c06 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c @@ -74,10 +74,6 @@ int Size_Not_Found; for (here = model->B3SOIFDinstances; here != NULL; here = here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; - here->B3SOIFDrbodyext = here->B3SOIFDbodySquares * model->B3SOIFDrbsh; pSizeDependParamKnot = model->pSizeDependParamKnot; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c b/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c index fd6e97e6c..549fe96dd 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c @@ -31,9 +31,6 @@ B3SOIFDinstance *here; { for (here = model->B3SOIFDinstances; here != NULL; here = here->B3SOIFDnextInstance) { - - if (here->B3SOIFDowner != ARCHme) - continue; #ifdef STEPDEBUG debugtemp = *timeStep; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c index cc3459ffa..c64361140 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c @@ -55,10 +55,6 @@ double m; for (here = model->B3SOIPDinstances; here!= NULL; here = here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - selfheat = (model->B3SOIPDshMod == 1) && (here->B3SOIPDrth0 != 0.0); if (here->B3SOIPDmode >= 0) { Gm = here->B3SOIPDgm; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c b/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c index 68aee2a90..8a941fff7 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c @@ -34,10 +34,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->B3SOIPDinstances; here != NULL ; here=here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - vbs = model->B3SOIPDtype * (*(ckt->CKTrhsOld+here->B3SOIPDbNode) - *(ckt->CKTrhsOld+here->B3SOIPDsNodePrime)); diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddef.h b/src/spicelib/devices/bsim3soi_pd/b3soipddef.h index ed943c065..2221ebc1f 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipddef.h +++ b/src/spicelib/devices/bsim3soi_pd/b3soipddef.h @@ -28,7 +28,6 @@ typedef struct sB3SOIPDinstance struct sB3SOIPDmodel *B3SOIPDmodPtr; struct sB3SOIPDinstance *B3SOIPDnextInstance; IFuid B3SOIPDname; - int B3SOIPDowner; /* number of owner process */ int B3SOIPDstates; /* index into state table for this device */ int B3SOIPDdNode; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c b/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c index c36fea6b6..98fd6b79a 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c @@ -26,10 +26,6 @@ B3SOIPDinstance *here; for (; model ; model = model->B3SOIPDnextModel) { for (here = model->B3SOIPDinstances; here; here = here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - if(!here->B3SOIPDicVBSGiven) { here->B3SOIPDicVBS = *(ckt->CKTrhs + here->B3SOIPDbNode) - *(ckt->CKTrhs + here->B3SOIPDsNode); diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c index 86bedb477..6480b9f00 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c @@ -295,10 +295,6 @@ for (; model != NULL; model = model->B3SOIPDnextModel) { for (here = model->B3SOIPDinstances; here != NULL; here = here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - Check = 0; ByPass = 0; selfheat = (model->B3SOIPDshMod == 1) && (here->B3SOIPDrth0 != 0.0); diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c index 6d13e4cc6..80d381a3c 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c @@ -136,10 +136,6 @@ int i; { for (here = model->B3SOIPDinstances; here != NULL; here = here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c index d3a883083..4fde5ef09 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c @@ -37,10 +37,6 @@ double m; { for (here = model->B3SOIPDinstances; here!= NULL; here = here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - if (here->B3SOIPDmode >= 0) { Gm = here->B3SOIPDgm; Gmbs = here->B3SOIPDgmbs; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c index 14561c6ce..5a056b280 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c @@ -1051,13 +1051,9 @@ IFuid tmpName; for (here = model->B3SOIPDinstances; here != NULL ; here=here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner == ARCHme) - { /* allocate a chunk of the state vector */ here->B3SOIPDstates = *states; *states += B3SOIPDnumStates; - } /* perform the parameter defaulting */ if (!here->B3SOIPDdrainAreaGiven) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c index 113421fcf..b9c2d7bbc 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c @@ -93,10 +93,6 @@ double tmp3, T7; for (here = model->B3SOIPDinstances; here != NULL; here = here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - here->B3SOIPDrbodyext = here->B3SOIPDbodySquares * model->B3SOIPDrbsh; pSizeDependParamKnot = model->pSizeDependParamKnot; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c b/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c index 57e804c5e..72d42e523 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c @@ -31,10 +31,6 @@ B3SOIPDinstance *here; { for (here = model->B3SOIPDinstances; here != NULL; here = here->B3SOIPDnextInstance) { - - if (here->B3SOIPDowner != ARCHme) - continue; - #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim3v0/b3v0acld.c b/src/spicelib/devices/bsim3v0/b3v0acld.c index 8e3eed7a5..159d1728b 100644 --- a/src/spicelib/devices/bsim3v0/b3v0acld.c +++ b/src/spicelib/devices/bsim3v0/b3v0acld.c @@ -33,11 +33,6 @@ double m; for (here = model->BSIM3v0instances; here!= NULL; here = here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; - - if (here->BSIM3v0mode >= 0) { Gm = here->BSIM3v0gm; Gmbs = here->BSIM3v0gmbs; diff --git a/src/spicelib/devices/bsim3v0/b3v0cvtest.c b/src/spicelib/devices/bsim3v0/b3v0cvtest.c index e1ddbb538..f982c59b3 100644 --- a/src/spicelib/devices/bsim3v0/b3v0cvtest.c +++ b/src/spicelib/devices/bsim3v0/b3v0cvtest.c @@ -28,10 +28,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->BSIM3v0instances; here != NULL ; here=here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; - vbs = model->BSIM3v0type * (*(ckt->CKTrhsOld+here->BSIM3v0bNode) - *(ckt->CKTrhsOld+here->BSIM3v0sNodePrime)); diff --git a/src/spicelib/devices/bsim3v0/b3v0getic.c b/src/spicelib/devices/bsim3v0/b3v0getic.c index 36163d61a..219a5833d 100644 --- a/src/spicelib/devices/bsim3v0/b3v0getic.c +++ b/src/spicelib/devices/bsim3v0/b3v0getic.c @@ -20,10 +20,6 @@ BSIM3v0instance *here; for (; model ; model = model->BSIM3v0nextModel) { for (here = model->BSIM3v0instances; here; here = here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; - if(!here->BSIM3v0icVBSGiven) { here->BSIM3v0icVBS = *(ckt->CKTrhs + here->BSIM3v0bNode) - *(ckt->CKTrhs + here->BSIM3v0sNode); diff --git a/src/spicelib/devices/bsim3v0/b3v0ld.c b/src/spicelib/devices/bsim3v0/b3v0ld.c index 8a87ccb59..4f6a5b2e1 100644 --- a/src/spicelib/devices/bsim3v0/b3v0ld.c +++ b/src/spicelib/devices/bsim3v0/b3v0ld.c @@ -123,10 +123,6 @@ for (; model != NULL; model = model->BSIM3v0nextModel) { for (here = model->BSIM3v0instances; here != NULL; here = here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; - Check = 1; ByPass = 0; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c index 215aefac9..7c5953591 100644 --- a/src/spicelib/devices/bsim3v0/b3v0noi.c +++ b/src/spicelib/devices/bsim3v0/b3v0noi.c @@ -105,10 +105,6 @@ int i; { for (here = model->BSIM3v0instances; here != NULL; here = here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; - pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3v0/b3v0pzld.c b/src/spicelib/devices/bsim3v0/b3v0pzld.c index 9770c65b0..db0b2e1f4 100644 --- a/src/spicelib/devices/bsim3v0/b3v0pzld.c +++ b/src/spicelib/devices/bsim3v0/b3v0pzld.c @@ -30,10 +30,6 @@ double m; { for (here = model->BSIM3v0instances; here!= NULL; here = here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; - if (here->BSIM3v0mode >= 0) { Gm = here->BSIM3v0gm; Gmbs = here->BSIM3v0gmbs; diff --git a/src/spicelib/devices/bsim3v0/b3v0set.c b/src/spicelib/devices/bsim3v0/b3v0set.c index bb757e801..467e40b6a 100644 --- a/src/spicelib/devices/bsim3v0/b3v0set.c +++ b/src/spicelib/devices/bsim3v0/b3v0set.c @@ -753,12 +753,9 @@ IFuid tmpName; here=here->BSIM3v0nextInstance) { - if (here->BSIM3v0owner == ARCHme) - { /* allocate a chunk of the state vector */ here->BSIM3v0states = *states; *states += BSIM3v0numStates; - } /* perform the parameter defaulting */ if (!here->BSIM3v0drainAreaGiven) diff --git a/src/spicelib/devices/bsim3v0/b3v0temp.c b/src/spicelib/devices/bsim3v0/b3v0temp.c index 93374af9b..0fca2a7a2 100644 --- a/src/spicelib/devices/bsim3v0/b3v0temp.c +++ b/src/spicelib/devices/bsim3v0/b3v0temp.c @@ -52,10 +52,6 @@ int Size_Not_Found; for (here = model->BSIM3v0instances; here != NULL; here=here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; - pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim3v0/b3v0trunc.c b/src/spicelib/devices/bsim3v0/b3v0trunc.c index 082006fc8..ff4de7834 100644 --- a/src/spicelib/devices/bsim3v0/b3v0trunc.c +++ b/src/spicelib/devices/bsim3v0/b3v0trunc.c @@ -25,9 +25,6 @@ BSIM3v0instance *here; { for (here = model->BSIM3v0instances; here != NULL; here = here->BSIM3v0nextInstance) { - - if (here->BSIM3v0owner != ARCHme) - continue; #ifdef STEPDEBUG debugtemp = *timeStep; diff --git a/src/spicelib/devices/bsim3v0/bsim3v0def.h b/src/spicelib/devices/bsim3v0/bsim3v0def.h index 2d993511b..06eac1a98 100644 --- a/src/spicelib/devices/bsim3v0/bsim3v0def.h +++ b/src/spicelib/devices/bsim3v0/bsim3v0def.h @@ -18,7 +18,6 @@ typedef struct sBSIM3v0instance struct sBSIM3v0model *BSIM3v0modPtr; struct sBSIM3v0instance *BSIM3v0nextInstance; IFuid BSIM3v0name; - int BSIM3v0owner; /* number of owner process */ int BSIM3v0states; /* index into state table for this device */ int BSIM3v0dNode; diff --git a/src/spicelib/devices/bsim3v1/ChangeLog b/src/spicelib/devices/bsim3v1/ChangeLog index 582d426ad..a20d00526 100644 --- a/src/spicelib/devices/bsim3v1/ChangeLog +++ b/src/spicelib/devices/bsim3v1/ChangeLog @@ -1,3 +1,6 @@ +22-10-2012 Francesco Lannutti + * b3v1acld.c, b3v1cvtest.c, b3v1getic.c, b3v1ld.c, b3v1pzld.c, b3v1set.c, b3v1temp.c, b3v1trunc.c, bsim3v1def.h: Deleted the BSIM3V1owner field + 27-01-2000 Paolo Nenzi * bsim3v1def.h: added BSIM3V1owner varialbe to the BSIM3V1instance structure to support "parallel" processing with Cider diff --git a/src/spicelib/devices/bsim3v1/b3v1acld.c b/src/spicelib/devices/bsim3v1/b3v1acld.c index 080ed3eab..b60c780dd 100644 --- a/src/spicelib/devices/bsim3v1/b3v1acld.c +++ b/src/spicelib/devices/bsim3v1/b3v1acld.c @@ -39,11 +39,6 @@ BSIM3v1acLoad (GENmodel * inModel, CKTcircuit * ckt) for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - - if (here->BSIM3v1mode >= 0) { Gm = here->BSIM3v1gm; diff --git a/src/spicelib/devices/bsim3v1/b3v1cvtest.c b/src/spicelib/devices/bsim3v1/b3v1cvtest.c index 78eab3ca9..991aed5b1 100644 --- a/src/spicelib/devices/bsim3v1/b3v1cvtest.c +++ b/src/spicelib/devices/bsim3v1/b3v1cvtest.c @@ -34,10 +34,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->BSIM3v1instances; here != NULL ; here=here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - vbs = model->BSIM3v1type * (*(ckt->CKTrhsOld+here->BSIM3v1bNode) - *(ckt->CKTrhsOld+here->BSIM3v1sNodePrime)); diff --git a/src/spicelib/devices/bsim3v1/b3v1getic.c b/src/spicelib/devices/bsim3v1/b3v1getic.c index 6b743328e..37b3e6399 100644 --- a/src/spicelib/devices/bsim3v1/b3v1getic.c +++ b/src/spicelib/devices/bsim3v1/b3v1getic.c @@ -26,11 +26,6 @@ BSIM3v1instance *here; for (; model ; model = model->BSIM3v1nextModel) { for (here = model->BSIM3v1instances; here; here = here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - - if(!here->BSIM3v1icVBSGiven) { here->BSIM3v1icVBS = *(ckt->CKTrhs + here->BSIM3v1bNode) - *(ckt->CKTrhs + here->BSIM3v1sNode); diff --git a/src/spicelib/devices/bsim3v1/b3v1ld.c b/src/spicelib/devices/bsim3v1/b3v1ld.c index 70d3347ca..ac501e1eb 100644 --- a/src/spicelib/devices/bsim3v1/b3v1ld.c +++ b/src/spicelib/devices/bsim3v1/b3v1ld.c @@ -129,10 +129,6 @@ for (; model != NULL; model = model->BSIM3v1nextModel) { for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - Check = 1; ByPass = 0; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c index ee0f2cdef..0d4361197 100644 --- a/src/spicelib/devices/bsim3v1/b3v1noi.c +++ b/src/spicelib/devices/bsim3v1/b3v1noi.c @@ -128,10 +128,6 @@ int i; { for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - pParam = here->pParam; switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/bsim3v1/b3v1pzld.c b/src/spicelib/devices/bsim3v1/b3v1pzld.c index a809d7249..19e41f8a1 100644 --- a/src/spicelib/devices/bsim3v1/b3v1pzld.c +++ b/src/spicelib/devices/bsim3v1/b3v1pzld.c @@ -36,10 +36,6 @@ double m; { for (here = model->BSIM3v1instances; here!= NULL; here = here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - if (here->BSIM3v1mode >= 0) { Gm = here->BSIM3v1gm; Gmbs = here->BSIM3v1gmbs; diff --git a/src/spicelib/devices/bsim3v1/b3v1set.c b/src/spicelib/devices/bsim3v1/b3v1set.c index fc40a0a0c..6f1ea3fdc 100644 --- a/src/spicelib/devices/bsim3v1/b3v1set.c +++ b/src/spicelib/devices/bsim3v1/b3v1set.c @@ -778,12 +778,9 @@ IFuid tmpName; for (here = model->BSIM3v1instances; here != NULL ; here=here->BSIM3v1nextInstance) { - if (here->BSIM3v1owner == ARCHme) - { /* allocate a chunk of the state vector */ here->BSIM3v1states = *states; *states += BSIM3v1numStates; - } /* perform the parameter defaulting */ if(here->BSIM3v1m == 0.0) diff --git a/src/spicelib/devices/bsim3v1/b3v1temp.c b/src/spicelib/devices/bsim3v1/b3v1temp.c index 5d7860eb2..3a22b33ae 100644 --- a/src/spicelib/devices/bsim3v1/b3v1temp.c +++ b/src/spicelib/devices/bsim3v1/b3v1temp.c @@ -92,10 +92,6 @@ int Size_Not_Found; for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim3v1/b3v1trunc.c b/src/spicelib/devices/bsim3v1/b3v1trunc.c index c15750c6d..afe094ca4 100644 --- a/src/spicelib/devices/bsim3v1/b3v1trunc.c +++ b/src/spicelib/devices/bsim3v1/b3v1trunc.c @@ -31,10 +31,6 @@ BSIM3v1instance *here; { for (here = model->BSIM3v1instances; here != NULL; here = here->BSIM3v1nextInstance) { - - if (here->BSIM3v1owner != ARCHme) - continue; - #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim3v1/bsim3v1def.h b/src/spicelib/devices/bsim3v1/bsim3v1def.h index ba4e7057e..2a1101c3b 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1def.h +++ b/src/spicelib/devices/bsim3v1/bsim3v1def.h @@ -19,7 +19,6 @@ typedef struct sBSIM3v1instance struct sBSIM3v1model *BSIM3v1modPtr; struct sBSIM3v1instance *BSIM3v1nextInstance; IFuid BSIM3v1name; - int BSIM3v1owner; /* number of owner process */ int BSIM3v1states; /* index into state table for this device */ int BSIM3v1dNode; diff --git a/src/spicelib/devices/bsim3v32/b3v32acld.c b/src/spicelib/devices/bsim3v32/b3v32acld.c index 1a5b28d43..28992b5f3 100644 --- a/src/spicelib/devices/bsim3v32/b3v32acld.c +++ b/src/spicelib/devices/bsim3v32/b3v32acld.c @@ -40,9 +40,6 @@ double m; { for (here = model->BSIM3v32instances; here!= NULL; here = here->BSIM3v32nextInstance) { - if (here->BSIM3v32owner != ARCHme) - continue; - if (here->BSIM3v32mode >= 0) { Gm = here->BSIM3v32gm; Gmbs = here->BSIM3v32gmbs; diff --git a/src/spicelib/devices/bsim3v32/b3v32cvtest.c b/src/spicelib/devices/bsim3v32/b3v32cvtest.c index 200c81a6b..52c162c37 100644 --- a/src/spicelib/devices/bsim3v32/b3v32cvtest.c +++ b/src/spicelib/devices/bsim3v32/b3v32cvtest.c @@ -33,10 +33,6 @@ double cbd, cbhat, cbs, cd, cdhat, tol, vgd, vgdo, vgs; for (here = model->BSIM3v32instances; here != NULL ; here=here->BSIM3v32nextInstance) { - - if (here->BSIM3v32owner != ARCHme) - continue; - vbs = model->BSIM3v32type * (*(ckt->CKTrhsOld+here->BSIM3v32bNode) - *(ckt->CKTrhsOld+here->BSIM3v32sNodePrime)); diff --git a/src/spicelib/devices/bsim3v32/b3v32getic.c b/src/spicelib/devices/bsim3v32/b3v32getic.c index b757759ce..5c8a4368f 100644 --- a/src/spicelib/devices/bsim3v32/b3v32getic.c +++ b/src/spicelib/devices/bsim3v32/b3v32getic.c @@ -24,9 +24,6 @@ BSIM3v32instance *here; for (; model ; model = model->BSIM3v32nextModel) { for (here = model->BSIM3v32instances; here; here = here->BSIM3v32nextInstance) { - if (here->BSIM3v32owner != ARCHme) - continue; - if (!here->BSIM3v32icVBSGiven) { here->BSIM3v32icVBS = *(ckt->CKTrhs + here->BSIM3v32bNode) - *(ckt->CKTrhs + here->BSIM3v32sNode); diff --git a/src/spicelib/devices/bsim3v32/b3v32ld.c b/src/spicelib/devices/bsim3v32/b3v32ld.c index 0a84b27fa..bcc96c518 100644 --- a/src/spicelib/devices/bsim3v32/b3v32ld.c +++ b/src/spicelib/devices/bsim3v32/b3v32ld.c @@ -145,8 +145,6 @@ for (; model != NULL; model = model->BSIM3v32nextModel) { for (here = model->BSIM3v32instances; here != NULL; here = here->BSIM3v32nextInstance) { - if (here->BSIM3v32owner != ARCHme) - continue; Check = 1; ByPass = 0; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim3v32/b3v32pzld.c b/src/spicelib/devices/bsim3v32/b3v32pzld.c index 2ab66d1d6..f775c1ea4 100644 --- a/src/spicelib/devices/bsim3v32/b3v32pzld.c +++ b/src/spicelib/devices/bsim3v32/b3v32pzld.c @@ -40,8 +40,6 @@ double m; { for (here = model->BSIM3v32instances; here!= NULL; here = here->BSIM3v32nextInstance) { - if (here->BSIM3v32owner != ARCHme) - continue; if (here->BSIM3v32mode >= 0) { Gm = here->BSIM3v32gm; Gmbs = here->BSIM3v32gmbs; diff --git a/src/spicelib/devices/bsim3v32/b3v32set.c b/src/spicelib/devices/bsim3v32/b3v32set.c index ccbe25c81..e5d83f3c4 100644 --- a/src/spicelib/devices/bsim3v32/b3v32set.c +++ b/src/spicelib/devices/bsim3v32/b3v32set.c @@ -896,12 +896,9 @@ IFuid tmpName; for (here = model->BSIM3v32instances; here != NULL ; here=here->BSIM3v32nextInstance) { - if (here->BSIM3v32owner == ARCHme) - { /* allocate a chunk of the state vector */ here->BSIM3v32states = *states; *states += BSIM3v32numStates; - } /* perform the parameter defaulting */ if (!here->BSIM3v32drainAreaGiven) diff --git a/src/spicelib/devices/bsim3v32/b3v32temp.c b/src/spicelib/devices/bsim3v32/b3v32temp.c index 8a9ced017..612b2789d 100644 --- a/src/spicelib/devices/bsim3v32/b3v32temp.c +++ b/src/spicelib/devices/bsim3v32/b3v32temp.c @@ -211,7 +211,6 @@ int Size_Not_Found; for (here = model->BSIM3v32instances; here != NULL; here = here->BSIM3v32nextInstance) { - if (here->BSIM3v32owner != ARCHme) continue; pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim3v32/b3v32trunc.c b/src/spicelib/devices/bsim3v32/b3v32trunc.c index 8754f29a0..f37510761 100644 --- a/src/spicelib/devices/bsim3v32/b3v32trunc.c +++ b/src/spicelib/devices/bsim3v32/b3v32trunc.c @@ -30,8 +30,6 @@ BSIM3v32instance *here; { for (here = model->BSIM3v32instances; here != NULL; here = here->BSIM3v32nextInstance) { - if (here->BSIM3v32owner != ARCHme) - continue; #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim3v32/bsim3v32def.h b/src/spicelib/devices/bsim3v32/bsim3v32def.h index 726fc0c13..5c7e47919 100644 --- a/src/spicelib/devices/bsim3v32/bsim3v32def.h +++ b/src/spicelib/devices/bsim3v32/bsim3v32def.h @@ -21,7 +21,6 @@ typedef struct sBSIM3v32instance struct sBSIM3v32model *BSIM3v32modPtr; struct sBSIM3v32instance *BSIM3v32nextInstance; IFuid BSIM3v32name; - int BSIM3v32owner; /* number of owner process */ int BSIM3v32states; /* index into state table for this device */ int BSIM3v32dNode; int BSIM3v32gNode; diff --git a/src/spicelib/devices/bsim4/b4acld.c b/src/spicelib/devices/bsim4/b4acld.c index 6cf2631f9..ca363e394 100644 --- a/src/spicelib/devices/bsim4/b4acld.c +++ b/src/spicelib/devices/bsim4/b4acld.c @@ -61,7 +61,6 @@ double m; { for (here = model->BSIM4instances; here!= NULL; here = here->BSIM4nextInstance) { - if (here->BSIM4owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4capbd; capbs = here->BSIM4capbs; diff --git a/src/spicelib/devices/bsim4/b4cvtest.c b/src/spicelib/devices/bsim4/b4cvtest.c index 95fae3a7f..4a21c43f8 100644 --- a/src/spicelib/devices/bsim4/b4cvtest.c +++ b/src/spicelib/devices/bsim4/b4cvtest.c @@ -45,7 +45,6 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6; { for (here = model->BSIM4instances; here != NULL ; here=here->BSIM4nextInstance) { - if (here->BSIM4owner != ARCHme) continue; vds = model->BSIM4type * (*(ckt->CKTrhsOld + here->BSIM4dNodePrime) - *(ckt->CKTrhsOld + here->BSIM4sNodePrime)); diff --git a/src/spicelib/devices/bsim4/b4getic.c b/src/spicelib/devices/bsim4/b4getic.c index a37cd7cc6..437a0de13 100644 --- a/src/spicelib/devices/bsim4/b4getic.c +++ b/src/spicelib/devices/bsim4/b4getic.c @@ -28,7 +28,6 @@ BSIM4instance *here; for (; model ; model = model->BSIM4nextModel) { for (here = model->BSIM4instances; here; here = here->BSIM4nextInstance) { - if (here->BSIM4owner != ARCHme) continue; if (!here->BSIM4icVDSGiven) { here->BSIM4icVDS = *(ckt->CKTrhs + here->BSIM4dNode) - *(ckt->CKTrhs + here->BSIM4sNode); diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c index be0f7bf93..3a9c89ee5 100644 --- a/src/spicelib/devices/bsim4/b4ld.c +++ b/src/spicelib/devices/bsim4/b4ld.c @@ -255,7 +255,6 @@ for (; model != NULL; model = model->BSIM4nextModel) { for (here = model->BSIM4instances; here != NULL; here = here->BSIM4nextInstance) { - if (here->BSIM4owner != ARCHme) continue; #endif Check = Check1 = Check2 = 1; diff --git a/src/spicelib/devices/bsim4/b4pzld.c b/src/spicelib/devices/bsim4/b4pzld.c index 270f1d2f2..7307bf081 100644 --- a/src/spicelib/devices/bsim4/b4pzld.c +++ b/src/spicelib/devices/bsim4/b4pzld.c @@ -56,7 +56,6 @@ double m; { for (here = model->BSIM4instances; here!= NULL; here = here->BSIM4nextInstance) { - if (here->BSIM4owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4capbd; capbs = here->BSIM4capbs; diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c index 2a18d59df..6393f22a6 100644 --- a/src/spicelib/devices/bsim4/b4set.c +++ b/src/spicelib/devices/bsim4/b4set.c @@ -2176,11 +2176,9 @@ BSIM4instance **InstArray; for (here = model->BSIM4instances; here != NULL ; here=here->BSIM4nextInstance) { - if (here->BSIM4owner == ARCHme) { /* allocate a chunk of the state vector */ here->BSIM4states = *states; *states += BSIM4numStates; - } /* perform the parameter defaulting */ if (!here->BSIM4lGiven) here->BSIM4l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c index 02cfc878d..7d8be7196 100644 --- a/src/spicelib/devices/bsim4/b4temp.c +++ b/src/spicelib/devices/bsim4/b4temp.c @@ -409,7 +409,6 @@ int Size_Not_Found, i; for (here = model->BSIM4instances; here != NULL; here = here->BSIM4nextInstance) { - if (here->BSIM4owner != ARCHme) continue; pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim4/b4trunc.c b/src/spicelib/devices/bsim4/b4trunc.c index c48756862..aa107ca0b 100644 --- a/src/spicelib/devices/bsim4/b4trunc.c +++ b/src/spicelib/devices/bsim4/b4trunc.c @@ -34,7 +34,6 @@ BSIM4instance *here; { for (here = model->BSIM4instances; here != NULL; here = here->BSIM4nextInstance) { - if (here->BSIM4owner != ARCHme) continue; #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim4/bsim4def.h b/src/spicelib/devices/bsim4/bsim4def.h index 3e36a0e74..5f1cbec06 100644 --- a/src/spicelib/devices/bsim4/bsim4def.h +++ b/src/spicelib/devices/bsim4/bsim4def.h @@ -33,7 +33,6 @@ typedef struct sBSIM4instance struct sBSIM4model *BSIM4modPtr; struct sBSIM4instance *BSIM4nextInstance; IFuid BSIM4name; - int BSIM4owner; /* Number of owner process */ int BSIM4states; /* index into state table for this device */ int BSIM4dNode; int BSIM4gNodeExt; diff --git a/src/spicelib/devices/bsim4v4/b4v4acld.c b/src/spicelib/devices/bsim4v4/b4v4acld.c index f87d1b67b..2d528511b 100644 --- a/src/spicelib/devices/bsim4v4/b4v4acld.c +++ b/src/spicelib/devices/bsim4v4/b4v4acld.c @@ -59,7 +59,6 @@ double m; { for (here = model->BSIM4v4instances; here!= NULL; here = here->BSIM4v4nextInstance) { - if (here->BSIM4v4owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4v4capbd; capbs = here->BSIM4v4capbs; diff --git a/src/spicelib/devices/bsim4v4/b4v4cvtest.c b/src/spicelib/devices/bsim4v4/b4v4cvtest.c index 5b7bdf13c..2b0c4669e 100644 --- a/src/spicelib/devices/bsim4v4/b4v4cvtest.c +++ b/src/spicelib/devices/bsim4v4/b4v4cvtest.c @@ -43,7 +43,6 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6; { for (here = model->BSIM4v4instances; here != NULL ; here=here->BSIM4v4nextInstance) { - if (here->BSIM4v4owner != ARCHme) continue; vds = model->BSIM4v4type * (*(ckt->CKTrhsOld + here->BSIM4v4dNodePrime) - *(ckt->CKTrhsOld + here->BSIM4v4sNodePrime)); diff --git a/src/spicelib/devices/bsim4v4/b4v4getic.c b/src/spicelib/devices/bsim4v4/b4v4getic.c index 28c6b5bb6..0b6088dd8 100644 --- a/src/spicelib/devices/bsim4v4/b4v4getic.c +++ b/src/spicelib/devices/bsim4v4/b4v4getic.c @@ -26,7 +26,6 @@ BSIM4v4instance *here; for (; model ; model = model->BSIM4v4nextModel) { for (here = model->BSIM4v4instances; here; here = here->BSIM4v4nextInstance) { - if (here->BSIM4v4owner != ARCHme) continue; if (!here->BSIM4v4icVDSGiven) { here->BSIM4v4icVDS = *(ckt->CKTrhs + here->BSIM4v4dNode) - *(ckt->CKTrhs + here->BSIM4v4sNode); diff --git a/src/spicelib/devices/bsim4v4/b4v4ld.c b/src/spicelib/devices/bsim4v4/b4v4ld.c index b2e8974e1..3759bc9a3 100644 --- a/src/spicelib/devices/bsim4v4/b4v4ld.c +++ b/src/spicelib/devices/bsim4v4/b4v4ld.c @@ -209,7 +209,6 @@ for (; model != NULL; model = model->BSIM4v4nextModel) { for (here = model->BSIM4v4instances; here != NULL; here = here->BSIM4v4nextInstance) { - if (here->BSIM4v4owner != ARCHme) continue; Check = Check1 = Check2 = 1; ByPass = 0; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim4v4/b4v4pzld.c b/src/spicelib/devices/bsim4v4/b4v4pzld.c index 81bc0adc3..47bb363d4 100644 --- a/src/spicelib/devices/bsim4v4/b4v4pzld.c +++ b/src/spicelib/devices/bsim4v4/b4v4pzld.c @@ -54,7 +54,6 @@ double m; { for (here = model->BSIM4v4instances; here!= NULL; here = here->BSIM4v4nextInstance) { - if (here->BSIM4v4owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4v4capbd; capbs = here->BSIM4v4capbs; diff --git a/src/spicelib/devices/bsim4v4/b4v4set.c b/src/spicelib/devices/bsim4v4/b4v4set.c index dcc8552d3..eed0c8dcf 100644 --- a/src/spicelib/devices/bsim4v4/b4v4set.c +++ b/src/spicelib/devices/bsim4v4/b4v4set.c @@ -1627,10 +1627,8 @@ JOB *job; for (here = model->BSIM4v4instances; here != NULL ; here=here->BSIM4v4nextInstance) { /* allocate a chunk of the state vector */ - if ( here->BSIM4v4owner == ARCHme) { here->BSIM4v4states = *states; *states += BSIM4v4numStates; - } /* perform the parameter defaulting */ if (!here->BSIM4v4lGiven) here->BSIM4v4l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4v4/b4v4temp.c b/src/spicelib/devices/bsim4v4/b4v4temp.c index 066478513..e0a0dd30a 100644 --- a/src/spicelib/devices/bsim4v4/b4v4temp.c +++ b/src/spicelib/devices/bsim4v4/b4v4temp.c @@ -344,7 +344,6 @@ int Size_Not_Found, i; for (here = model->BSIM4v4instances; here != NULL; here = here->BSIM4v4nextInstance) { - if (here->BSIM4v4owner != ARCHme) continue; pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim4v4/b4v4trunc.c b/src/spicelib/devices/bsim4v4/b4v4trunc.c index 8fea5c41e..77acc3c35 100644 --- a/src/spicelib/devices/bsim4v4/b4v4trunc.c +++ b/src/spicelib/devices/bsim4v4/b4v4trunc.c @@ -31,7 +31,6 @@ BSIM4v4instance *here; { for (here = model->BSIM4v4instances; here != NULL; here = here->BSIM4v4nextInstance) { - if (here->BSIM4v4owner != ARCHme) continue; #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim4v4/bsim4v4def.h b/src/spicelib/devices/bsim4v4/bsim4v4def.h index a0c763c0d..8e37d2d6e 100644 --- a/src/spicelib/devices/bsim4v4/bsim4v4def.h +++ b/src/spicelib/devices/bsim4v4/bsim4v4def.h @@ -22,7 +22,6 @@ typedef struct sBSIM4v4instance struct sBSIM4v4model *BSIM4v4modPtr; struct sBSIM4v4instance *BSIM4v4nextInstance; IFuid BSIM4v4name; - int BSIM4v4owner; /* Number of owner process */ int BSIM4v4states; /* index into state table for this device */ int BSIM4v4dNode; int BSIM4v4gNodeExt; diff --git a/src/spicelib/devices/bsim4v5/b4v5acld.c b/src/spicelib/devices/bsim4v5/b4v5acld.c index 03ddf2b3f..76fa8e5b0 100644 --- a/src/spicelib/devices/bsim4v5/b4v5acld.c +++ b/src/spicelib/devices/bsim4v5/b4v5acld.c @@ -59,7 +59,6 @@ double m; { for (here = model->BSIM4v5instances; here!= NULL; here = here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4v5capbd; capbs = here->BSIM4v5capbs; diff --git a/src/spicelib/devices/bsim4v5/b4v5cvtest.c b/src/spicelib/devices/bsim4v5/b4v5cvtest.c index cbe467a4b..fb11c324e 100644 --- a/src/spicelib/devices/bsim4v5/b4v5cvtest.c +++ b/src/spicelib/devices/bsim4v5/b4v5cvtest.c @@ -43,7 +43,6 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6; { for (here = model->BSIM4v5instances; here != NULL ; here=here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner != ARCHme) continue; vds = model->BSIM4v5type * (*(ckt->CKTrhsOld + here->BSIM4v5dNodePrime) - *(ckt->CKTrhsOld + here->BSIM4v5sNodePrime)); diff --git a/src/spicelib/devices/bsim4v5/b4v5getic.c b/src/spicelib/devices/bsim4v5/b4v5getic.c index 033b317ca..62cfaaafc 100644 --- a/src/spicelib/devices/bsim4v5/b4v5getic.c +++ b/src/spicelib/devices/bsim4v5/b4v5getic.c @@ -26,7 +26,6 @@ BSIM4v5instance *here; for (; model ; model = model->BSIM4v5nextModel) { for (here = model->BSIM4v5instances; here; here = here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner != ARCHme) continue; if (!here->BSIM4v5icVDSGiven) { here->BSIM4v5icVDS = *(ckt->CKTrhs + here->BSIM4v5dNode) - *(ckt->CKTrhs + here->BSIM4v5sNode); diff --git a/src/spicelib/devices/bsim4v5/b4v5ld.c b/src/spicelib/devices/bsim4v5/b4v5ld.c index 924e3140b..cdb8bf55f 100644 --- a/src/spicelib/devices/bsim4v5/b4v5ld.c +++ b/src/spicelib/devices/bsim4v5/b4v5ld.c @@ -210,7 +210,6 @@ for (; model != NULL; model = model->BSIM4v5nextModel) { for (here = model->BSIM4v5instances; here != NULL; here = here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner != ARCHme) continue; Check = Check1 = Check2 = 1; ByPass = 0; pParam = here->pParam; diff --git a/src/spicelib/devices/bsim4v5/b4v5pzld.c b/src/spicelib/devices/bsim4v5/b4v5pzld.c index f344e894e..c75586bde 100644 --- a/src/spicelib/devices/bsim4v5/b4v5pzld.c +++ b/src/spicelib/devices/bsim4v5/b4v5pzld.c @@ -54,7 +54,6 @@ double m; { for (here = model->BSIM4v5instances; here!= NULL; here = here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4v5capbd; capbs = here->BSIM4v5capbs; diff --git a/src/spicelib/devices/bsim4v5/b4v5set.c b/src/spicelib/devices/bsim4v5/b4v5set.c index 9c9524a91..2d371e3c4 100644 --- a/src/spicelib/devices/bsim4v5/b4v5set.c +++ b/src/spicelib/devices/bsim4v5/b4v5set.c @@ -1654,11 +1654,9 @@ JOB *job; for (here = model->BSIM4v5instances; here != NULL ; here=here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner == ARCHme) { /* allocate a chunk of the state vector */ here->BSIM4v5states = *states; *states += BSIM4v5numStates; - } /* perform the parameter defaulting */ if (!here->BSIM4v5lGiven) here->BSIM4v5l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4v5/b4v5temp.c b/src/spicelib/devices/bsim4v5/b4v5temp.c index 5a3edee5f..c2d7c8503 100644 --- a/src/spicelib/devices/bsim4v5/b4v5temp.c +++ b/src/spicelib/devices/bsim4v5/b4v5temp.c @@ -340,7 +340,6 @@ int Size_Not_Found, i; for (here = model->BSIM4v5instances; here != NULL; here = here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner != ARCHme) continue; pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim4v5/b4v5trunc.c b/src/spicelib/devices/bsim4v5/b4v5trunc.c index 65908dc7d..69322af1c 100644 --- a/src/spicelib/devices/bsim4v5/b4v5trunc.c +++ b/src/spicelib/devices/bsim4v5/b4v5trunc.c @@ -32,7 +32,6 @@ BSIM4v5instance *here; { for (here = model->BSIM4v5instances; here != NULL; here = here->BSIM4v5nextInstance) { - if (here->BSIM4v5owner != ARCHme) continue; #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim4v5/bsim4v5def.h b/src/spicelib/devices/bsim4v5/bsim4v5def.h index c8a10b7d4..a44504518 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5def.h +++ b/src/spicelib/devices/bsim4v5/bsim4v5def.h @@ -23,7 +23,6 @@ typedef struct sBSIM4v5instance struct sBSIM4v5model *BSIM4v5modPtr; struct sBSIM4v5instance *BSIM4v5nextInstance; IFuid BSIM4v5name; - int BSIM4v5owner; /* Number of owner process */ int BSIM4v5states; /* index into state table for this device */ int BSIM4v5dNode; int BSIM4v5gNodeExt; diff --git a/src/spicelib/devices/bsim4v6/b4v6acld.c b/src/spicelib/devices/bsim4v6/b4v6acld.c index 8f3a8303f..c23be59d9 100644 --- a/src/spicelib/devices/bsim4v6/b4v6acld.c +++ b/src/spicelib/devices/bsim4v6/b4v6acld.c @@ -61,7 +61,6 @@ double m; { for (here = model->BSIM4v6instances; here!= NULL; here = here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4v6capbd; capbs = here->BSIM4v6capbs; diff --git a/src/spicelib/devices/bsim4v6/b4v6cvtest.c b/src/spicelib/devices/bsim4v6/b4v6cvtest.c index 4d5d98391..0dd071292 100644 --- a/src/spicelib/devices/bsim4v6/b4v6cvtest.c +++ b/src/spicelib/devices/bsim4v6/b4v6cvtest.c @@ -45,7 +45,6 @@ double tol0, tol1, tol2, tol3, tol4, tol5, tol6; { for (here = model->BSIM4v6instances; here != NULL ; here=here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner != ARCHme) continue; vds = model->BSIM4v6type * (*(ckt->CKTrhsOld + here->BSIM4v6dNodePrime) - *(ckt->CKTrhsOld + here->BSIM4v6sNodePrime)); diff --git a/src/spicelib/devices/bsim4v6/b4v6getic.c b/src/spicelib/devices/bsim4v6/b4v6getic.c index 7ae7aef0f..c218763b4 100644 --- a/src/spicelib/devices/bsim4v6/b4v6getic.c +++ b/src/spicelib/devices/bsim4v6/b4v6getic.c @@ -28,7 +28,6 @@ BSIM4v6instance *here; for (; model ; model = model->BSIM4v6nextModel) { for (here = model->BSIM4v6instances; here; here = here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner != ARCHme) continue; if (!here->BSIM4v6icVDSGiven) { here->BSIM4v6icVDS = *(ckt->CKTrhs + here->BSIM4v6dNode) - *(ckt->CKTrhs + here->BSIM4v6sNode); diff --git a/src/spicelib/devices/bsim4v6/b4v6ld.c b/src/spicelib/devices/bsim4v6/b4v6ld.c index a92d6e3fb..d76c64fcc 100644 --- a/src/spicelib/devices/bsim4v6/b4v6ld.c +++ b/src/spicelib/devices/bsim4v6/b4v6ld.c @@ -255,7 +255,6 @@ for (; model != NULL; model = model->BSIM4v6nextModel) { for (here = model->BSIM4v6instances; here != NULL; here = here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner != ARCHme) continue; #endif Check = Check1 = Check2 = 1; diff --git a/src/spicelib/devices/bsim4v6/b4v6pzld.c b/src/spicelib/devices/bsim4v6/b4v6pzld.c index 818f1a461..bdf9d5769 100644 --- a/src/spicelib/devices/bsim4v6/b4v6pzld.c +++ b/src/spicelib/devices/bsim4v6/b4v6pzld.c @@ -56,7 +56,6 @@ double m; { for (here = model->BSIM4v6instances; here!= NULL; here = here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner != ARCHme) continue; pParam = here->pParam; capbd = here->BSIM4v6capbd; capbs = here->BSIM4v6capbs; diff --git a/src/spicelib/devices/bsim4v6/b4v6set.c b/src/spicelib/devices/bsim4v6/b4v6set.c index acb5cdc61..062471b89 100644 --- a/src/spicelib/devices/bsim4v6/b4v6set.c +++ b/src/spicelib/devices/bsim4v6/b4v6set.c @@ -2025,11 +2025,9 @@ BSIM4v6instance **InstArray; for (here = model->BSIM4v6instances; here != NULL ; here=here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner == ARCHme) { /* allocate a chunk of the state vector */ here->BSIM4v6states = *states; *states += BSIM4v6numStates; - } /* perform the parameter defaulting */ if (!here->BSIM4v6lGiven) here->BSIM4v6l = 5.0e-6; diff --git a/src/spicelib/devices/bsim4v6/b4v6temp.c b/src/spicelib/devices/bsim4v6/b4v6temp.c index 62c9a7172..fa07f9174 100644 --- a/src/spicelib/devices/bsim4v6/b4v6temp.c +++ b/src/spicelib/devices/bsim4v6/b4v6temp.c @@ -388,7 +388,6 @@ int Size_Not_Found, i; for (here = model->BSIM4v6instances; here != NULL; here = here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner != ARCHme) continue; pSizeDependParamKnot = model->pSizeDependParamKnot; Size_Not_Found = 1; while ((pSizeDependParamKnot != NULL) && Size_Not_Found) diff --git a/src/spicelib/devices/bsim4v6/b4v6trunc.c b/src/spicelib/devices/bsim4v6/b4v6trunc.c index 23e5ac67a..27d928ba3 100644 --- a/src/spicelib/devices/bsim4v6/b4v6trunc.c +++ b/src/spicelib/devices/bsim4v6/b4v6trunc.c @@ -34,7 +34,6 @@ BSIM4v6instance *here; { for (here = model->BSIM4v6instances; here != NULL; here = here->BSIM4v6nextInstance) { - if (here->BSIM4v6owner != ARCHme) continue; #ifdef STEPDEBUG debugtemp = *timeStep; #endif /* STEPDEBUG */ diff --git a/src/spicelib/devices/bsim4v6/bsim4v6def.h b/src/spicelib/devices/bsim4v6/bsim4v6def.h index 7d84e24dc..5961b14a3 100644 --- a/src/spicelib/devices/bsim4v6/bsim4v6def.h +++ b/src/spicelib/devices/bsim4v6/bsim4v6def.h @@ -32,7 +32,6 @@ typedef struct sBSIM4v6instance struct sBSIM4v6model *BSIM4v6modPtr; struct sBSIM4v6instance *BSIM4v6nextInstance; IFuid BSIM4v6name; - int BSIM4v6owner; /* Number of owner process */ int BSIM4v6states; /* index into state table for this device */ int BSIM4v6dNode; int BSIM4v6gNodeExt; diff --git a/src/spicelib/devices/cap/capacld.c b/src/spicelib/devices/cap/capacld.c index 1a38f5879..4c1598f96 100644 --- a/src/spicelib/devices/cap/capacld.c +++ b/src/spicelib/devices/cap/capacld.c @@ -25,8 +25,6 @@ CAPacLoad(GENmodel *inModel, CKTcircuit *ckt) for( here = model->CAPinstances;here != NULL; here = here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; - m = here -> CAPm; val = ckt->CKTomega * here->CAPcapac; diff --git a/src/spicelib/devices/cap/capdefs.h b/src/spicelib/devices/cap/capdefs.h index f2be8ed93..321460c59 100644 --- a/src/spicelib/devices/cap/capdefs.h +++ b/src/spicelib/devices/cap/capdefs.h @@ -23,7 +23,6 @@ typedef struct sCAPinstance { struct sCAPinstance *CAPnextInstance; /* pointer to next instance of * current model*/ IFuid CAPname; /* pointer to character string naming this instance */ - int CAPowner; /* number of owner process */ int CAPstate; /* pointer to start of capacitor state vector */ int CAPposNode; /* number of positive node of capacitor */ int CAPnegNode; /* number of negative node of capacitor */ diff --git a/src/spicelib/devices/cap/capgetic.c b/src/spicelib/devices/cap/capgetic.c index 6c35fc74b..5a537508f 100644 --- a/src/spicelib/devices/cap/capgetic.c +++ b/src/spicelib/devices/cap/capgetic.c @@ -24,7 +24,6 @@ CAPgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->CAPnextModel) { for(here = model->CAPinstances; here ; here = here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; if(!here->CAPicGiven) { here->CAPinitCond = diff --git a/src/spicelib/devices/cap/capload.c b/src/spicelib/devices/cap/capload.c index a38009b90..e80b1179a 100644 --- a/src/spicelib/devices/cap/capload.c +++ b/src/spicelib/devices/cap/capload.c @@ -40,8 +40,6 @@ CAPload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - - if (here->CAPowner != ARCHme) continue; m = here->CAPm; diff --git a/src/spicelib/devices/cap/cappzld.c b/src/spicelib/devices/cap/cappzld.c index 3ff776f66..dbccd97c6 100644 --- a/src/spicelib/devices/cap/cappzld.c +++ b/src/spicelib/devices/cap/cappzld.c @@ -29,8 +29,6 @@ CAPpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->CAPnextModel) { for( here = model->CAPinstances;here != NULL; here = here->CAPnextInstance) { - - if (here->CAPowner != ARCHme) continue; val = here->CAPcapac; m = here->CAPm; diff --git a/src/spicelib/devices/cap/capsacl.c b/src/spicelib/devices/cap/capsacl.c index 2607b6f9c..159b8b247 100644 --- a/src/spicelib/devices/cap/capsacl.c +++ b/src/spicelib/devices/cap/capsacl.c @@ -36,7 +36,6 @@ CAPsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; if(here->CAPsenParmNo){ vcap = *(ckt->CKTrhsOld+here->CAPposNode) - diff --git a/src/spicelib/devices/cap/capsetup.c b/src/spicelib/devices/cap/capsetup.c index 70b714066..dea2a6e3a 100644 --- a/src/spicelib/devices/cap/capsetup.c +++ b/src/spicelib/devices/cap/capsetup.c @@ -78,7 +78,6 @@ CAPsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - if (here->CAPowner != ARCHme) goto matrixpointers; /* Default Value Processing for Capacitor Instance */ if (!here->CAPlengthGiven) { @@ -97,7 +96,6 @@ if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ return(E_NOMEM);\ } -matrixpointers: TSTALLOC(CAPposPosptr,CAPposNode,CAPposNode) TSTALLOC(CAPnegNegptr,CAPnegNode,CAPnegNode) TSTALLOC(CAPposNegptr,CAPposNode,CAPnegNode) diff --git a/src/spicelib/devices/cap/capsload.c b/src/spicelib/devices/cap/capsload.c index a8bcb4592..ca536c484 100644 --- a/src/spicelib/devices/cap/capsload.c +++ b/src/spicelib/devices/cap/capsload.c @@ -57,8 +57,6 @@ CAPsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; - #ifdef SENSDEBUG printf("senload instance name %s\n",here->CAPname); diff --git a/src/spicelib/devices/cap/capsprt.c b/src/spicelib/devices/cap/capsprt.c index 038bcf8e2..f22d3e428 100644 --- a/src/spicelib/devices/cap/capsprt.c +++ b/src/spicelib/devices/cap/capsprt.c @@ -35,8 +35,6 @@ CAPsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; - printf(" Instance name:%s\n",here->CAPname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/cap/capsset.c b/src/spicelib/devices/cap/capsset.c index 9a8b1d8f7..de001149e 100644 --- a/src/spicelib/devices/cap/capsset.c +++ b/src/spicelib/devices/cap/capsset.c @@ -33,7 +33,6 @@ CAPsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; if(here->CAPsenParmNo){ here->CAPsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/cap/capsupd.c b/src/spicelib/devices/cap/capsupd.c index 8c074a855..64085d655 100644 --- a/src/spicelib/devices/cap/capsupd.c +++ b/src/spicelib/devices/cap/capsupd.c @@ -45,7 +45,6 @@ CAPsUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; vcap = *(ckt->CKTrhsOld+here->CAPposNode) - *(ckt->CKTrhsOld+here->CAPnegNode) ; diff --git a/src/spicelib/devices/cap/captemp.c b/src/spicelib/devices/cap/captemp.c index 26c4627fe..03f196461 100644 --- a/src/spicelib/devices/cap/captemp.c +++ b/src/spicelib/devices/cap/captemp.c @@ -33,7 +33,6 @@ CAPtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CAPinstances; here != NULL ; here=here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; /* Default Value Processing for Capacitor Instance */ if(!here->CAPtempGiven) { diff --git a/src/spicelib/devices/cap/captrunc.c b/src/spicelib/devices/cap/captrunc.c index 359244151..add70b94a 100644 --- a/src/spicelib/devices/cap/captrunc.c +++ b/src/spicelib/devices/cap/captrunc.c @@ -22,7 +22,6 @@ CAPtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model!= NULL; model = model->CAPnextModel) { for(here = model->CAPinstances ; here != NULL ; here = here->CAPnextInstance) { - if (here->CAPowner != ARCHme) continue; CKTterr(here->CAPqcap,ckt,timeStep); } diff --git a/src/spicelib/devices/cccs/cccsdefs.h b/src/spicelib/devices/cccs/cccsdefs.h index 42c701e47..57e573871 100644 --- a/src/spicelib/devices/cccs/cccsdefs.h +++ b/src/spicelib/devices/cccs/cccsdefs.h @@ -20,7 +20,6 @@ typedef struct sCCCSinstance { struct sCCCSinstance *CCCSnextInstance; /* pointer to next instance of *current model*/ IFuid CCCSname; /* pointer to character string naming this instance */ - int CCCSowner; /* number of owner process */ int CCCSstate; /* not used */ int CCCSposNode; /* number of positive node of source */ diff --git a/src/spicelib/devices/cccs/cccsload.c b/src/spicelib/devices/cccs/cccsload.c index 1df666e2a..f84f582a2 100644 --- a/src/spicelib/devices/cccs/cccsload.c +++ b/src/spicelib/devices/cccs/cccsload.c @@ -31,7 +31,6 @@ CCCSload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - if (here->CCCSowner != ARCHme) continue; *(here->CCCSposContBrptr) += here->CCCScoeff ; *(here->CCCSnegContBrptr) -= here->CCCScoeff ; diff --git a/src/spicelib/devices/cccs/cccspzld.c b/src/spicelib/devices/cccs/cccspzld.c index 71bf31c9f..9bcc4faba 100644 --- a/src/spicelib/devices/cccs/cccspzld.c +++ b/src/spicelib/devices/cccs/cccspzld.c @@ -33,7 +33,6 @@ CCCSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - if (here->CCCSowner != ARCHme) continue; *(here->CCCSposContBrptr) += here->CCCScoeff ; *(here->CCCSnegContBrptr) -= here->CCCScoeff ; diff --git a/src/spicelib/devices/cccs/cccssacl.c b/src/spicelib/devices/cccs/cccssacl.c index 7910ea611..44e8213db 100644 --- a/src/spicelib/devices/cccs/cccssacl.c +++ b/src/spicelib/devices/cccs/cccssacl.c @@ -31,7 +31,6 @@ CCCSsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - if (here->CCCSowner != ARCHme) continue; if(here->CCCSsenParmNo){ diff --git a/src/spicelib/devices/cccs/cccssprt.c b/src/spicelib/devices/cccs/cccssprt.c index 325f73006..2fc0f5e1f 100644 --- a/src/spicelib/devices/cccs/cccssprt.c +++ b/src/spicelib/devices/cccs/cccssprt.c @@ -32,7 +32,6 @@ CCCSsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - if (here->CCCSowner != ARCHme) continue; printf(" Instance name:%s\n",here->CCCSname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/cccs/cccssset.c b/src/spicelib/devices/cccs/cccssset.c index 8fe1bb2c0..9e33c98c9 100644 --- a/src/spicelib/devices/cccs/cccssset.c +++ b/src/spicelib/devices/cccs/cccssset.c @@ -29,7 +29,6 @@ CCCSsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->CCCSinstances; here != NULL ; here=here->CCCSnextInstance) { - if (here->CCCSowner != ARCHme) continue; if(here->CCCSsenParmNo){ here->CCCSsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/ccvs/ccvsdefs.h b/src/spicelib/devices/ccvs/ccvsdefs.h index 5b7914715..da53ef271 100644 --- a/src/spicelib/devices/ccvs/ccvsdefs.h +++ b/src/spicelib/devices/ccvs/ccvsdefs.h @@ -20,7 +20,6 @@ typedef struct sCCVSinstance { struct sCCVSinstance *CCVSnextInstance; /* pointer to next instance of *current model*/ IFuid CCVSname; /* pointer to character string naming this instance */ - int CCVSowner; /* number of owner process */ int CCVSstate; /* not used */ int CCVSposNode; /* number of positive node of source */ diff --git a/src/spicelib/devices/ccvs/ccvsload.c b/src/spicelib/devices/ccvs/ccvsload.c index 9988a80a7..1c101f81b 100644 --- a/src/spicelib/devices/ccvs/ccvsload.c +++ b/src/spicelib/devices/ccvs/ccvsload.c @@ -31,7 +31,6 @@ CCVSload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCVSinstances; here != NULL ; here=here->CCVSnextInstance) { - if (here->CCVSowner != ARCHme) continue; *(here->CCVSposIbrptr) += 1.0 ; *(here->CCVSnegIbrptr) -= 1.0 ; diff --git a/src/spicelib/devices/ccvs/ccvspzld.c b/src/spicelib/devices/ccvs/ccvspzld.c index 911d8ce91..d44a77c55 100644 --- a/src/spicelib/devices/ccvs/ccvspzld.c +++ b/src/spicelib/devices/ccvs/ccvspzld.c @@ -33,7 +33,6 @@ CCVSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->CCVSinstances; here != NULL ; here=here->CCVSnextInstance) { - if (here->CCVSowner != ARCHme) continue; *(here->CCVSposIbrptr) += 1.0 ; *(here->CCVSnegIbrptr) -= 1.0 ; diff --git a/src/spicelib/devices/ccvs/ccvssacl.c b/src/spicelib/devices/ccvs/ccvssacl.c index aec68b067..29e73313a 100644 --- a/src/spicelib/devices/ccvs/ccvssacl.c +++ b/src/spicelib/devices/ccvs/ccvssacl.c @@ -29,7 +29,6 @@ CCVSsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCVSinstances; here != NULL ; here=here->CCVSnextInstance) { - if (here->CCVSowner != ARCHme) continue; if(here->CCVSsenParmNo){ ic = *(ckt->CKTrhsOld + here->CCVScontBranch); diff --git a/src/spicelib/devices/ccvs/ccvssld.c b/src/spicelib/devices/ccvs/ccvssld.c index 41b2256ee..30ea7c12a 100644 --- a/src/spicelib/devices/ccvs/ccvssld.c +++ b/src/spicelib/devices/ccvs/ccvssld.c @@ -29,7 +29,6 @@ CCVSsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCVSinstances; here != NULL ; here=here->CCVSnextInstance) { - if (here->CCVSowner != ARCHme) continue; if(here->CCVSsenParmNo){ ic = *(ckt->CKTrhsOld + here->CCVScontBranch); diff --git a/src/spicelib/devices/ccvs/ccvssprt.c b/src/spicelib/devices/ccvs/ccvssprt.c index a5bd12b4b..0daece589 100644 --- a/src/spicelib/devices/ccvs/ccvssprt.c +++ b/src/spicelib/devices/ccvs/ccvssprt.c @@ -31,7 +31,6 @@ CCVSsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CCVSinstances; here != NULL ; here=here->CCVSnextInstance) { - if (here->CCVSowner != ARCHme) continue; printf(" Instance name:%s\n",here->CCVSname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/ccvs/ccvssset.c b/src/spicelib/devices/ccvs/ccvssset.c index 036fd104f..d0a26c504 100644 --- a/src/spicelib/devices/ccvs/ccvssset.c +++ b/src/spicelib/devices/ccvs/ccvssset.c @@ -28,7 +28,6 @@ CCVSsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->CCVSinstances; here != NULL ; here=here->CCVSnextInstance) { - if (here->CCVSowner != ARCHme) continue; if(here->CCVSsenParmNo){ here->CCVSsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/cktask.c b/src/spicelib/devices/cktask.c index b4e45b19c..4394ce0b1 100644 --- a/src/spicelib/devices/cktask.c +++ b/src/spicelib/devices/cktask.c @@ -19,10 +19,6 @@ CKTask(CKTcircuit *ckt, GENinstance *instance, int which, IFvalue *value, IFvalu { int type = instance->GENmodPtr->GENmodType; int error; -#ifdef PARALLEL_ARCH - long msgtype, length; - long from = instance->GENowner; -#endif /* PARALLEL_ARCH */ SPICEdev **DEVices; DEVices = devices(); @@ -32,14 +28,6 @@ CKTask(CKTcircuit *ckt, GENinstance *instance, int which, IFvalue *value, IFvalu } else { error = E_BADPARM; } -#ifdef PARALLEL_ARCH - msgtype = MT_ASK; - length = sizeof(IFvalue); - BRDCST_(&msgtype, (char *)value, &length, &from); - msgtype++; - length = sizeof(int); - BRDCST_(&msgtype, (char *)&error, &length, &from); -#endif /* PARALLEL_ARCH */ if (error && ft_stricterror) { fprintf(stderr, "\nError: %s\n", errMsg); controlled_exit(EXIT_BAD); diff --git a/src/spicelib/devices/cpl/cpldefs.h b/src/spicelib/devices/cpl/cpldefs.h index 0541c6410..ab5bc792b 100644 --- a/src/spicelib/devices/cpl/cpldefs.h +++ b/src/spicelib/devices/cpl/cpldefs.h @@ -21,7 +21,6 @@ typedef struct sCPLinstance { * current model*/ IFuid CPLname; /* pointer to character string naming this instance */ - int CPLowner; /* number of owner process */ int CPLstate; /* not used */ int *CPLposNodes; diff --git a/src/spicelib/devices/csw/cswacld.c b/src/spicelib/devices/csw/cswacld.c index 8800204a1..48d3a6055 100644 --- a/src/spicelib/devices/csw/cswacld.c +++ b/src/spicelib/devices/csw/cswacld.c @@ -31,7 +31,6 @@ CSWacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CSWinstances; here != NULL ; here=here->CSWnextInstance) { - if (here->CSWowner != ARCHme) continue; current_state = (int)*(ckt->CKTstate0 + here->CSWstate); diff --git a/src/spicelib/devices/csw/cswdefs.h b/src/spicelib/devices/csw/cswdefs.h index cdc8422c7..c976a9b1b 100644 --- a/src/spicelib/devices/csw/cswdefs.h +++ b/src/spicelib/devices/csw/cswdefs.h @@ -23,7 +23,6 @@ typedef struct sCSWinstance { struct sCSWinstance *CSWnextInstance; /* pointer to next instance of * current model*/ IFuid CSWname; /* pointer to character string naming this instance */ - int CSWowner; /* number of owner process */ int CSWstate; /* pointer to start of switch's section of state vector */ int CSWposNode; /* number of positive node of switch */ diff --git a/src/spicelib/devices/csw/cswload.c b/src/spicelib/devices/csw/cswload.c index 954dcab1f..d7e8531d4 100644 --- a/src/spicelib/devices/csw/cswload.c +++ b/src/spicelib/devices/csw/cswload.c @@ -36,8 +36,6 @@ CSWload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->CSWinstances; here != NULL ; here=here->CSWnextInstance) { - - if (here->CSWowner != ARCHme) continue; old_current_state = *(ckt->CKTstates[0] + here->CSWstate); previous_state = *(ckt->CKTstates[1] + here->CSWstate); diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c index c912aa4db..db7188b5d 100644 --- a/src/spicelib/devices/csw/cswnoise.c +++ b/src/spicelib/devices/csw/cswnoise.c @@ -39,7 +39,6 @@ CSWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d for (model=firstModel; model != NULL; model=model->CSWnextModel) { for (inst=model->CSWinstances; inst != NULL; inst=inst->CSWnextInstance) { - if (inst->CSWowner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/csw/cswpzld.c b/src/spicelib/devices/csw/cswpzld.c index 1e650ce31..2f98c1e99 100644 --- a/src/spicelib/devices/csw/cswpzld.c +++ b/src/spicelib/devices/csw/cswpzld.c @@ -35,7 +35,6 @@ CSWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->CSWinstances; here != NULL ; here=here->CSWnextInstance) { - if (here->CSWowner != ARCHme) continue; current_state = (int)*(ckt->CKTstate0 + here->CSWstate); diff --git a/src/spicelib/devices/csw/cswsetup.c b/src/spicelib/devices/csw/cswsetup.c index 25c308b8f..f2fd38fa5 100644 --- a/src/spicelib/devices/csw/cswsetup.c +++ b/src/spicelib/devices/csw/cswsetup.c @@ -43,13 +43,11 @@ CSWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->CSWinstances; here != NULL ; here=here->CSWnextInstance) { - if (here->CSWowner != ARCHme) goto matrixpointers; /* Default Value Processing for Switch Instance */ here->CSWstate = *states; *states += CSW_NUM_STATES; -matrixpointers: here->CSWcontBranch = CKTfndBranch(ckt,here->CSWcontName); if(here->CSWcontBranch == 0) { IFuid namarray[2]; diff --git a/src/spicelib/devices/dio/dioacld.c b/src/spicelib/devices/dio/dioacld.c index 87e954f03..9adfa80b7 100644 --- a/src/spicelib/devices/dio/dioacld.c +++ b/src/spicelib/devices/dio/dioacld.c @@ -28,7 +28,6 @@ DIOacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; gspr=here->DIOtConductance*here->DIOarea; geq= *(ckt->CKTstate0 + here->DIOconduct); xceq= *(ckt->CKTstate0 + here->DIOcapCurrent) * ckt->CKTomega; diff --git a/src/spicelib/devices/dio/dioconv.c b/src/spicelib/devices/dio/dioconv.c index 6de3f6f23..faf84aae5 100644 --- a/src/spicelib/devices/dio/dioconv.c +++ b/src/spicelib/devices/dio/dioconv.c @@ -27,7 +27,6 @@ DIOconvTest(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; /* * initialization diff --git a/src/spicelib/devices/dio/diodefs.h b/src/spicelib/devices/dio/diodefs.h index b88b70f53..2ea4cd4ac 100644 --- a/src/spicelib/devices/dio/diodefs.h +++ b/src/spicelib/devices/dio/diodefs.h @@ -22,7 +22,6 @@ typedef struct sDIOinstance { struct sDIOinstance *DIOnextInstance; /* pointer to next instance of * current model*/ IFuid DIOname; /* pointer to character string naming this instance */ - int DIOowner; /* number of owner process */ int DIOstate; /* pointer to start of state vector for diode */ int DIOposNode; /* number of positive node of diode */ int DIOnegNode; /* number of negative node of diode */ diff --git a/src/spicelib/devices/dio/diodisto.c b/src/spicelib/devices/dio/diodisto.c index b05f08c67..a0eed3f05 100644 --- a/src/spicelib/devices/dio/diodisto.c +++ b/src/spicelib/devices/dio/diodisto.c @@ -42,7 +42,6 @@ for( ; model != NULL; model = model->DIOnextModel ) { /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; /* loading starts here */ diff --git a/src/spicelib/devices/dio/diodset.c b/src/spicelib/devices/dio/diodset.c index 42c0c6c0b..ccf288d16 100644 --- a/src/spicelib/devices/dio/diodset.c +++ b/src/spicelib/devices/dio/diodset.c @@ -50,7 +50,6 @@ DIOdSetup(DIOmodel *model, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; /* * this routine loads diodes for dc and transient analyses. diff --git a/src/spicelib/devices/dio/diogetic.c b/src/spicelib/devices/dio/diogetic.c index 3f18ba0be..f2c4ef0dc 100644 --- a/src/spicelib/devices/dio/diogetic.c +++ b/src/spicelib/devices/dio/diogetic.c @@ -24,7 +24,6 @@ DIOgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->DIOnextModel) { for(here = model->DIOinstances; here ; here = here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; if(!here->DIOinitCondGiven) { here->DIOinitCond = diff --git a/src/spicelib/devices/dio/dioload.c b/src/spicelib/devices/dio/dioload.c index 6369603b0..801de12da 100644 --- a/src/spicelib/devices/dio/dioload.c +++ b/src/spicelib/devices/dio/dioload.c @@ -67,7 +67,6 @@ DIOload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; /* * this routine loads diodes for dc and transient analyses. diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c index 299969370..54611d8b9 100644 --- a/src/spicelib/devices/dio/dionoise.c +++ b/src/spicelib/devices/dio/dionoise.c @@ -49,7 +49,6 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->DIOnextModel) { for (inst=model->DIOinstances; inst != NULL; inst=inst->DIOnextInstance) { - if (inst->DIOowner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/dio/diopzld.c b/src/spicelib/devices/dio/diopzld.c index 5ac1313d6..317009fa8 100644 --- a/src/spicelib/devices/dio/diopzld.c +++ b/src/spicelib/devices/dio/diopzld.c @@ -29,7 +29,6 @@ DIOpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; gspr=here->DIOtConductance*here->DIOarea; geq= *(ckt->CKTstate0 + here->DIOconduct); xceq= *(ckt->CKTstate0 + here->DIOcapCurrent); diff --git a/src/spicelib/devices/dio/diosacl.c b/src/spicelib/devices/dio/diosacl.c index a9259b4e3..9ad2c6778 100644 --- a/src/spicelib/devices/dio/diosacl.c +++ b/src/spicelib/devices/dio/diosacl.c @@ -77,7 +77,6 @@ DIOsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; /* save the unperturbed values in the state vector */ for(i=0; i <= 4; i++) { diff --git a/src/spicelib/devices/dio/diosetup.c b/src/spicelib/devices/dio/diosetup.c index 9ab1155af..8f39b2933 100644 --- a/src/spicelib/devices/dio/diosetup.c +++ b/src/spicelib/devices/dio/diosetup.c @@ -157,7 +157,6 @@ DIOsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) goto matrixpointers; if(!here->DIOareaGiven) { if((!here->DIOwGiven) && (!here->DIOlGiven)) { @@ -196,7 +195,6 @@ DIOsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) *states += 2 * (ckt->CKTsenInfo->SENparms); } -matrixpointers: if(model->DIOresist == 0) { here->DIOposPrimeNode = here->DIOposNode; diff --git a/src/spicelib/devices/dio/diosload.c b/src/spicelib/devices/dio/diosload.c index e7570af70..032358dc7 100644 --- a/src/spicelib/devices/dio/diosload.c +++ b/src/spicelib/devices/dio/diosload.c @@ -68,7 +68,6 @@ DIOsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; #ifdef SENSDEBUG fprintf(file,"pos = %d , posprm = %d ,neg = %d, senparmno = %d\n", diff --git a/src/spicelib/devices/dio/diosprt.c b/src/spicelib/devices/dio/diosprt.c index 696ce8814..00bac9aa4 100644 --- a/src/spicelib/devices/dio/diosprt.c +++ b/src/spicelib/devices/dio/diosprt.c @@ -34,7 +34,6 @@ DIOsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; printf(" Instance name:%s\n",here->DIOname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/dio/diosset.c b/src/spicelib/devices/dio/diosset.c index d6b6766cd..e6e4b22c5 100644 --- a/src/spicelib/devices/dio/diosset.c +++ b/src/spicelib/devices/dio/diosset.c @@ -31,7 +31,6 @@ DIOsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; if(here->DIOsenParmNo){ here->DIOsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/dio/diosupd.c b/src/spicelib/devices/dio/diosupd.c index 6edd0daf1..a251196c9 100644 --- a/src/spicelib/devices/dio/diosupd.c +++ b/src/spicelib/devices/dio/diosupd.c @@ -47,7 +47,6 @@ DIOsUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->DIOinstances; here != NULL ; here=here->DIOnextInstance) { - if (here->DIOowner != ARCHme) continue; #ifdef SENSDEBUG printf("capd = %.7e \n",here->DIOcap); diff --git a/src/spicelib/devices/dio/diotemp.c b/src/spicelib/devices/dio/diotemp.c index 49214aba5..bdd233f3e 100644 --- a/src/spicelib/devices/dio/diotemp.c +++ b/src/spicelib/devices/dio/diotemp.c @@ -82,8 +82,6 @@ DIOtemp(GENmodel *inModel, CKTcircuit *ckt) double fact2,pbfact,arg,egfet,gmanew,gmaSWnew; /* loop through all the instances */ - if (here->DIOowner != ARCHme) continue; - if(!here->DIOdtempGiven) here->DIOdtemp = 0.0; if(!here->DIOtempGiven) diff --git a/src/spicelib/devices/dio/diotrunc.c b/src/spicelib/devices/dio/diotrunc.c index 564e4a1fa..c61954e36 100644 --- a/src/spicelib/devices/dio/diotrunc.c +++ b/src/spicelib/devices/dio/diotrunc.c @@ -20,7 +20,6 @@ DIOtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->DIOnextModel) { for(here=model->DIOinstances;here!=NULL;here = here->DIOnextInstance){ - if (here->DIOowner != ARCHme) continue; CKTterr(here->DIOcapCharge,ckt,timeStep); } } diff --git a/src/spicelib/devices/hfet1/hfetacl.c b/src/spicelib/devices/hfet1/hfetacl.c index 24d9ca865..781f4822a 100644 --- a/src/spicelib/devices/hfet1/hfetacl.c +++ b/src/spicelib/devices/hfet1/hfetacl.c @@ -33,8 +33,6 @@ HFETAacLoad(GENmodel *inModel, CKTcircuit *ckt) for( here = model->HFETAinstances; here != NULL; here = here->HFETAnextInstance) { - if (here->HFETAowner != ARCHme) continue; - gm = *(ckt->CKTstate0 + here->HFETAgm); gds = *(ckt->CKTstate0 + here->HFETAgds); xds = CDS*ckt->CKTomega; diff --git a/src/spicelib/devices/hfet1/hfetdefs.h b/src/spicelib/devices/hfet1/hfetdefs.h index 27d519667..f5563712d 100644 --- a/src/spicelib/devices/hfet1/hfetdefs.h +++ b/src/spicelib/devices/hfet1/hfetdefs.h @@ -18,7 +18,6 @@ typedef struct sHFETAinstance { struct sHFETAmodel *HFETAmodPtr; struct sHFETAinstance *HFETAnextInstance; IFuid HFETAname; - int HFETAowner; /* number of owner process */ int HFETAstate; /* index into state table for this device */ int HFETAdrainNode; diff --git a/src/spicelib/devices/hfet1/hfetgetic.c b/src/spicelib/devices/hfet1/hfetgetic.c index a11ae76ef..2397cea03 100644 --- a/src/spicelib/devices/hfet1/hfetgetic.c +++ b/src/spicelib/devices/hfet1/hfetgetic.c @@ -22,7 +22,6 @@ HFETAgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->HFETAnextModel) { for(here = model->HFETAinstances; here ; here = here->HFETAnextInstance) { - if (here->HFETAowner != ARCHme) continue; if(!here->HFETAicVDSGiven) { here->HFETAicVDS = diff --git a/src/spicelib/devices/hfet1/hfetload.c b/src/spicelib/devices/hfet1/hfetload.c index 6d1930806..5222fa995 100644 --- a/src/spicelib/devices/hfet1/hfetload.c +++ b/src/spicelib/devices/hfet1/hfetload.c @@ -89,9 +89,6 @@ int HFETAload(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->HFETAnextModel ) { for (here = model->HFETAinstances; here != NULL ; here=here->HFETAnextInstance) { - - if (here->HFETAowner != ARCHme) continue; - vcrit = here->HFETAvcrit; vt = CONSTKoverQ * here->HFETAtemp; diff --git a/src/spicelib/devices/hfet1/hfetpzl.c b/src/spicelib/devices/hfet1/hfetpzl.c index 5ed6a8900..2bbae145d 100644 --- a/src/spicelib/devices/hfet1/hfetpzl.c +++ b/src/spicelib/devices/hfet1/hfetpzl.c @@ -36,8 +36,6 @@ HFETApzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( here = model->HFETAinstances; here != NULL; here = here->HFETAnextInstance) { - if (here->HFETAowner != ARCHme) continue; - gm = *(ckt->CKTstate0 + here->HFETAgm); gds = *(ckt->CKTstate0 + here->HFETAgds); xds = CDS*ckt->CKTomega; diff --git a/src/spicelib/devices/hfet1/hfetsetup.c b/src/spicelib/devices/hfet1/hfetsetup.c index addf6848b..26c0174a4 100644 --- a/src/spicelib/devices/hfet1/hfetsetup.c +++ b/src/spicelib/devices/hfet1/hfetsetup.c @@ -231,8 +231,6 @@ HFETAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->HFETAinstances; here != NULL ; here=here->HFETAnextInstance) { - - if (here->HFETAowner != ARCHme) goto matrixpointers; if(!here->HFETAlengthGiven) { here->HFETAlength = 1e-6; @@ -248,7 +246,6 @@ HFETAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* *states += 24; */ *states += HFETAnumStates; -matrixpointers: if(model->HFETArs != 0) { if(here->HFETAsourcePrimeNode == 0) { error = CKTmkVolt(ckt,&tmp,here->HFETAname,"source"); diff --git a/src/spicelib/devices/hfet1/hfettemp.c b/src/spicelib/devices/hfet1/hfettemp.c index 8822d9154..613d440cc 100644 --- a/src/spicelib/devices/hfet1/hfettemp.c +++ b/src/spicelib/devices/hfet1/hfettemp.c @@ -58,7 +58,6 @@ HFETAtemp(GENmodel *inModel, CKTcircuit *ckt) for (here = model->HFETAinstances; here != NULL ; here=here->HFETAnextInstance) { - if (here->HFETAowner != ARCHme) continue; if(!here->HFETAdtempGiven) { here->HFETAdtemp = 0.0; diff --git a/src/spicelib/devices/hfet1/hfettrunc.c b/src/spicelib/devices/hfet1/hfettrunc.c index 3d0eee5ae..afa39dc5f 100644 --- a/src/spicelib/devices/hfet1/hfettrunc.c +++ b/src/spicelib/devices/hfet1/hfettrunc.c @@ -18,7 +18,6 @@ HFETAtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->HFETAnextModel) { for(here=model->HFETAinstances;here!=NULL;here = here->HFETAnextInstance){ - if (here->HFETAowner != ARCHme) continue; CKTterr(here->HFETAqgs,ckt,timeStep); CKTterr(here->HFETAqgd,ckt,timeStep); diff --git a/src/spicelib/devices/hfet2/hfet2acl.c b/src/spicelib/devices/hfet2/hfet2acl.c index 0089a6ee0..ec4151b8e 100644 --- a/src/spicelib/devices/hfet2/hfet2acl.c +++ b/src/spicelib/devices/hfet2/hfet2acl.c @@ -31,8 +31,6 @@ int HFET2acLoad(GENmodel *inModel, CKTcircuit *ckt) for( here = model->HFET2instances; here != NULL; here = here->HFET2nextInstance) { - if (here->HFET2owner != ARCHme) continue; - m = here->HFET2m; gdpr=model->HFET2drainConduct; diff --git a/src/spicelib/devices/hfet2/hfet2defs.h b/src/spicelib/devices/hfet2/hfet2defs.h index 4d9ec1333..6edeff4aa 100644 --- a/src/spicelib/devices/hfet2/hfet2defs.h +++ b/src/spicelib/devices/hfet2/hfet2defs.h @@ -13,7 +13,6 @@ typedef struct sHFET2instance { struct sHFET2model *HFET2modPtr; struct sHFET2instance *HFET2nextInstance; IFuid HFET2name; - int HFET2owner; /* number of owner process */ int HFET2state; /* index into state table for this device */ int HFET2drainNode; diff --git a/src/spicelib/devices/hfet2/hfet2getic.c b/src/spicelib/devices/hfet2/hfet2getic.c index 893dd788f..6622953c1 100644 --- a/src/spicelib/devices/hfet2/hfet2getic.c +++ b/src/spicelib/devices/hfet2/hfet2getic.c @@ -18,7 +18,6 @@ int HFET2getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->HFET2nextModel) { for(here = model->HFET2instances; here ; here = here->HFET2nextInstance) { - if (here->HFET2owner != ARCHme) continue; if(!here->HFET2icVDSGiven) { here->HFET2icVDS = *(ckt->CKTrhs + here->HFET2drainNode) - diff --git a/src/spicelib/devices/hfet2/hfet2load.c b/src/spicelib/devices/hfet2/hfet2load.c index 2d917b515..b6b9a7eca 100644 --- a/src/spicelib/devices/hfet2/hfet2load.c +++ b/src/spicelib/devices/hfet2/hfet2load.c @@ -68,8 +68,6 @@ int HFET2load(GENmodel *inModel, CKTcircuit *ckt) for(here = model->HFET2instances; here != NULL; here=here->HFET2nextInstance) { - if (here->HFET2owner != ARCHme) continue; - gdpr = model->HFET2drainConduct; gspr = model->HFET2sourceConduct; vcrit = VCRIT; diff --git a/src/spicelib/devices/hfet2/hfet2pzl.c b/src/spicelib/devices/hfet2/hfet2pzl.c index 518685048..10e5c6dc9 100644 --- a/src/spicelib/devices/hfet2/hfet2pzl.c +++ b/src/spicelib/devices/hfet2/hfet2pzl.c @@ -33,8 +33,6 @@ int HFET2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( here = model->HFET2instances; here != NULL; here = here->HFET2nextInstance) { - if (here->HFET2owner != ARCHme) continue; - m = here->HFET2m; gdpr=model->HFET2drainConduct; diff --git a/src/spicelib/devices/hfet2/hfet2setup.c b/src/spicelib/devices/hfet2/hfet2setup.c index 0aadb4e1e..72bf46852 100644 --- a/src/spicelib/devices/hfet2/hfet2setup.c +++ b/src/spicelib/devices/hfet2/hfet2setup.c @@ -125,8 +125,6 @@ int HFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state CKTnode *tmpNode; IFuid tmpName; - - if (here->HFET2owner != ARCHme) goto matrixpointers; here->HFET2state = *states; *states += 13; @@ -138,7 +136,6 @@ int HFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state if(!here->HFET2mGiven) here->HFET2m = 1.0; -matrixpointers: if(model->HFET2rs != 0) { if(here->HFET2sourcePrimeNode == 0) { error = CKTmkVolt(ckt,&tmp,here->HFET2name,"source"); diff --git a/src/spicelib/devices/hfet2/hfet2temp.c b/src/spicelib/devices/hfet2/hfet2temp.c index e262001f4..0e9d8b2a0 100644 --- a/src/spicelib/devices/hfet2/hfet2temp.c +++ b/src/spicelib/devices/hfet2/hfet2temp.c @@ -38,8 +38,6 @@ CKTcircuit *ckt) DELTA2 = DELTA*DELTA; for (here = model->HFET2instances; here != NULL; here=here->HFET2nextInstance) { - - if (here->HFET2owner != ARCHme) continue; if(!here->HFET2dtempGiven) here->HFET2dtemp = 0.0; diff --git a/src/spicelib/devices/hfet2/hfet2trunc.c b/src/spicelib/devices/hfet2/hfet2trunc.c index 4256699c3..aa7d0bfd6 100644 --- a/src/spicelib/devices/hfet2/hfet2trunc.c +++ b/src/spicelib/devices/hfet2/hfet2trunc.c @@ -1,4 +1,3 @@ - #include "ngspice/ngspice.h" #include #include "ngspice/cktdefs.h" @@ -19,8 +18,6 @@ double *tiHFET2tep) for( ; model != NULL; model = model->HFET2nextModel) { for(here=model->HFET2instances;here!=NULL; here = here->HFET2nextInstance){ - - if (here->HFET2owner != ARCHme) continue; CKTterr(here->HFET2qgs,ckt,tiHFET2tep); CKTterr(here->HFET2qgd,ckt,tiHFET2tep); diff --git a/src/spicelib/devices/hisim2/hsm2def.h b/src/spicelib/devices/hisim2/hsm2def.h index 9ed114208..7b9ccb204 100644 --- a/src/spicelib/devices/hisim2/hsm2def.h +++ b/src/spicelib/devices/hisim2/hsm2def.h @@ -104,7 +104,6 @@ typedef struct sHSM2instance { struct sHSM2instance *HSM2nextInstance; /* pointer to next instance of current model*/ IFuid HSM2name; /* pointer to character string naming this instance */ - int HSM2owner; /* number of owner process (ngspice specific !) */ int HSM2states; /* index into state table for this device */ int HSM2dNode; /* number of the drain node of the mosfet */ diff --git a/src/spicelib/devices/hisimhv/hsmhvdef.h b/src/spicelib/devices/hisimhv/hsmhvdef.h index db8c63c47..38786608e 100644 --- a/src/spicelib/devices/hisimhv/hsmhvdef.h +++ b/src/spicelib/devices/hisimhv/hsmhvdef.h @@ -217,7 +217,6 @@ typedef struct sHSMHVinstance { struct sHSMHVinstance *HSMHVnextInstance; /* pointer to next instance of current model*/ IFuid HSMHVname; /* pointer to character string naming this instance */ - int HSMHVowner; /* number of owner process (ngspice specific !) */ int HSMHVstates; /* index into state table for this device */ int HSMHVdNode; /* number of the drain node of the mosfet */ diff --git a/src/spicelib/devices/ind/indacld.c b/src/spicelib/devices/ind/indacld.c index a0819a346..5ab7f769f 100644 --- a/src/spicelib/devices/ind/indacld.c +++ b/src/spicelib/devices/ind/indacld.c @@ -22,8 +22,6 @@ INDacLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->INDnextModel) { for( here = model->INDinstances;here != NULL; here = here->INDnextInstance) { - - if (here->INDowner != ARCHme) continue; val = ckt->CKTomega * here->INDinduct; diff --git a/src/spicelib/devices/ind/inddefs.h b/src/spicelib/devices/ind/inddefs.h index 64211507b..86c65a497 100644 --- a/src/spicelib/devices/ind/inddefs.h +++ b/src/spicelib/devices/ind/inddefs.h @@ -25,7 +25,6 @@ typedef struct sINDinstance { struct sINDinstance *INDnextInstance; /* pointer to next instance of * current model*/ IFuid INDname; /* pointer to character string naming this instance */ - int INDowner; /* number of owner process */ int INDstate; /* pointer to beginning of state vector for inductor */ int INDposNode; /* number of positive node of inductor */ int INDnegNode; /* number of negative node of inductor */ @@ -113,7 +112,6 @@ typedef struct sMUTinstance { struct sMUTinstance *MUTnextInstance; /* pointer to next instance of * current model*/ IFuid MUTname; /* pointer to character string naming this instance */ - int MUTowner; /* number of owner process */ double MUTcoupling; /* mutual inductance input by user */ double MUTfactor; /* mutual inductance scaled for internal use */ IFuid MUTindName1; /* name of coupled inductor 1 */ diff --git a/src/spicelib/devices/ind/indload.c b/src/spicelib/devices/ind/indload.c index 0d6c951e2..9ee8574a6 100644 --- a/src/spicelib/devices/ind/indload.c +++ b/src/spicelib/devices/ind/indload.c @@ -36,8 +36,6 @@ INDload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - - if (here->INDowner != ARCHme) continue; if(!(ckt->CKTmode & (MODEDC|MODEINITPRED))) { if(ckt->CKTmode & MODEUIC && ckt->CKTmode & MODEINITTRAN) { @@ -59,8 +57,6 @@ INDload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (muthere = mutmodel->MUTinstances; muthere != NULL ; muthere=muthere->MUTnextInstance) { - - if (muthere->MUTowner != ARCHme) continue; if(!(ckt->CKTmode& (MODEDC|MODEINITPRED))) { *(ckt->CKTstate0 + muthere->MUTind1->INDflux) += @@ -84,7 +80,6 @@ INDload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; #endif /*MUTUAL*/ if(ckt->CKTmode & MODEDC) { diff --git a/src/spicelib/devices/ind/indpzld.c b/src/spicelib/devices/ind/indpzld.c index db5c5175f..2248b6f48 100644 --- a/src/spicelib/devices/ind/indpzld.c +++ b/src/spicelib/devices/ind/indpzld.c @@ -26,8 +26,6 @@ INDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->INDnextModel) { for( here = model->INDinstances;here != NULL; here = here->INDnextInstance) { - - if (here->INDowner != ARCHme) continue; val = here->INDinduct; diff --git a/src/spicelib/devices/ind/indsetup.c b/src/spicelib/devices/ind/indsetup.c index 5e75ac5da..e46808b6f 100644 --- a/src/spicelib/devices/ind/indsetup.c +++ b/src/spicelib/devices/ind/indsetup.c @@ -74,7 +74,6 @@ INDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) goto matrixpointers; here->INDflux = *states; *states += 2 ; @@ -82,7 +81,6 @@ INDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) *states += 2 * (ckt->CKTsenInfo->SENparms); } -matrixpointers: if(here->INDbrEq == 0) { error = CKTmkCur(ckt,&tmp,here->INDname,"branch"); if(error) return(error); diff --git a/src/spicelib/devices/ind/indsload.c b/src/spicelib/devices/ind/indsload.c index a86455247..3a8e1c4ac 100644 --- a/src/spicelib/devices/ind/indsload.c +++ b/src/spicelib/devices/ind/indsload.c @@ -64,7 +64,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; #ifdef MUTUAL } @@ -77,7 +76,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (muthere = mutmodel->MUTinstances; muthere != NULL ; muthere=muthere->MUTnextInstance) { - if (muthere->MUTowner != ARCHme) continue; if(muthere->MUTsenParmNo || muthere->MUTind1->INDsenParmNo || @@ -123,7 +121,6 @@ INDsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; #endif /* MUTUAL */ cind = *(ckt->CKTrhsOld + here->INDbrEq); diff --git a/src/spicelib/devices/ind/indsprt.c b/src/spicelib/devices/ind/indsprt.c index 77fff908f..1d4fe5a84 100644 --- a/src/spicelib/devices/ind/indsprt.c +++ b/src/spicelib/devices/ind/indsprt.c @@ -31,7 +31,6 @@ INDsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; printf(" Instance name:%s\n",here->INDname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/ind/indsset.c b/src/spicelib/devices/ind/indsset.c index 9319d3615..7b2856da8 100644 --- a/src/spicelib/devices/ind/indsset.c +++ b/src/spicelib/devices/ind/indsset.c @@ -28,7 +28,6 @@ INDsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; if(here->INDsenParmNo){ here->INDsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/ind/indsupd.c b/src/spicelib/devices/ind/indsupd.c index af5e73da4..8ebddb552 100644 --- a/src/spicelib/devices/ind/indsupd.c +++ b/src/spicelib/devices/ind/indsupd.c @@ -48,7 +48,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; for(iparmno = 1;iparmno<=info->SENparms;iparmno++){ diff --git a/src/spicelib/devices/ind/indtemp.c b/src/spicelib/devices/ind/indtemp.c index b5dca819e..5201d5df5 100644 --- a/src/spicelib/devices/ind/indtemp.c +++ b/src/spicelib/devices/ind/indtemp.c @@ -28,7 +28,6 @@ INDtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->INDinstances; here != NULL ; here=here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; /* Default Value Processing for Inductor Instance */ diff --git a/src/spicelib/devices/ind/indtrunc.c b/src/spicelib/devices/ind/indtrunc.c index 0958bb5c8..7d42cd895 100644 --- a/src/spicelib/devices/ind/indtrunc.c +++ b/src/spicelib/devices/ind/indtrunc.c @@ -20,7 +20,6 @@ INDtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model!= NULL; model = model->INDnextModel) { for(here = model->INDinstances ; here != NULL ; here = here->INDnextInstance) { - if (here->INDowner != ARCHme) continue; CKTterr(here->INDflux,ckt,timeStep); } diff --git a/src/spicelib/devices/ind/mutacld.c b/src/spicelib/devices/ind/mutacld.c index 4b4bda3ca..367eae234 100644 --- a/src/spicelib/devices/ind/mutacld.c +++ b/src/spicelib/devices/ind/mutacld.c @@ -23,7 +23,6 @@ MUTacLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MUTnextModel) { for( here = model->MUTinstances;here != NULL; here = here->MUTnextInstance) { - if (here->MUTowner != ARCHme) continue; val = ckt->CKTomega * here->MUTfactor; *(here->MUTbr1br2 +1) -= val; diff --git a/src/spicelib/devices/ind/mutpzld.c b/src/spicelib/devices/ind/mutpzld.c index 6787ce015..be1c2eece 100644 --- a/src/spicelib/devices/ind/mutpzld.c +++ b/src/spicelib/devices/ind/mutpzld.c @@ -27,7 +27,6 @@ MUTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->MUTnextModel) { for( here = model->MUTinstances;here != NULL; here = here->MUTnextInstance) { - if (here->MUTowner != ARCHme) continue; val = here->MUTfactor; *(here->MUTbr1br2 ) -= val * s->real; diff --git a/src/spicelib/devices/ind/mutsprt.c b/src/spicelib/devices/ind/mutsprt.c index ad87de892..629f91db7 100644 --- a/src/spicelib/devices/ind/mutsprt.c +++ b/src/spicelib/devices/ind/mutsprt.c @@ -36,7 +36,6 @@ MUTsPrint(GENmodel *inModel, CKTcircuit* ckt) /* loop through all the instances of the model */ for (here = model->MUTinstances; here != NULL ; here=here->MUTnextInstance) { - if (here->MUTowner != ARCHme) continue; printf(" Instance name:%s\n",here->MUTname); printf(" Mutual Inductance: %g ",here->MUTcoupling); diff --git a/src/spicelib/devices/ind/mutsset.c b/src/spicelib/devices/ind/mutsset.c index 6f41935fc..d65cfaa2d 100644 --- a/src/spicelib/devices/ind/mutsset.c +++ b/src/spicelib/devices/ind/mutsset.c @@ -31,7 +31,6 @@ MUTsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->MUTinstances; here != NULL ; here=here->MUTnextInstance) { - if (here->MUTowner != ARCHme) continue; if(here->MUTsenParmNo){ here->MUTsenParmNo = ++(info->SENparms); @@ -43,4 +42,3 @@ MUTsSetup(SENstruct *info, GENmodel *inModel) return(OK); } #endif /* MUTUAL */ - diff --git a/src/spicelib/devices/ind/muttemp.c b/src/spicelib/devices/ind/muttemp.c index a4eceaf47..f0909700e 100644 --- a/src/spicelib/devices/ind/muttemp.c +++ b/src/spicelib/devices/ind/muttemp.c @@ -29,7 +29,6 @@ MUTtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MUTinstances; here != NULL ; here=here->MUTnextInstance) { - if (here->MUTowner != ARCHme) continue; /* Value Processing for mutual inductors */ @@ -45,4 +44,3 @@ MUTtemp(GENmodel *inModel, CKTcircuit *ckt) } return(OK); } - diff --git a/src/spicelib/devices/isrc/isrcacld.c b/src/spicelib/devices/isrc/isrcacld.c index 743c80761..5e2ba34be 100644 --- a/src/spicelib/devices/isrc/isrcacld.c +++ b/src/spicelib/devices/isrc/isrcacld.c @@ -21,7 +21,6 @@ ISRCacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->ISRCinstances; here != NULL ; here=here->ISRCnextInstance) { - if (here->ISRCowner != ARCHme) continue; *(ckt->CKTrhs + (here->ISRCposNode)) += here->ISRCacReal; diff --git a/src/spicelib/devices/isrc/isrcdefs.h b/src/spicelib/devices/isrc/isrcdefs.h index a7f2c6472..53939074e 100644 --- a/src/spicelib/devices/isrc/isrcdefs.h +++ b/src/spicelib/devices/isrc/isrcdefs.h @@ -23,7 +23,6 @@ typedef struct sISRCinstance { struct sISRCinstance *ISRCnextInstance; /* pointer to next instance of *current model */ IFuid ISRCname; /* pointer to character string naming this instance */ - int ISRCowner; /* number of owner process */ int ISRCstate; /* not used */ int ISRCnegNode; /* number of negative node of source */ diff --git a/src/spicelib/devices/isrc/isrcload.c b/src/spicelib/devices/isrc/isrcload.c index d1067708d..e6811fe38 100644 --- a/src/spicelib/devices/isrc/isrcload.c +++ b/src/spicelib/devices/isrc/isrcload.c @@ -35,7 +35,6 @@ ISRCload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->ISRCinstances; here != NULL ; here=here->ISRCnextInstance) { - if (here->ISRCowner != ARCHme) continue; if( (ckt->CKTmode & (MODEDCOP | MODEDCTRANCURVE)) && here->ISRCdcGiven ) { diff --git a/src/spicelib/devices/isrc/isrctemp.c b/src/spicelib/devices/isrc/isrctemp.c index 9734223c5..0bae229ec 100644 --- a/src/spicelib/devices/isrc/isrctemp.c +++ b/src/spicelib/devices/isrc/isrctemp.c @@ -28,7 +28,6 @@ ISRCtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->ISRCinstances; here != NULL ; here=here->ISRCnextInstance) { - if (here->ISRCowner != ARCHme) continue; if(here->ISRCacGiven && !here->ISRCacMGiven) { here->ISRCacMag = 1; diff --git a/src/spicelib/devices/jfet/jfetacld.c b/src/spicelib/devices/jfet/jfetacld.c index a8d5983bb..390757f44 100644 --- a/src/spicelib/devices/jfet/jfetacld.c +++ b/src/spicelib/devices/jfet/jfetacld.c @@ -32,7 +32,6 @@ JFETacLoad(GENmodel *inModel, CKTcircuit *ckt) for( here = model->JFETinstances; here != NULL; here = here->JFETnextInstance) { - if (here->JFETowner != ARCHme) continue; gdpr=model->JFETdrainConduct * here->JFETarea; gspr=model->JFETsourceConduct * here->JFETarea; diff --git a/src/spicelib/devices/jfet/jfetdefs.h b/src/spicelib/devices/jfet/jfetdefs.h index a6ddda11d..9fdc95058 100644 --- a/src/spicelib/devices/jfet/jfetdefs.h +++ b/src/spicelib/devices/jfet/jfetdefs.h @@ -25,7 +25,6 @@ typedef struct sJFETinstance { struct sJFETinstance *JFETnextInstance; /* pointer to next instance of * current model*/ IFuid JFETname; /* pointer to character string naming this instance */ - int JFETowner; /* number of owner process */ int JFETstate; /* pointer to start of state vector for jfet */ int JFETdrainNode; /* number of drain node of jfet */ int JFETgateNode; /* number of gate node of jfet */ diff --git a/src/spicelib/devices/jfet/jfetdist.c b/src/spicelib/devices/jfet/jfetdist.c index 02db4a121..b9517a38b 100644 --- a/src/spicelib/devices/jfet/jfetdist.c +++ b/src/spicelib/devices/jfet/jfetdist.c @@ -45,7 +45,6 @@ for( ; model != NULL; model = model->JFETnextModel ) { /* loop through all the instances of the model */ for (here = model->JFETinstances; here != NULL ; here=here->JFETnextInstance) { - if (here->JFETowner != ARCHme) continue; /* loading starts here */ diff --git a/src/spicelib/devices/jfet/jfetdset.c b/src/spicelib/devices/jfet/jfetdset.c index 19e2ddbcb..f0393aa6e 100644 --- a/src/spicelib/devices/jfet/jfetdset.c +++ b/src/spicelib/devices/jfet/jfetdset.c @@ -73,7 +73,6 @@ JFETdSetup(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->JFETinstances; here != NULL ; here=here->JFETnextInstance) { - if (here->JFETowner != ARCHme) continue; /* * dc model parameters diff --git a/src/spicelib/devices/jfet/jfetic.c b/src/spicelib/devices/jfet/jfetic.c index 64d3347bd..30bc558fd 100644 --- a/src/spicelib/devices/jfet/jfetic.c +++ b/src/spicelib/devices/jfet/jfetic.c @@ -24,7 +24,6 @@ JFETgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->JFETnextModel) { for(here = model->JFETinstances; here ; here = here->JFETnextInstance) { - if (here->JFETowner != ARCHme) continue; if(!here->JFETicVDSGiven) { here->JFETicVDS = diff --git a/src/spicelib/devices/jfet/jfetload.c b/src/spicelib/devices/jfet/jfetload.c index 526b6b8cc..30d56ed00 100644 --- a/src/spicelib/devices/jfet/jfetload.c +++ b/src/spicelib/devices/jfet/jfetload.c @@ -85,7 +85,6 @@ JFETload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->JFETinstances; here != NULL ; here=here->JFETnextInstance) { - if (here->JFETowner != ARCHme) continue; /* * dc model parameters diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c index a158b705b..1a1eab20e 100644 --- a/src/spicelib/devices/jfet/jfetnoi.c +++ b/src/spicelib/devices/jfet/jfetnoi.c @@ -48,7 +48,6 @@ JFETnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * for (model=firstModel; model != NULL; model=model->JFETnextModel) { for (inst=model->JFETinstances; inst != NULL; inst=inst->JFETnextInstance) { - if (inst->JFETowner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/jfet/jfetpzld.c b/src/spicelib/devices/jfet/jfetpzld.c index d910e22ed..6c9b79fa4 100644 --- a/src/spicelib/devices/jfet/jfetpzld.c +++ b/src/spicelib/devices/jfet/jfetpzld.c @@ -33,7 +33,6 @@ JFETpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( here = model->JFETinstances; here != NULL; here = here->JFETnextInstance) { - if (here->JFETowner != ARCHme) continue; m = here->JFETm; diff --git a/src/spicelib/devices/jfet/jfetset.c b/src/spicelib/devices/jfet/jfetset.c index 66d3339a0..d4fd71b3e 100644 --- a/src/spicelib/devices/jfet/jfetset.c +++ b/src/spicelib/devices/jfet/jfetset.c @@ -89,7 +89,6 @@ JFETsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->JFETinstances; here != NULL ; here=here->JFETnextInstance) { - if (here->JFETowner != ARCHme) goto matrixpointers; if(!here->JFETareaGiven) { here->JFETarea = 1; @@ -100,7 +99,6 @@ JFETsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here->JFETstate = *states; *states += 13; -matrixpointers: if(model->JFETsourceResist != 0) { if(here->JFETsourcePrimeNode == 0) { error = CKTmkVolt(ckt,&tmp,here->JFETname,"source"); diff --git a/src/spicelib/devices/jfet/jfettemp.c b/src/spicelib/devices/jfet/jfettemp.c index 0f0d3e147..0bdaaa345 100644 --- a/src/spicelib/devices/jfet/jfettemp.c +++ b/src/spicelib/devices/jfet/jfettemp.c @@ -79,7 +79,6 @@ JFETtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->JFETinstances; here != NULL ; here=here->JFETnextInstance) { - if (here->JFETowner != ARCHme) continue; if(!(here->JFETdtempGiven)) { here->JFETdtemp = 0.0; diff --git a/src/spicelib/devices/jfet/jfettrun.c b/src/spicelib/devices/jfet/jfettrun.c index 592083759..e3259803e 100644 --- a/src/spicelib/devices/jfet/jfettrun.c +++ b/src/spicelib/devices/jfet/jfettrun.c @@ -20,7 +20,6 @@ JFETtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->JFETnextModel) { for(here=model->JFETinstances;here!=NULL;here = here->JFETnextInstance){ - if (here->JFETowner != ARCHme) continue; CKTterr(here->JFETqgs,ckt,timeStep); CKTterr(here->JFETqgd,ckt,timeStep); diff --git a/src/spicelib/devices/jfet2/jfet2acld.c b/src/spicelib/devices/jfet2/jfet2acld.c index 3044e16fe..0cb7bea2a 100644 --- a/src/spicelib/devices/jfet2/jfet2acld.c +++ b/src/spicelib/devices/jfet2/jfet2acld.c @@ -37,8 +37,6 @@ JFET2acLoad(GENmodel *inModel, CKTcircuit *ckt) for( here = model->JFET2instances; here != NULL; here = here->JFET2nextInstance) { - if (here->JFET2owner != ARCHme) continue; - gdpr=model->JFET2drainConduct * here->JFET2area; gspr=model->JFET2sourceConduct * here->JFET2area; gm= *(ckt->CKTstate0 + here->JFET2gm) ; diff --git a/src/spicelib/devices/jfet2/jfet2defs.h b/src/spicelib/devices/jfet2/jfet2defs.h index 56bf81c00..a50e02574 100644 --- a/src/spicelib/devices/jfet2/jfet2defs.h +++ b/src/spicelib/devices/jfet2/jfet2defs.h @@ -30,7 +30,6 @@ typedef struct sJFET2instance { struct sJFET2instance *JFET2nextInstance; /* pointer to next instance of * current model*/ IFuid JFET2name; /* pointer to character string naming this instance */ - int JFET2owner; /* number of owner process */ int JFET2state; /* pointer to start of state vector for jfet */ int JFET2drainNode; /* number of drain node of jfet */ int JFET2gateNode; /* number of gate node of jfet */ diff --git a/src/spicelib/devices/jfet2/jfet2ic.c b/src/spicelib/devices/jfet2/jfet2ic.c index 7a421d69a..35bd77418 100644 --- a/src/spicelib/devices/jfet2/jfet2ic.c +++ b/src/spicelib/devices/jfet2/jfet2ic.c @@ -28,7 +28,6 @@ JFET2getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->JFET2nextModel) { for(here = model->JFET2instances; here ; here = here->JFET2nextInstance) { - if (here->JFET2owner != ARCHme) continue; if(!here->JFET2icVDSGiven) { here->JFET2icVDS = *(ckt->CKTrhs + here->JFET2drainNode) - diff --git a/src/spicelib/devices/jfet2/jfet2load.c b/src/spicelib/devices/jfet2/jfet2load.c index b8dfb82d6..4f5d0b08a 100644 --- a/src/spicelib/devices/jfet2/jfet2load.c +++ b/src/spicelib/devices/jfet2/jfet2load.c @@ -65,7 +65,6 @@ JFET2load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->JFET2instances; here != NULL ; here=here->JFET2nextInstance) { - if (here->JFET2owner != ARCHme) continue; /* * dc model parameters */ diff --git a/src/spicelib/devices/jfet2/jfet2noi.c b/src/spicelib/devices/jfet2/jfet2noi.c index 22c5d6696..83f094356 100644 --- a/src/spicelib/devices/jfet2/jfet2noi.c +++ b/src/spicelib/devices/jfet2/jfet2noi.c @@ -53,7 +53,6 @@ JFET2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata for (model=firstModel; model != NULL; model=model->JFET2nextModel) { for (inst=model->JFET2instances; inst != NULL; inst=inst->JFET2nextInstance) { - if (inst->JFET2owner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/jfet2/jfet2set.c b/src/spicelib/devices/jfet2/jfet2set.c index f3dbe4446..a7b27793a 100644 --- a/src/spicelib/devices/jfet2/jfet2set.c +++ b/src/spicelib/devices/jfet2/jfet2set.c @@ -40,7 +40,6 @@ JFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->JFET2instances; here != NULL ; here=here->JFET2nextInstance) { - if (here->JFET2owner != ARCHme) goto matrixpointers2; if(!here->JFET2areaGiven) { here->JFET2area = 1; @@ -53,7 +52,6 @@ JFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here->JFET2state = *states; *states += JFET2_STATE_COUNT + 1; -matrixpointers2: if(model->JFET2rs != 0) { if(here->JFET2sourcePrimeNode == 0) { error = CKTmkVolt(ckt,&tmp,here->JFET2name,"source"); diff --git a/src/spicelib/devices/jfet2/jfet2temp.c b/src/spicelib/devices/jfet2/jfet2temp.c index ad78dcc96..5676c1de5 100644 --- a/src/spicelib/devices/jfet2/jfet2temp.c +++ b/src/spicelib/devices/jfet2/jfet2temp.c @@ -80,8 +80,6 @@ JFET2temp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->JFET2instances; here != NULL ; here=here->JFET2nextInstance) { - - if (here->JFET2owner != ARCHme) continue; if(!(here->JFET2dtempGiven)) { here->JFET2dtemp = 0.0; diff --git a/src/spicelib/devices/jfet2/jfet2trun.c b/src/spicelib/devices/jfet2/jfet2trun.c index 8320eb8fe..19f9c7813 100644 --- a/src/spicelib/devices/jfet2/jfet2trun.c +++ b/src/spicelib/devices/jfet2/jfet2trun.c @@ -24,7 +24,6 @@ JFET2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->JFET2nextModel) { for(here=model->JFET2instances;here!=NULL;here = here->JFET2nextInstance){ - if (here->JFET2owner != ARCHme) continue; CKTterr(here->JFET2qgs,ckt,timeStep); CKTterr(here->JFET2qgd,ckt,timeStep); diff --git a/src/spicelib/devices/ltra/ltraacct.c b/src/spicelib/devices/ltra/ltraacct.c index 86a92199a..4b96dcb8f 100644 --- a/src/spicelib/devices/ltra/ltraacct.c +++ b/src/spicelib/devices/ltra/ltraacct.c @@ -48,7 +48,6 @@ LTRAaccept(CKTcircuit *ckt, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->LTRAinstances; here != NULL; here = here->LTRAnextInstance) { - if (here->LTRAowner != ARCHme) continue; /* XXX */ if (ckt->CKTmode & MODEINITTRAN) { here->LTRAinstListSize = 10; diff --git a/src/spicelib/devices/ltra/ltraacld.c b/src/spicelib/devices/ltra/ltraacld.c index 50dcde7df..a1625f64f 100644 --- a/src/spicelib/devices/ltra/ltraacld.c +++ b/src/spicelib/devices/ltra/ltraacld.c @@ -105,7 +105,6 @@ LTRAacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->LTRAinstances; here != NULL; here = here->LTRAnextInstance) { - if (here->LTRAowner != ARCHme) continue; *(here->LTRAibr1Pos1Ptr + 0) += y0_r; *(here->LTRAibr1Pos1Ptr + 1) += y0_i; diff --git a/src/spicelib/devices/ltra/ltradefs.h b/src/spicelib/devices/ltra/ltradefs.h index a78b87571..5afd6c5dd 100644 --- a/src/spicelib/devices/ltra/ltradefs.h +++ b/src/spicelib/devices/ltra/ltradefs.h @@ -22,7 +22,6 @@ typedef struct sLTRAinstance { struct sLTRAinstance *LTRAnextInstance; /* pointer to next instance of * current model*/ IFuid LTRAname; /* pointer to character string naming this instance */ - int LTRAowner; /* number of owner process */ int LTRAstate; /* not used */ int LTRAposNode1; /* number of positive node of end 1 of t. line */ int LTRAnegNode1; /* number of negative node of end 1 of t. line */ diff --git a/src/spicelib/devices/ltra/ltraload.c b/src/spicelib/devices/ltra/ltraload.c index 52f9f2520..39160b940 100644 --- a/src/spicelib/devices/ltra/ltraload.c +++ b/src/spicelib/devices/ltra/ltraload.c @@ -222,7 +222,6 @@ LTRAload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->LTRAinstances; here != NULL; here = here->LTRAnextInstance) { - if (here->LTRAowner != ARCHme) continue; if ((ckt->CKTmode & MODEDC) || (model->LTRAspecialCase == LTRA_MOD_RG)) { diff --git a/src/spicelib/devices/ltra/ltratemp.c b/src/spicelib/devices/ltra/ltratemp.c index 7b4e47abf..eda23f03a 100644 --- a/src/spicelib/devices/ltra/ltratemp.c +++ b/src/spicelib/devices/ltra/ltratemp.c @@ -149,7 +149,6 @@ LTRAtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->LTRAinstances; here != NULL; here = here->LTRAnextInstance) { - if (here->LTRAowner != ARCHme) continue; here->LTRAv1 = NULL; here->LTRAi1 = NULL; diff --git a/src/spicelib/devices/ltra/ltratrun.c b/src/spicelib/devices/ltra/ltratrun.c index 076105014..2b3a81db6 100644 --- a/src/spicelib/devices/ltra/ltratrun.c +++ b/src/spicelib/devices/ltra/ltratrun.c @@ -28,7 +28,6 @@ LTRAtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) /* loop through all the instances of the model */ for (here = model->LTRAinstances; here != NULL; here = here->LTRAnextInstance) { - if (here->LTRAowner != ARCHme) continue; switch (model->LTRAspecialCase) { diff --git a/src/spicelib/devices/mes/mesacl.c b/src/spicelib/devices/mes/mesacl.c index 82eed429c..1a323743a 100644 --- a/src/spicelib/devices/mes/mesacl.c +++ b/src/spicelib/devices/mes/mesacl.c @@ -32,7 +32,6 @@ MESacLoad(GENmodel *inModel, CKTcircuit *ckt) for( here = model->MESinstances; here != NULL; here = here->MESnextInstance) { - if (here->MESowner != ARCHme) continue; m = here->MESm; diff --git a/src/spicelib/devices/mes/mesdefs.h b/src/spicelib/devices/mes/mesdefs.h index 168e78f6f..0bbc9387b 100644 --- a/src/spicelib/devices/mes/mesdefs.h +++ b/src/spicelib/devices/mes/mesdefs.h @@ -24,7 +24,6 @@ typedef struct sMESinstance { struct sMESinstance *MESnextInstance; /* pointer to next instance of * current model*/ IFuid MESname; /* pointer to character string naming this instance */ - int MESowner; /* number of owner process */ int MESstate; /* pointer to start of state vector for mesfet */ int MESdrainNode; /* number of drain node of mesfet */ int MESgateNode; /* number of gate node of mesfet */ diff --git a/src/spicelib/devices/mes/mesdisto.c b/src/spicelib/devices/mes/mesdisto.c index bbed7cd22..b7ec3e248 100644 --- a/src/spicelib/devices/mes/mesdisto.c +++ b/src/spicelib/devices/mes/mesdisto.c @@ -45,7 +45,6 @@ for( ; model != NULL; model = model->MESnextModel ) { /* loop through all the instances of the model */ for (here = model->MESinstances; here != NULL ; here=here->MESnextInstance) { - if (here->MESowner != ARCHme) continue; /* loading starts here */ diff --git a/src/spicelib/devices/mes/mesdset.c b/src/spicelib/devices/mes/mesdset.c index 8f80a9af8..0b64e12ad 100644 --- a/src/spicelib/devices/mes/mesdset.c +++ b/src/spicelib/devices/mes/mesdset.c @@ -60,7 +60,6 @@ MESdSetup(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MESinstances; here != NULL ; here=here->MESnextInstance) { - if (here->MESowner != ARCHme) continue; /* * dc model parameters diff --git a/src/spicelib/devices/mes/mesgetic.c b/src/spicelib/devices/mes/mesgetic.c index 747717eb5..586962dab 100644 --- a/src/spicelib/devices/mes/mesgetic.c +++ b/src/spicelib/devices/mes/mesgetic.c @@ -24,7 +24,6 @@ MESgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MESnextModel) { for(here = model->MESinstances; here ; here = here->MESnextInstance) { - if (here->MESowner != ARCHme) continue; if(!here->MESicVDSGiven) { here->MESicVDS = diff --git a/src/spicelib/devices/mes/mesload.c b/src/spicelib/devices/mes/mesload.c index 9ff581ac1..8eda10ef1 100644 --- a/src/spicelib/devices/mes/mesload.c +++ b/src/spicelib/devices/mes/mesload.c @@ -90,7 +90,6 @@ MESload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MESinstances; here != NULL ; here=here->MESnextInstance) { - if (here->MESowner != ARCHme) continue; /* * dc model parameters diff --git a/src/spicelib/devices/mes/mesnoise.c b/src/spicelib/devices/mes/mesnoise.c index 12a6aa2f3..df2a5c764 100644 --- a/src/spicelib/devices/mes/mesnoise.c +++ b/src/spicelib/devices/mes/mesnoise.c @@ -48,7 +48,6 @@ MESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d for (model=firstModel; model != NULL; model=model->MESnextModel) { for (inst=model->MESinstances; inst != NULL; inst=inst->MESnextInstance) { - if (inst->MESowner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/mes/mespzld.c b/src/spicelib/devices/mes/mespzld.c index 072e1de41..81bd34c4d 100644 --- a/src/spicelib/devices/mes/mespzld.c +++ b/src/spicelib/devices/mes/mespzld.c @@ -33,7 +33,6 @@ MESpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( here = model->MESinstances; here != NULL; here = here->MESnextInstance) { - if (here->MESowner != ARCHme) continue; m = here->MESm; diff --git a/src/spicelib/devices/mes/messetup.c b/src/spicelib/devices/mes/messetup.c index 3c125bddb..3fb6e26ba 100644 --- a/src/spicelib/devices/mes/messetup.c +++ b/src/spicelib/devices/mes/messetup.c @@ -75,7 +75,6 @@ MESsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->MESinstances; here != NULL ; here=here->MESnextInstance) { - if (here->MESowner != ARCHme) goto matrixpointers; if(!here->MESareaGiven) { here->MESarea = 1.0; @@ -86,7 +85,6 @@ MESsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here->MESstate = *states; *states += MESnumStates; -matrixpointers: if(model->MESsourceResist != 0) { if(here->MESsourcePrimeNode == 0) { error = CKTmkVolt(ckt,&tmp,here->MESname,"source"); diff --git a/src/spicelib/devices/mes/mestrunc.c b/src/spicelib/devices/mes/mestrunc.c index d8d5e167d..74b1ac89b 100644 --- a/src/spicelib/devices/mes/mestrunc.c +++ b/src/spicelib/devices/mes/mestrunc.c @@ -20,7 +20,6 @@ MEStrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->MESnextModel) { for(here=model->MESinstances;here!=NULL;here = here->MESnextInstance){ - if (here->MESowner != ARCHme) continue; CKTterr(here->MESqgs,ckt,timeStep); CKTterr(here->MESqgd,ckt,timeStep); diff --git a/src/spicelib/devices/mesa/mesaacl.c b/src/spicelib/devices/mesa/mesaacl.c index 83d87ad21..6ac5db842 100644 --- a/src/spicelib/devices/mesa/mesaacl.c +++ b/src/spicelib/devices/mesa/mesaacl.c @@ -35,8 +35,6 @@ MESAacLoad(GENmodel *inModel, CKTcircuit *ckt) for( here = model->MESAinstances; here != NULL; here = here->MESAnextInstance) { - if (here->MESAowner != ARCHme) continue; - f = ckt->CKTomega/2/M_PI; if(here->MESAdelf == 0) lambda = here->MESAtLambda; diff --git a/src/spicelib/devices/mesa/mesadefs.h b/src/spicelib/devices/mesa/mesadefs.h index dd6fc81fe..b1ad7d220 100644 --- a/src/spicelib/devices/mesa/mesadefs.h +++ b/src/spicelib/devices/mesa/mesadefs.h @@ -22,7 +22,6 @@ typedef struct sMESAinstance { struct sMESAinstance *MESAnextInstance; /* pointer to next instance of * current model*/ IFuid MESAname; /* pointer to character string naming this instance */ - int MESAowner; /* number of owner process */ int MESAstate; /* pointer to start of state vector for MESAfet */ int MESAdrainNode; /* number of drain node of MESAfet */ diff --git a/src/spicelib/devices/mesa/mesagetic.c b/src/spicelib/devices/mesa/mesagetic.c index 38cf45267..9b146db90 100644 --- a/src/spicelib/devices/mesa/mesagetic.c +++ b/src/spicelib/devices/mesa/mesagetic.c @@ -22,7 +22,6 @@ MESAgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MESAnextModel) { for(here = model->MESAinstances; here ; here = here->MESAnextInstance) { - if (here->MESAowner != ARCHme) continue; if(!here->MESAicVDSGiven) { here->MESAicVDS = diff --git a/src/spicelib/devices/mesa/mesaload.c b/src/spicelib/devices/mesa/mesaload.c index 193787cbe..979f56696 100644 --- a/src/spicelib/devices/mesa/mesaload.c +++ b/src/spicelib/devices/mesa/mesaload.c @@ -101,7 +101,6 @@ MESAload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MESAinstances; here != NULL ; here=here->MESAnextInstance) { - if (here->MESAowner != ARCHme) continue; /* * dc model parameters diff --git a/src/spicelib/devices/mesa/mesapzl.c b/src/spicelib/devices/mesa/mesapzl.c index c75d2294a..830542256 100644 --- a/src/spicelib/devices/mesa/mesapzl.c +++ b/src/spicelib/devices/mesa/mesapzl.c @@ -35,8 +35,6 @@ MESApzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( here = model->MESAinstances; here != NULL; here = here->MESAnextInstance) { - if (here->MESAowner != ARCHme) continue; - f = ckt->CKTomega/2/M_PI; if(here->MESAdelf == 0) lambda = here->MESAtLambda; diff --git a/src/spicelib/devices/mesa/mesasetup.c b/src/spicelib/devices/mesa/mesasetup.c index c6adeceb7..c13cdf4eb 100644 --- a/src/spicelib/devices/mesa/mesasetup.c +++ b/src/spicelib/devices/mesa/mesasetup.c @@ -229,7 +229,6 @@ MESAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->MESAinstances; here != NULL ; here=here->MESAnextInstance) { - if (here->MESAowner != ARCHme) goto matrixpointers; if(!here->MESAlengthGiven) { here->MESAlength = 1e-6; @@ -254,7 +253,6 @@ MESAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here->MESAstate = *states; *states += 20; -matrixpointers: if(model->MESAsourceResist != 0) { if(here->MESAsourcePrimeNode == 0) { error = CKTmkVolt(ckt,&tmp,here->MESAname,"source"); diff --git a/src/spicelib/devices/mesa/mesatemp.c b/src/spicelib/devices/mesa/mesatemp.c index d21a80d8f..88c08e788 100644 --- a/src/spicelib/devices/mesa/mesatemp.c +++ b/src/spicelib/devices/mesa/mesatemp.c @@ -43,8 +43,6 @@ MESAtemp(GENmodel *inModel, CKTcircuit *ckt) for (here = model->MESAinstances; here != NULL ; here=here->MESAnextInstance) { - if (here->MESAowner != ARCHme) continue; - vt = CONSTKoverQ * here->MESAts; if(model->MESAmu1 == 0 && model->MESAmu2 == 0) here->MESAtMu = model->MESAmu*pow(here->MESAts/ diff --git a/src/spicelib/devices/mesa/mesatrunc.c b/src/spicelib/devices/mesa/mesatrunc.c index d2468494c..e81909983 100644 --- a/src/spicelib/devices/mesa/mesatrunc.c +++ b/src/spicelib/devices/mesa/mesatrunc.c @@ -19,8 +19,6 @@ MESAtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->MESAnextModel) { for(here=model->MESAinstances;here!=NULL; here = here->MESAnextInstance){ - if (here->MESAowner != ARCHme) continue; - CKTterr(here->MESAqgs,ckt,timeStep); CKTterr(here->MESAqgd,ckt,timeStep); diff --git a/src/spicelib/devices/mos1/mos1acld.c b/src/spicelib/devices/mos1/mos1acld.c index 50eabbfec..92d8b372a 100644 --- a/src/spicelib/devices/mos1/mos1acld.c +++ b/src/spicelib/devices/mos1/mos1acld.c @@ -36,7 +36,6 @@ MOS1acLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS1nextModel) { for(here = model->MOS1instances; here!= NULL; here = here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; if (here->MOS1mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos1/mos1conv.c b/src/spicelib/devices/mos1/mos1conv.c index 32d1948ed..66fdd5ef1 100644 --- a/src/spicelib/devices/mos1/mos1conv.c +++ b/src/spicelib/devices/mos1/mos1conv.c @@ -32,7 +32,6 @@ MOS1convTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS1nextModel) { for(here = model->MOS1instances; here!= NULL; here = here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; vbs = model->MOS1type * ( *(ckt->CKTrhs+here->MOS1bNode) - diff --git a/src/spicelib/devices/mos1/mos1defs.h b/src/spicelib/devices/mos1/mos1defs.h index 6b0453a0a..a322c1f86 100644 --- a/src/spicelib/devices/mos1/mos1defs.h +++ b/src/spicelib/devices/mos1/mos1defs.h @@ -22,7 +22,6 @@ typedef struct sMOS1instance { struct sMOS1instance *MOS1nextInstance; /* pointer to next instance of *current model*/ IFuid MOS1name; /* pointer to character string naming this instance */ - int MOS1owner; /* number of owner process */ int MOS1states; /* index into state table for this device */ int MOS1dNode; /* number of the gate node of the mosfet */ diff --git a/src/spicelib/devices/mos1/mos1dist.c b/src/spicelib/devices/mos1/mos1dist.c index 1bd256f6a..437cf93f4 100644 --- a/src/spicelib/devices/mos1/mos1dist.c +++ b/src/spicelib/devices/mos1/mos1dist.c @@ -51,10 +51,6 @@ for( ; model != NULL; model = model->MOS1nextModel ) { /* loop through all the instances of the model */ for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; - - - /* loading starts here */ diff --git a/src/spicelib/devices/mos1/mos1dset.c b/src/spicelib/devices/mos1/mos1dset.c index d1d05b673..f90e85b19 100644 --- a/src/spicelib/devices/mos1/mos1dset.c +++ b/src/spicelib/devices/mos1/mos1dset.c @@ -84,7 +84,6 @@ MOS1dSetup(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS1temp; EffectiveLength=here->MOS1l - 2*model->MOS1latDiff; diff --git a/src/spicelib/devices/mos1/mos1ic.c b/src/spicelib/devices/mos1/mos1ic.c index 4355c9853..31aa4a765 100644 --- a/src/spicelib/devices/mos1/mos1ic.c +++ b/src/spicelib/devices/mos1/mos1ic.c @@ -24,7 +24,6 @@ MOS1getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MOS1nextModel) { for(here = model->MOS1instances; here ; here = here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; if(!here->MOS1icVBSGiven) { here->MOS1icVBS = diff --git a/src/spicelib/devices/mos1/mos1load.c b/src/spicelib/devices/mos1/mos1load.c index 40df68b7b..78904c25a 100644 --- a/src/spicelib/devices/mos1/mos1load.c +++ b/src/spicelib/devices/mos1/mos1load.c @@ -100,7 +100,6 @@ MOS1load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS1temp; Check=1; diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c index 33a90620c..43548b175 100644 --- a/src/spicelib/devices/mos1/mos1noi.c +++ b/src/spicelib/devices/mos1/mos1noi.c @@ -60,7 +60,6 @@ MOS1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, } coxSquared *= coxSquared; for (inst=model->MOS1instances; inst != NULL; inst=inst->MOS1nextInstance) { - if (inst->MOS1owner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/mos1/mos1pzld.c b/src/spicelib/devices/mos1/mos1pzld.c index 542fb7b08..721c539cd 100644 --- a/src/spicelib/devices/mos1/mos1pzld.c +++ b/src/spicelib/devices/mos1/mos1pzld.c @@ -37,7 +37,6 @@ MOS1pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->MOS1nextModel) { for(here = model->MOS1instances; here!= NULL; here = here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; if (here->MOS1mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos1/mos1sacl.c b/src/spicelib/devices/mos1/mos1sacl.c index 9c83a1773..c71101dc7 100644 --- a/src/spicelib/devices/mos1/mos1sacl.c +++ b/src/spicelib/devices/mos1/mos1sacl.c @@ -131,7 +131,6 @@ MOS1sAcLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS1nextModel) { for(here = model->MOS1instances; here!= NULL; here = here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; /* save the unperturbed values in the state vector */ for(i=0; i <= 16; i++) diff --git a/src/spicelib/devices/mos1/mos1set.c b/src/spicelib/devices/mos1/mos1set.c index 6102ecc2c..9a5116cb5 100644 --- a/src/spicelib/devices/mos1/mos1set.c +++ b/src/spicelib/devices/mos1/mos1set.c @@ -92,14 +92,12 @@ MOS1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner == ARCHme) { /* allocate a chunk of the state vector */ here->MOS1states = *states; *states += MOS1numStates; if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ *states += 10 * (ckt->CKTsenInfo->SENparms); } - } if(!here->MOS1drainPerimiterGiven) { here->MOS1drainPerimiter = 0; diff --git a/src/spicelib/devices/mos1/mos1sld.c b/src/spicelib/devices/mos1/mos1sld.c index 1055fd6f5..97cb54754 100644 --- a/src/spicelib/devices/mos1/mos1sld.c +++ b/src/spicelib/devices/mos1/mos1sld.c @@ -98,7 +98,6 @@ MOS1sLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; #ifdef SENSDEBUG printf("senload instance name %s\n",here->MOS1name); diff --git a/src/spicelib/devices/mos1/mos1sprt.c b/src/spicelib/devices/mos1/mos1sprt.c index 1c85ab434..c13e6078e 100644 --- a/src/spicelib/devices/mos1/mos1sprt.c +++ b/src/spicelib/devices/mos1/mos1sprt.c @@ -35,7 +35,6 @@ MOS1sPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; printf(" Instance name:%s\n",here->MOS1name); printf(" Drain, Gate , Source nodes: %s, %s ,%s\n", diff --git a/src/spicelib/devices/mos1/mos1sset.c b/src/spicelib/devices/mos1/mos1sset.c index f420343af..10bbc8789 100644 --- a/src/spicelib/devices/mos1/mos1sset.c +++ b/src/spicelib/devices/mos1/mos1sset.c @@ -27,7 +27,6 @@ MOS1sSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; if(here->MOS1senParmNo){ if((here->MOS1sens_l)&&(here->MOS1sens_w)){ diff --git a/src/spicelib/devices/mos1/mos1supd.c b/src/spicelib/devices/mos1/mos1supd.c index bbfeed58d..bee4c31c3 100644 --- a/src/spicelib/devices/mos1/mos1supd.c +++ b/src/spicelib/devices/mos1/mos1supd.c @@ -56,7 +56,6 @@ MOS1sUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS1instances; here != NULL ; here=here->MOS1nextInstance) { - if (here->MOS1owner != ARCHme) continue; #ifdef SENSDEBUG printf("senupdate instance name %s\n",here->MOS1name); diff --git a/src/spicelib/devices/mos1/mos1temp.c b/src/spicelib/devices/mos1/mos1temp.c index 67b2ff632..3764bc96a 100644 --- a/src/spicelib/devices/mos1/mos1temp.c +++ b/src/spicelib/devices/mos1/mos1temp.c @@ -117,7 +117,6 @@ MOS1temp(GENmodel *inModel, CKTcircuit *ckt) double arg; /* 1 - fc */ double sarg; /* (1-fc) ^^ (-mj) */ double sargsw; /* (1-fc) ^^ (-mjsw) */ - if (here->MOS1owner != ARCHme) continue; /* perform the parameter defaulting */ diff --git a/src/spicelib/devices/mos1/mos1trun.c b/src/spicelib/devices/mos1/mos1trun.c index 5d2184ca6..2090b6bf8 100644 --- a/src/spicelib/devices/mos1/mos1trun.c +++ b/src/spicelib/devices/mos1/mos1trun.c @@ -20,7 +20,6 @@ MOS1trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->MOS1nextModel) { for(here=model->MOS1instances;here!=NULL;here = here->MOS1nextInstance){ - if (here->MOS1owner != ARCHme) continue; CKTterr(here->MOS1qgs,ckt,timeStep); CKTterr(here->MOS1qgd,ckt,timeStep); diff --git a/src/spicelib/devices/mos2/mos2acld.c b/src/spicelib/devices/mos2/mos2acld.c index 4b0f1ecd9..421fd2a5a 100644 --- a/src/spicelib/devices/mos2/mos2acld.c +++ b/src/spicelib/devices/mos2/mos2acld.c @@ -36,7 +36,6 @@ MOS2acLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS2nextModel) { for(here = model->MOS2instances; here!= NULL; here = here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; if (here->MOS2mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos2/mos2conv.c b/src/spicelib/devices/mos2/mos2conv.c index 7b747ebf7..3566be578 100644 --- a/src/spicelib/devices/mos2/mos2conv.c +++ b/src/spicelib/devices/mos2/mos2conv.c @@ -32,7 +32,6 @@ MOS2convTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS2nextModel) { for(here = model->MOS2instances; here!= NULL; here = here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; vbs = model->MOS2type * ( *(ckt->CKTrhs+here->MOS2bNode) - diff --git a/src/spicelib/devices/mos2/mos2defs.h b/src/spicelib/devices/mos2/mos2defs.h index 184a869e1..45e1c4c2d 100644 --- a/src/spicelib/devices/mos2/mos2defs.h +++ b/src/spicelib/devices/mos2/mos2defs.h @@ -22,7 +22,6 @@ typedef struct sMOS2instance { struct sMOS2instance *MOS2nextInstance; /* pointer to next instance of *current model*/ IFuid MOS2name; /* pointer to character string naming this instance */ - int MOS2owner; /* number of owner process */ int MOS2states; /* index into state table for this device */ int MOS2dNode; /* number of the gate node of the mosfet */ int MOS2gNode; /* number of the gate node of the mosfet */ diff --git a/src/spicelib/devices/mos2/mos2dist.c b/src/spicelib/devices/mos2/mos2dist.c index f9656274b..04ed67743 100644 --- a/src/spicelib/devices/mos2/mos2dist.c +++ b/src/spicelib/devices/mos2/mos2dist.c @@ -50,10 +50,6 @@ for( ; model != NULL; model = model->MOS2nextModel ) { /* loop through all the instances of the model */ for (here = model->MOS2instances; here != NULL ; here=here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; - - - /* loading starts here */ diff --git a/src/spicelib/devices/mos2/mos2dset.c b/src/spicelib/devices/mos2/mos2dset.c index b1cce6956..939dc4acd 100644 --- a/src/spicelib/devices/mos2/mos2dset.c +++ b/src/spicelib/devices/mos2/mos2dset.c @@ -75,7 +75,6 @@ double gmbds; /* loop through all the instances of the model */ for (here = model->MOS2instances; here != NULL ; here=here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS2temp; diff --git a/src/spicelib/devices/mos2/mos2ic.c b/src/spicelib/devices/mos2/mos2ic.c index 6c99beede..2fca05da8 100644 --- a/src/spicelib/devices/mos2/mos2ic.c +++ b/src/spicelib/devices/mos2/mos2ic.c @@ -24,7 +24,6 @@ MOS2getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MOS2nextModel) { for(here = model->MOS2instances; here ; here = here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; if(!here->MOS2icVBSGiven) { here->MOS2icVBS = diff --git a/src/spicelib/devices/mos2/mos2load.c b/src/spicelib/devices/mos2/mos2load.c index e447a3952..fb4683338 100644 --- a/src/spicelib/devices/mos2/mos2load.c +++ b/src/spicelib/devices/mos2/mos2load.c @@ -108,7 +108,6 @@ MOS2load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS2instances; here != NULL ; here=here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS2temp; Check=1; diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c index b17d02d5a..8bee0c36b 100644 --- a/src/spicelib/devices/mos2/mos2noi.c +++ b/src/spicelib/devices/mos2/mos2noi.c @@ -49,7 +49,6 @@ MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->MOS2nextModel) { for (inst=model->MOS2instances; inst != NULL; inst=inst->MOS2nextInstance) { - if (inst->MOS2owner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/mos2/mos2pzld.c b/src/spicelib/devices/mos2/mos2pzld.c index a0a7bf151..0961a2dce 100644 --- a/src/spicelib/devices/mos2/mos2pzld.c +++ b/src/spicelib/devices/mos2/mos2pzld.c @@ -37,7 +37,6 @@ MOS2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->MOS2nextModel) { for(here = model->MOS2instances; here!= NULL; here = here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; if (here->MOS2mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos2/mos2sacl.c b/src/spicelib/devices/mos2/mos2sacl.c index 3004d131e..efef2a5ae 100644 --- a/src/spicelib/devices/mos2/mos2sacl.c +++ b/src/spicelib/devices/mos2/mos2sacl.c @@ -131,7 +131,6 @@ MOS2sAcLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS2nextModel) { for(here = model->MOS2instances; here!= NULL; here = here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; /* save the unperturbed values in the state vector */ for(i=0; i <= 16; i++) diff --git a/src/spicelib/devices/mos2/mos2set.c b/src/spicelib/devices/mos2/mos2set.c index 0eb876eb2..dcf71feb7 100644 --- a/src/spicelib/devices/mos2/mos2set.c +++ b/src/spicelib/devices/mos2/mos2set.c @@ -124,14 +124,12 @@ MOS2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - if (here->MOS2owner == ARCHme) { /* allocate a chunk of the state vector */ here->MOS2states = *states; *states += MOS2numStates; if(ckt->CKTsenInfo && (ckt->CKTsenInfo->SENmode & TRANSEN) ){ *states += 10 * (ckt->CKTsenInfo->SENparms); } - } if(!here->MOS2drainPerimiterGiven) { here->MOS2drainPerimiter = 0; diff --git a/src/spicelib/devices/mos2/mos2sld.c b/src/spicelib/devices/mos2/mos2sld.c index c2771e02a..7e24d99b9 100644 --- a/src/spicelib/devices/mos2/mos2sld.c +++ b/src/spicelib/devices/mos2/mos2sld.c @@ -98,7 +98,6 @@ MOS2sLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS2instances; here != NULL ; here=here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; #ifdef SENSDEBUG printf("senload instance name %s\n",here->MOS2name); diff --git a/src/spicelib/devices/mos2/mos2sprt.c b/src/spicelib/devices/mos2/mos2sprt.c index c31d61291..e92879391 100644 --- a/src/spicelib/devices/mos2/mos2sprt.c +++ b/src/spicelib/devices/mos2/mos2sprt.c @@ -31,7 +31,6 @@ MOS2sPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS2instances; here != NULL ; here=here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; printf(" Instance name:%s\n",here->MOS2name); printf(" Drain, Gate , Source nodes: %s, %s ,%s\n", diff --git a/src/spicelib/devices/mos2/mos2sset.c b/src/spicelib/devices/mos2/mos2sset.c index 9eaebeca6..838c34b86 100644 --- a/src/spicelib/devices/mos2/mos2sset.c +++ b/src/spicelib/devices/mos2/mos2sset.c @@ -27,7 +27,6 @@ MOS2sSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->MOS2instances; here != NULL ; here=here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; if(here->MOS2senParmNo){ if((here->MOS2sens_l)&&(here->MOS2sens_w)){ diff --git a/src/spicelib/devices/mos2/mos2supd.c b/src/spicelib/devices/mos2/mos2supd.c index 5eafd0fe4..275bb6eb9 100644 --- a/src/spicelib/devices/mos2/mos2supd.c +++ b/src/spicelib/devices/mos2/mos2supd.c @@ -56,7 +56,6 @@ MOS2sUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS2instances; here != NULL ; here=here->MOS2nextInstance) { - if (here->MOS2owner != ARCHme) continue; #ifdef SENSDEBUG printf("senupdate instance name %s\n",here->MOS2name); diff --git a/src/spicelib/devices/mos2/mos2temp.c b/src/spicelib/devices/mos2/mos2temp.c index f83d93653..982c784dd 100644 --- a/src/spicelib/devices/mos2/mos2temp.c +++ b/src/spicelib/devices/mos2/mos2temp.c @@ -125,7 +125,6 @@ MOS2temp(GENmodel *inModel, CKTcircuit *ckt) double arg; /* 1 - fc */ double sarg; /* (1-fc) ^^ (-mj) */ double sargsw; /* (1-fc) ^^ (-mjsw) */ - if (here->MOS2owner != ARCHme) continue; /* perform the parameter defaulting */ if(!here->MOS2dtempGiven) { diff --git a/src/spicelib/devices/mos2/mos2trun.c b/src/spicelib/devices/mos2/mos2trun.c index d06626d37..8113fcb4a 100644 --- a/src/spicelib/devices/mos2/mos2trun.c +++ b/src/spicelib/devices/mos2/mos2trun.c @@ -20,7 +20,6 @@ MOS2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->MOS2nextModel) { for(here=model->MOS2instances;here!=NULL;here = here->MOS2nextInstance){ - if (here->MOS2owner != ARCHme) continue; CKTterr(here->MOS2qgs,ckt,timeStep); CKTterr(here->MOS2qgd,ckt,timeStep); diff --git a/src/spicelib/devices/mos3/mos3acld.c b/src/spicelib/devices/mos3/mos3acld.c index b48834d8f..61670e929 100644 --- a/src/spicelib/devices/mos3/mos3acld.c +++ b/src/spicelib/devices/mos3/mos3acld.c @@ -37,7 +37,6 @@ MOS3acLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS3nextModel) { for(here = model->MOS3instances; here!= NULL; here = here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; if (here->MOS3mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos3/mos3conv.c b/src/spicelib/devices/mos3/mos3conv.c index 7344a0ade..ae7419ab8 100644 --- a/src/spicelib/devices/mos3/mos3conv.c +++ b/src/spicelib/devices/mos3/mos3conv.c @@ -32,7 +32,6 @@ MOS3convTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS3nextModel) { for(here = model->MOS3instances; here!= NULL; here = here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; vbs = model->MOS3type * ( *(ckt->CKTrhs+here->MOS3bNode) - diff --git a/src/spicelib/devices/mos3/mos3defs.h b/src/spicelib/devices/mos3/mos3defs.h index 3cd4e37f6..ef0098582 100644 --- a/src/spicelib/devices/mos3/mos3defs.h +++ b/src/spicelib/devices/mos3/mos3defs.h @@ -22,7 +22,6 @@ typedef struct sMOS3instance { struct sMOS3instance *MOS3nextInstance; /* pointer to next instance of *current model*/ IFuid MOS3name; /* pointer to character string naming this instance */ - int MOS3owner; /* number of owner process */ int MOS3states; /* index into state table for this device */ int MOS3dNode; /* number of the gate node of the mosfet */ int MOS3gNode; /* number of the gate node of the mosfet */ diff --git a/src/spicelib/devices/mos3/mos3dist.c b/src/spicelib/devices/mos3/mos3dist.c index 93c06b916..4e2b5f4ca 100644 --- a/src/spicelib/devices/mos3/mos3dist.c +++ b/src/spicelib/devices/mos3/mos3dist.c @@ -50,10 +50,6 @@ for( ; model != NULL; model = model->MOS3nextModel ) { /* loop through all the instances of the model */ for (here = model->MOS3instances; here != NULL ; here=here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; - - - /* loading starts here */ diff --git a/src/spicelib/devices/mos3/mos3dset.c b/src/spicelib/devices/mos3/mos3dset.c index d6b023408..6b6943208 100644 --- a/src/spicelib/devices/mos3/mos3dset.c +++ b/src/spicelib/devices/mos3/mos3dset.c @@ -66,7 +66,6 @@ MOS3dSetup(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS3instances; here != NULL ; here=here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS3temp; diff --git a/src/spicelib/devices/mos3/mos3ic.c b/src/spicelib/devices/mos3/mos3ic.c index 5ad129e13..95d4d35a7 100644 --- a/src/spicelib/devices/mos3/mos3ic.c +++ b/src/spicelib/devices/mos3/mos3ic.c @@ -24,7 +24,6 @@ MOS3getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MOS3nextModel) { for(here = model->MOS3instances; here ; here = here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; if(!here->MOS3icVBSGiven) { here->MOS3icVBS = diff --git a/src/spicelib/devices/mos3/mos3load.c b/src/spicelib/devices/mos3/mos3load.c index 45bc898c0..d9b2b1b37 100644 --- a/src/spicelib/devices/mos3/mos3load.c +++ b/src/spicelib/devices/mos3/mos3load.c @@ -107,7 +107,6 @@ MOS3load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS3instances; here != NULL ; here=here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS3temp; Check=1; diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c index a02c3e5c9..ad03005fd 100644 --- a/src/spicelib/devices/mos3/mos3noi.c +++ b/src/spicelib/devices/mos3/mos3noi.c @@ -49,7 +49,6 @@ MOS3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->MOS3nextModel) { for (inst=model->MOS3instances; inst != NULL; inst=inst->MOS3nextInstance) { - if (inst->MOS3owner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/mos3/mos3pzld.c b/src/spicelib/devices/mos3/mos3pzld.c index 7ca88c4a8..744134e35 100644 --- a/src/spicelib/devices/mos3/mos3pzld.c +++ b/src/spicelib/devices/mos3/mos3pzld.c @@ -38,7 +38,6 @@ MOS3pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->MOS3nextModel) { for(here = model->MOS3instances; here!= NULL; here = here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; if (here->MOS3mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos3/mos3sacl.c b/src/spicelib/devices/mos3/mos3sacl.c index 954c15b89..4cb06a833 100644 --- a/src/spicelib/devices/mos3/mos3sacl.c +++ b/src/spicelib/devices/mos3/mos3sacl.c @@ -131,7 +131,6 @@ MOS3sAcLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS3nextModel) { for(here = model->MOS3instances; here!= NULL; here = here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; /* save the unperturbed values in the state vector */ for(i=0; i <= 16; i++) diff --git a/src/spicelib/devices/mos3/mos3set.c b/src/spicelib/devices/mos3/mos3set.c index 99176d289..35a14c82c 100644 --- a/src/spicelib/devices/mos3/mos3set.c +++ b/src/spicelib/devices/mos3/mos3set.c @@ -147,11 +147,9 @@ MOS3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - if (here->MOS3owner == ARCHme) { /* allocate a chunk of the state vector */ here->MOS3states = *states; *states += MOS3NUMSTATES; - } if(!here->MOS3drainAreaGiven) { here->MOS3drainArea = ckt->CKTdefaultMosAD; diff --git a/src/spicelib/devices/mos3/mos3sld.c b/src/spicelib/devices/mos3/mos3sld.c index 0ec3dd99a..729fef2b0 100644 --- a/src/spicelib/devices/mos3/mos3sld.c +++ b/src/spicelib/devices/mos3/mos3sld.c @@ -100,7 +100,6 @@ MOS3sLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS3instances; here != NULL ; here=here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; #ifdef SENSDEBUG printf("senload instance name %s\n",here->MOS3name); diff --git a/src/spicelib/devices/mos3/mos3sprt.c b/src/spicelib/devices/mos3/mos3sprt.c index 15d6e2610..24ddfc01c 100644 --- a/src/spicelib/devices/mos3/mos3sprt.c +++ b/src/spicelib/devices/mos3/mos3sprt.c @@ -32,7 +32,6 @@ MOS3sPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS3instances; here != NULL ; here=here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; printf(" Instance name:%s\n",here->MOS3name); printf(" Drain, Gate , Source nodes: %s, %s ,%s\n", diff --git a/src/spicelib/devices/mos3/mos3sset.c b/src/spicelib/devices/mos3/mos3sset.c index 3855c49fe..b7a1f8899 100644 --- a/src/spicelib/devices/mos3/mos3sset.c +++ b/src/spicelib/devices/mos3/mos3sset.c @@ -28,7 +28,6 @@ MOS3sSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->MOS3instances; here != NULL ; here=here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; if(here->MOS3senParmNo){ if((here->MOS3sens_l)&&(here->MOS3sens_w)){ diff --git a/src/spicelib/devices/mos3/mos3supd.c b/src/spicelib/devices/mos3/mos3supd.c index 8004725e5..0e1de533d 100644 --- a/src/spicelib/devices/mos3/mos3supd.c +++ b/src/spicelib/devices/mos3/mos3supd.c @@ -54,7 +54,6 @@ MOS3sUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS3instances; here != NULL ; here=here->MOS3nextInstance) { - if (here->MOS3owner != ARCHme) continue; #ifdef SENSDEBUG printf("senupdate instance name %s\n",here->MOS3name); diff --git a/src/spicelib/devices/mos3/mos3temp.c b/src/spicelib/devices/mos3/mos3temp.c index a27e98032..7357b47ae 100644 --- a/src/spicelib/devices/mos3/mos3temp.c +++ b/src/spicelib/devices/mos3/mos3temp.c @@ -119,8 +119,6 @@ MOS3temp(GENmodel *inModel, CKTcircuit *ckt) double arg; /* 1 - fc */ double sarg; /* (1-fc) ^^ (-mj) */ double sargsw; /* (1-fc) ^^ (-mjsw) */ - if (here->MOS3owner != ARCHme) continue; - /* perform the parameter defaulting */ diff --git a/src/spicelib/devices/mos3/mos3trun.c b/src/spicelib/devices/mos3/mos3trun.c index 4d9df3d95..20c7bd12e 100644 --- a/src/spicelib/devices/mos3/mos3trun.c +++ b/src/spicelib/devices/mos3/mos3trun.c @@ -17,7 +17,6 @@ MOS3trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->MOS3nextModel) { for(here=model->MOS3instances;here!=NULL;here = here->MOS3nextInstance){ - if (here->MOS3owner != ARCHme) continue; CKTterr(here->MOS3qgs,ckt,timeStep); CKTterr(here->MOS3qgd,ckt,timeStep); diff --git a/src/spicelib/devices/mos6/mos6conv.c b/src/spicelib/devices/mos6/mos6conv.c index e8a16e450..7fe542672 100644 --- a/src/spicelib/devices/mos6/mos6conv.c +++ b/src/spicelib/devices/mos6/mos6conv.c @@ -32,7 +32,6 @@ MOS6convTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS6nextModel) { for(here = model->MOS6instances; here!= NULL; here = here->MOS6nextInstance) { - if (here->MOS6owner != ARCHme) continue; vbs = model->MOS6type * ( *(ckt->CKTrhs+here->MOS6bNode) - diff --git a/src/spicelib/devices/mos6/mos6defs.h b/src/spicelib/devices/mos6/mos6defs.h index 8b230dfa4..d03070a81 100644 --- a/src/spicelib/devices/mos6/mos6defs.h +++ b/src/spicelib/devices/mos6/mos6defs.h @@ -20,7 +20,6 @@ typedef struct sMOS6instance { struct sMOS6instance *MOS6nextInstance; /* pointer to next instance of *current model*/ IFuid MOS6name; /* pointer to character string naming this instance */ - int MOS6owner; /* number of owner process */ int MOS6states; /* index into state table for this device */ int MOS6dNode; /* number of the gate node of the mosfet */ int MOS6gNode; /* number of the gate node of the mosfet */ diff --git a/src/spicelib/devices/mos6/mos6ic.c b/src/spicelib/devices/mos6/mos6ic.c index c3459ae9d..f89f7e8f3 100644 --- a/src/spicelib/devices/mos6/mos6ic.c +++ b/src/spicelib/devices/mos6/mos6ic.c @@ -24,7 +24,6 @@ MOS6getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MOS6nextModel) { for(here = model->MOS6instances; here ; here = here->MOS6nextInstance) { - if (here->MOS6owner != ARCHme) continue; if(!here->MOS6icVBSGiven) { here->MOS6icVBS = diff --git a/src/spicelib/devices/mos6/mos6load.c b/src/spicelib/devices/mos6/mos6load.c index 4aeef445e..0f1eea531 100644 --- a/src/spicelib/devices/mos6/mos6load.c +++ b/src/spicelib/devices/mos6/mos6load.c @@ -100,7 +100,6 @@ MOS6load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS6instances; here != NULL ; here=here->MOS6nextInstance) { - if (here->MOS6owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS6temp; Check=1; diff --git a/src/spicelib/devices/mos6/mos6set.c b/src/spicelib/devices/mos6/mos6set.c index 14af124f4..28554c50f 100644 --- a/src/spicelib/devices/mos6/mos6set.c +++ b/src/spicelib/devices/mos6/mos6set.c @@ -114,8 +114,6 @@ MOS6setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, here=here->MOS6nextInstance) { CKTnode *tmpNode; IFuid tmpName; - - if (here->MOS6owner != ARCHme) goto matrixpointers; if(!here->MOS6drainPerimiterGiven) { here->MOS6drainPerimiter = 0; @@ -150,7 +148,6 @@ MOS6setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, *states += 10 * (ckt->CKTsenInfo->SENparms); } -matrixpointers: if((model->MOS6drainResistance != 0 || (model->MOS6sheetResistance != 0 && here->MOS6drainSquares != 0) )) { diff --git a/src/spicelib/devices/mos6/mos6temp.c b/src/spicelib/devices/mos6/mos6temp.c index bb8ec2f92..046f62c79 100644 --- a/src/spicelib/devices/mos6/mos6temp.c +++ b/src/spicelib/devices/mos6/mos6temp.c @@ -120,8 +120,6 @@ MOS6temp(GENmodel *inModel, CKTcircuit *ckt) double arg; /* 1 - fc */ double sarg; /* (1-fc) ^^ (-mj) */ double sargsw; /* (1-fc) ^^ (-mjsw) */ - - if (here->MOS6owner != ARCHme) continue; /* perform the parameter defaulting */ if(!here->MOS6dtempGiven) { diff --git a/src/spicelib/devices/mos6/mos6trun.c b/src/spicelib/devices/mos6/mos6trun.c index d7563dd7c..bb8da497f 100644 --- a/src/spicelib/devices/mos6/mos6trun.c +++ b/src/spicelib/devices/mos6/mos6trun.c @@ -20,7 +20,6 @@ MOS6trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->MOS6nextModel) { for(here=model->MOS6instances;here!=NULL;here = here->MOS6nextInstance){ - if (here->MOS6owner != ARCHme) continue; CKTterr(here->MOS6qgs,ckt,timeStep); CKTterr(here->MOS6qgd,ckt,timeStep); diff --git a/src/spicelib/devices/mos9/mos9acld.c b/src/spicelib/devices/mos9/mos9acld.c index a3d3bbde8..00c3b468f 100644 --- a/src/spicelib/devices/mos9/mos9acld.c +++ b/src/spicelib/devices/mos9/mos9acld.c @@ -37,7 +37,6 @@ MOS9acLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS9nextModel) { for(here = model->MOS9instances; here!= NULL; here = here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; if (here->MOS9mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos9/mos9conv.c b/src/spicelib/devices/mos9/mos9conv.c index f02764bac..7cdf4353e 100644 --- a/src/spicelib/devices/mos9/mos9conv.c +++ b/src/spicelib/devices/mos9/mos9conv.c @@ -34,7 +34,6 @@ MOS9convTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS9nextModel) { for(here = model->MOS9instances; here!= NULL; here = here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; vbs = model->MOS9type * ( *(ckt->CKTrhs+here->MOS9bNode) - diff --git a/src/spicelib/devices/mos9/mos9defs.h b/src/spicelib/devices/mos9/mos9defs.h index 485c9af1e..2e9c72ee8 100644 --- a/src/spicelib/devices/mos9/mos9defs.h +++ b/src/spicelib/devices/mos9/mos9defs.h @@ -22,7 +22,6 @@ typedef struct sMOS9instance { struct sMOS9instance *MOS9nextInstance; /* pointer to next instance of *current model*/ IFuid MOS9name; /* pointer to character string naming this instance */ - int MOS9owner; /* number of owner process */ int MOS9states; /* index into state table for this device */ int MOS9dNode; /* number of the gate node of the mosfet */ int MOS9gNode; /* number of the gate node of the mosfet */ diff --git a/src/spicelib/devices/mos9/mos9dist.c b/src/spicelib/devices/mos9/mos9dist.c index 56085d218..8748d095d 100644 --- a/src/spicelib/devices/mos9/mos9dist.c +++ b/src/spicelib/devices/mos9/mos9dist.c @@ -56,9 +56,6 @@ for( ; model != NULL; model = model->MOS9nextModel ) { for (here = model->MOS9instances; here != NULL ; here=here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; - - /* loading starts here */ switch (mode) { diff --git a/src/spicelib/devices/mos9/mos9dset.c b/src/spicelib/devices/mos9/mos9dset.c index f6a2ee04d..5a59d6812 100644 --- a/src/spicelib/devices/mos9/mos9dset.c +++ b/src/spicelib/devices/mos9/mos9dset.c @@ -66,7 +66,6 @@ MOS9dSetup(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS9instances; here != NULL ; here=here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS9temp; diff --git a/src/spicelib/devices/mos9/mos9ic.c b/src/spicelib/devices/mos9/mos9ic.c index d2cb9a906..52a22b33a 100644 --- a/src/spicelib/devices/mos9/mos9ic.c +++ b/src/spicelib/devices/mos9/mos9ic.c @@ -25,7 +25,6 @@ MOS9getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->MOS9nextModel) { for(here = model->MOS9instances; here ; here = here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; if(!here->MOS9icVBSGiven) { here->MOS9icVBS = diff --git a/src/spicelib/devices/mos9/mos9load.c b/src/spicelib/devices/mos9/mos9load.c index b98da7c4b..79aa257b9 100644 --- a/src/spicelib/devices/mos9/mos9load.c +++ b/src/spicelib/devices/mos9/mos9load.c @@ -108,7 +108,6 @@ next: /* loop through all the instances of the model */ for (here = model->MOS9instances; here != NULL ; here=here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; vt = CONSTKoverQ * here->MOS9temp; Check=1; diff --git a/src/spicelib/devices/mos9/mos9noi.c b/src/spicelib/devices/mos9/mos9noi.c index 5f8b14d9b..2cd9dd684 100644 --- a/src/spicelib/devices/mos9/mos9noi.c +++ b/src/spicelib/devices/mos9/mos9noi.c @@ -49,7 +49,6 @@ MOS9noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->MOS9nextModel) { for (inst=model->MOS9instances; inst != NULL; inst=inst->MOS9nextInstance) { - if (inst->MOS9owner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/mos9/mos9pzld.c b/src/spicelib/devices/mos9/mos9pzld.c index a545e8af9..e12a1aa9d 100644 --- a/src/spicelib/devices/mos9/mos9pzld.c +++ b/src/spicelib/devices/mos9/mos9pzld.c @@ -38,7 +38,6 @@ MOS9pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( ; model != NULL; model = model->MOS9nextModel) { for(here = model->MOS9instances; here!= NULL; here = here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; if (here->MOS9mode < 0) { xnrm=0; diff --git a/src/spicelib/devices/mos9/mos9sacl.c b/src/spicelib/devices/mos9/mos9sacl.c index 91ccf5d96..ddcf36e2b 100644 --- a/src/spicelib/devices/mos9/mos9sacl.c +++ b/src/spicelib/devices/mos9/mos9sacl.c @@ -132,7 +132,6 @@ MOS9sAcLoad(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->MOS9nextModel) { for(here = model->MOS9instances; here!= NULL; here = here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; /* save the unperturbed values in the state vector */ for(i=0; i <= 16; i++) diff --git a/src/spicelib/devices/mos9/mos9set.c b/src/spicelib/devices/mos9/mos9set.c index e417fb2eb..14c2b29cb 100644 --- a/src/spicelib/devices/mos9/mos9set.c +++ b/src/spicelib/devices/mos9/mos9set.c @@ -147,11 +147,9 @@ MOS9setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - if (here->MOS9owner == ARCHme) { /* allocate a chunk of the state vector */ here->MOS9states = *states; *states += MOS9NUMSTATES; - } if(!here->MOS9drainAreaGiven) { here->MOS9drainArea = ckt->CKTdefaultMosAD; } diff --git a/src/spicelib/devices/mos9/mos9sld.c b/src/spicelib/devices/mos9/mos9sld.c index dba41342e..93cf9aab6 100644 --- a/src/spicelib/devices/mos9/mos9sld.c +++ b/src/spicelib/devices/mos9/mos9sld.c @@ -100,7 +100,6 @@ MOS9sLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS9instances; here != NULL ; here=here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; #ifdef SENSDEBUG printf("senload instance name %s\n",here->MOS9name); diff --git a/src/spicelib/devices/mos9/mos9sprt.c b/src/spicelib/devices/mos9/mos9sprt.c index 4add2b17c..2ec2069f1 100644 --- a/src/spicelib/devices/mos9/mos9sprt.c +++ b/src/spicelib/devices/mos9/mos9sprt.c @@ -32,7 +32,6 @@ MOS9sPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS9instances; here != NULL ; here=here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; printf(" Instance name:%s\n",here->MOS9name); printf(" Drain, Gate , Source nodes: %s, %s ,%s\n", diff --git a/src/spicelib/devices/mos9/mos9sset.c b/src/spicelib/devices/mos9/mos9sset.c index b813ec58e..25684571f 100644 --- a/src/spicelib/devices/mos9/mos9sset.c +++ b/src/spicelib/devices/mos9/mos9sset.c @@ -29,8 +29,6 @@ MOS9sSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->MOS9instances; here != NULL ; here=here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; - if(here->MOS9senParmNo){ if((here->MOS9sens_l)&&(here->MOS9sens_w)){ diff --git a/src/spicelib/devices/mos9/mos9supd.c b/src/spicelib/devices/mos9/mos9supd.c index fc9e1dc7b..0d8e8a7f7 100644 --- a/src/spicelib/devices/mos9/mos9supd.c +++ b/src/spicelib/devices/mos9/mos9supd.c @@ -55,8 +55,6 @@ MOS9sUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->MOS9instances; here != NULL ; here=here->MOS9nextInstance) { - if (here->MOS9owner != ARCHme) continue; - #ifdef SENSDEBUG printf("senupdate instance name %s\n",here->MOS9name); diff --git a/src/spicelib/devices/mos9/mos9temp.c b/src/spicelib/devices/mos9/mos9temp.c index f5ad71f47..0ffcd11df 100644 --- a/src/spicelib/devices/mos9/mos9temp.c +++ b/src/spicelib/devices/mos9/mos9temp.c @@ -124,7 +124,6 @@ MOS9temp(GENmodel *inModel, CKTcircuit *ckt) double arg; /* 1 - fc */ double sarg; /* (1-fc) ^^ (-mj) */ double sargsw; /* (1-fc) ^^ (-mjsw) */ - if (here->MOS9owner != ARCHme) continue; /* perform the parameter defaulting */ diff --git a/src/spicelib/devices/mos9/mos9trun.c b/src/spicelib/devices/mos9/mos9trun.c index ccb3d95da..d5724dad7 100644 --- a/src/spicelib/devices/mos9/mos9trun.c +++ b/src/spicelib/devices/mos9/mos9trun.c @@ -21,7 +21,6 @@ MOS9trunc( for( ; model != NULL; model = model->MOS9nextModel) { for(here=model->MOS9instances;here!=NULL;here = here->MOS9nextInstance){ - if (here->MOS9owner != ARCHme) continue; CKTterr(here->MOS9qgs,ckt,timeStep); CKTterr(here->MOS9qgd,ckt,timeStep); diff --git a/src/spicelib/devices/nbjt/nbjtacld.c b/src/spicelib/devices/nbjt/nbjtacld.c index b728eeb1c..454386194 100644 --- a/src/spicelib/devices/nbjt/nbjtacld.c +++ b/src/spicelib/devices/nbjt/nbjtacld.c @@ -41,7 +41,6 @@ NBJTacLoad(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/nbjt/nbjtdefs.h b/src/spicelib/devices/nbjt/nbjtdefs.h index f18dfadd5..886841130 100644 --- a/src/spicelib/devices/nbjt/nbjtdefs.h +++ b/src/spicelib/devices/nbjt/nbjtdefs.h @@ -27,7 +27,6 @@ typedef struct sNBJTinstance { * of current model */ IFuid NBJTname; /* pointer to character string naming this * instance */ - int NBJTowner; /* number of owner process */ int NBJTstate; /* pointer to start of state vector for bjt */ /* entries in the state vector for bjt: */ diff --git a/src/spicelib/devices/nbjt/nbjtdump.c b/src/spicelib/devices/nbjt/nbjtdump.c index 69b91175f..4cc762986 100644 --- a/src/spicelib/devices/nbjt/nbjtdump.c +++ b/src/spicelib/devices/nbjt/nbjtdump.c @@ -59,7 +59,6 @@ NBJTdump(GENmodel *inModel, CKTcircuit *ckt) output = model->NBJToutputs; for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) continue; if (inst->NBJTprintGiven) { if ((ckt->CKTmode & MODETRAN) && @@ -160,7 +159,6 @@ NBJTacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file) output = model->NBJToutputs; for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) continue; if (output->OUTPstats) { ONEmemStats(file, inst->NBJTpDevice); diff --git a/src/spicelib/devices/nbjt/nbjtload.c b/src/spicelib/devices/nbjt/nbjtload.c index 39f0e59fa..627b55b03 100644 --- a/src/spicelib/devices/nbjt/nbjtload.c +++ b/src/spicelib/devices/nbjt/nbjtload.c @@ -93,7 +93,6 @@ NBJTload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) continue; pDevice = inst->NBJTpDevice; diff --git a/src/spicelib/devices/nbjt/nbjtpzld.c b/src/spicelib/devices/nbjt/nbjtpzld.c index 97bd93fbd..3d73d1e17 100644 --- a/src/spicelib/devices/nbjt/nbjtpzld.c +++ b/src/spicelib/devices/nbjt/nbjtpzld.c @@ -42,7 +42,6 @@ NBJTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/nbjt/nbjtset.c b/src/spicelib/devices/nbjt/nbjtset.c index 6c1b8205e..b9da8fb7a 100644 --- a/src/spicelib/devices/nbjt/nbjtset.c +++ b/src/spicelib/devices/nbjt/nbjtset.c @@ -151,7 +151,6 @@ NBJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) goto matrixpointers; startTime = SPfrontEnd->IFseconds(); @@ -233,7 +232,6 @@ if ((inst->ptr = SMPmakeElt(matrix, inst->first, inst->second)) == NULL){\ return(E_NOMEM);\ } -matrixpointers: TSTALLOC(NBJTcolColPtr, NBJTcolNode, NBJTcolNode) TSTALLOC(NBJTbaseBasePtr, NBJTbaseNode, NBJTbaseNode) TSTALLOC(NBJTemitEmitPtr, NBJTemitNode, NBJTemitNode) diff --git a/src/spicelib/devices/nbjt/nbjttemp.c b/src/spicelib/devices/nbjt/nbjttemp.c index 003174260..ad7835402 100644 --- a/src/spicelib/devices/nbjt/nbjttemp.c +++ b/src/spicelib/devices/nbjt/nbjttemp.c @@ -56,7 +56,6 @@ NBJTtemp(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); diff --git a/src/spicelib/devices/nbjt/nbjttrun.c b/src/spicelib/devices/nbjt/nbjttrun.c index 8278032f9..9c7c87300 100644 --- a/src/spicelib/devices/nbjt/nbjttrun.c +++ b/src/spicelib/devices/nbjt/nbjttrun.c @@ -36,7 +36,6 @@ NBJTtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) model->NBJTpInfo->lteCoeff = computeLTECoeff(model->NBJTpInfo); for (inst = model->NBJTinstances; inst != NULL; inst = inst->NBJTnextInstance) { - if (inst->NBJTowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); deltaNew = ONEtrunc(inst->NBJTpDevice, model->NBJTpInfo, diff --git a/src/spicelib/devices/nbjt2/nbjt2def.h b/src/spicelib/devices/nbjt2/nbjt2def.h index 72983b29c..1ca3ee70c 100644 --- a/src/spicelib/devices/nbjt2/nbjt2def.h +++ b/src/spicelib/devices/nbjt2/nbjt2def.h @@ -27,7 +27,6 @@ typedef struct sNBJT2instance { * of current model */ IFuid NBJT2name; /* pointer to character string naming this * instance */ - int NBJT2owner; /* number of owner process */ int NBJT2state; /* pointer to start of state vector for bjt */ /* entries in the state vector for bjt: */ diff --git a/src/spicelib/devices/nbjt2/nbt2acld.c b/src/spicelib/devices/nbjt2/nbt2acld.c index 3389911e8..fae45ddd0 100644 --- a/src/spicelib/devices/nbjt2/nbt2acld.c +++ b/src/spicelib/devices/nbjt2/nbt2acld.c @@ -42,7 +42,6 @@ NBJT2acLoad(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/nbjt2/nbt2dump.c b/src/spicelib/devices/nbjt2/nbt2dump.c index 93329812f..0954f401f 100644 --- a/src/spicelib/devices/nbjt2/nbt2dump.c +++ b/src/spicelib/devices/nbjt2/nbt2dump.c @@ -60,7 +60,6 @@ NBJT2dump(GENmodel *inModel, CKTcircuit *ckt) output = model->NBJT2outputs; for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) continue; if (inst->NBJT2printGiven) { if ((ckt->CKTmode & MODETRAN) && @@ -161,7 +160,6 @@ NBJT2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file) output = model->NBJT2outputs; for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) continue; if (output->OUTPstats) { TWOmemStats(file, inst->NBJT2pDevice); diff --git a/src/spicelib/devices/nbjt2/nbt2load.c b/src/spicelib/devices/nbjt2/nbt2load.c index c2743f60e..93dcd5bed 100644 --- a/src/spicelib/devices/nbjt2/nbt2load.c +++ b/src/spicelib/devices/nbjt2/nbt2load.c @@ -96,7 +96,6 @@ NBJT2load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) continue; pDevice = inst->NBJT2pDevice; diff --git a/src/spicelib/devices/nbjt2/nbt2pzld.c b/src/spicelib/devices/nbjt2/nbt2pzld.c index 715054265..2fddc07f5 100644 --- a/src/spicelib/devices/nbjt2/nbt2pzld.c +++ b/src/spicelib/devices/nbjt2/nbt2pzld.c @@ -39,7 +39,6 @@ NBJT2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); diff --git a/src/spicelib/devices/nbjt2/nbt2set.c b/src/spicelib/devices/nbjt2/nbt2set.c index 9064fa49f..385fcc5b6 100644 --- a/src/spicelib/devices/nbjt2/nbt2set.c +++ b/src/spicelib/devices/nbjt2/nbt2set.c @@ -167,7 +167,6 @@ NBJT2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) goto matrixpointers; startTime = SPfrontEnd->IFseconds(); @@ -249,7 +248,6 @@ if ((inst->ptr = SMPmakeElt(matrix, inst->first, inst->second)) == NULL){\ return(E_NOMEM);\ } -matrixpointers: TSTALLOC(NBJT2colColPtr, NBJT2colNode, NBJT2colNode) TSTALLOC(NBJT2colBasePtr, NBJT2colNode, NBJT2baseNode) TSTALLOC(NBJT2colEmitPtr, NBJT2colNode, NBJT2emitNode) diff --git a/src/spicelib/devices/nbjt2/nbt2temp.c b/src/spicelib/devices/nbjt2/nbt2temp.c index e46629c96..d6e1d5a10 100644 --- a/src/spicelib/devices/nbjt2/nbt2temp.c +++ b/src/spicelib/devices/nbjt2/nbt2temp.c @@ -58,7 +58,6 @@ NBJT2temp(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); diff --git a/src/spicelib/devices/nbjt2/nbt2trun.c b/src/spicelib/devices/nbjt2/nbt2trun.c index 05bc01c9a..a9e02ff2a 100644 --- a/src/spicelib/devices/nbjt2/nbt2trun.c +++ b/src/spicelib/devices/nbjt2/nbt2trun.c @@ -39,7 +39,6 @@ NBJT2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) model->NBJT2pInfo->lteCoeff = computeLTECoeff(model->NBJT2pInfo); for (inst = model->NBJT2instances; inst != NULL; inst = inst->NBJT2nextInstance) { - if (inst->NBJT2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); deltaNew = TWOtrunc(inst->NBJT2pDevice, model->NBJT2pInfo, diff --git a/src/spicelib/devices/ndev/ndevaccept.c b/src/spicelib/devices/ndev/ndevaccept.c index b8c4679ca..e48e8ad1d 100644 --- a/src/spicelib/devices/ndev/ndevaccept.c +++ b/src/spicelib/devices/ndev/ndevaccept.c @@ -26,8 +26,6 @@ int NDEVaccept(CKTcircuit *ckt, GENmodel *inModel) for (here = model->NDEVinstances; here != NULL ; here=here->NDEVnextInstance) { - if (here->NDEVowner != ARCHme) continue; - /* set ckt accept_flag */ here->CKTInfo.DEV_CALL = NDEV_ACCEPT; here->CKTInfo.CKTmode = ckt->CKTmode; @@ -50,7 +48,6 @@ int NDEVconvTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->NDEVnextModel) { for(here=model->NDEVinstances;here!=NULL;here = here->NDEVnextInstance){ - if (here->NDEVowner != ARCHme) continue; /* * get convergence information from ndev */ diff --git a/src/spicelib/devices/ndev/ndevdefs.h b/src/spicelib/devices/ndev/ndevdefs.h index 1cdb28bc7..e388a4da6 100644 --- a/src/spicelib/devices/ndev/ndevdefs.h +++ b/src/spicelib/devices/ndev/ndevdefs.h @@ -29,7 +29,6 @@ typedef struct sNDEVinstance { * of current model */ IFuid NDEVname; /* pointer to character string naming this * instance */ - int NDEVowner; /* number of owner process */ int NDEVstate; /* pointer to start of state vector for diode */ int pin[7]; /* max 7 terminals are allowed */ int term; /* the real number of terminals */ diff --git a/src/spicelib/devices/ndev/ndevload.c b/src/spicelib/devices/ndev/ndevload.c index 4dac8b43c..b8652d0f2 100644 --- a/src/spicelib/devices/ndev/ndevload.c +++ b/src/spicelib/devices/ndev/ndevload.c @@ -29,9 +29,6 @@ NDEVload(GENmodel * inModel, CKTcircuit * ckt) /* loop through all the instances of the model */ for (here = model->NDEVinstances; here != NULL ; here=here->NDEVnextInstance) { - - if (here->NDEVowner != ARCHme) continue; - /* sent ckt information to device simulator */ here->CKTInfo.DEV_CALL = NDEV_LOAD; here->CKTInfo.CKTmode = ckt->CKTmode; @@ -59,7 +56,6 @@ NDEVload(GENmodel * inModel, CKTcircuit * ckt) /* loop through all the instances of the model */ for (here = model->NDEVinstances; here != NULL ; here=here->NDEVnextInstance) { - if (here->NDEVowner != ARCHme) continue; /* reveive terminal current and conductional matrix from device simulator */ for(i=0;iterm;i++) { @@ -90,7 +86,6 @@ int NDEVgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->NDEVnextModel) { for(here = model->NDEVinstances; here ; here = here->NDEVnextInstance) { - if (here->NDEVowner != ARCHme) continue; /* if(!here->DIOinitCondGiven) { here->DIOinitCond = diff --git a/src/spicelib/devices/numd/numdacld.c b/src/spicelib/devices/numd/numdacld.c index 23d28000d..5bbc0d470 100644 --- a/src/spicelib/devices/numd/numdacld.c +++ b/src/spicelib/devices/numd/numdacld.c @@ -41,7 +41,6 @@ NUMDacLoad(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if (inst->NUMDowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/numd/numddefs.h b/src/spicelib/devices/numd/numddefs.h index 43aba4745..4b833bdce 100644 --- a/src/spicelib/devices/numd/numddefs.h +++ b/src/spicelib/devices/numd/numddefs.h @@ -27,7 +27,6 @@ typedef struct sNUMDinstance { * of current model */ IFuid NUMDname; /* pointer to character string naming this * instance */ - int NUMDowner; /* number of owner process */ int NUMDstate; /* pointer to start of state vector for diode */ #define NUMDvoltage NUMDstate diff --git a/src/spicelib/devices/numd/numddump.c b/src/spicelib/devices/numd/numddump.c index 83bd98a3d..0b55e6992 100644 --- a/src/spicelib/devices/numd/numddump.c +++ b/src/spicelib/devices/numd/numddump.c @@ -59,7 +59,6 @@ NUMDdump(GENmodel *inModel, CKTcircuit *ckt) output = model->NUMDoutputs; for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if (inst->NUMDowner != ARCHme) continue; if (inst->NUMDprintGiven) { if ((ckt->CKTmode & MODETRAN) && @@ -147,7 +146,6 @@ NUMDacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file) output = model->NUMDoutputs; for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if (inst->NUMDowner != ARCHme) continue; if (output->OUTPstats) { ONEmemStats(file, inst->NUMDpDevice); diff --git a/src/spicelib/devices/numd/numdload.c b/src/spicelib/devices/numd/numdload.c index 2c6647e8d..aabb6de61 100644 --- a/src/spicelib/devices/numd/numdload.c +++ b/src/spicelib/devices/numd/numdload.c @@ -91,7 +91,6 @@ NUMDload(GENmodel *inModel, CKTcircuit *ckt) /* Now do instance things */ for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if (inst->NUMDowner != ARCHme) continue; pDevice = inst->NUMDpDevice; diff --git a/src/spicelib/devices/numd/numdpzld.c b/src/spicelib/devices/numd/numdpzld.c index 611aa28d8..695c9b20c 100644 --- a/src/spicelib/devices/numd/numdpzld.c +++ b/src/spicelib/devices/numd/numdpzld.c @@ -37,7 +37,6 @@ NUMDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if (inst->NUMDowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/numd/numdset.c b/src/spicelib/devices/numd/numdset.c index 73d04e085..5e4108e91 100644 --- a/src/spicelib/devices/numd/numdset.c +++ b/src/spicelib/devices/numd/numdset.c @@ -146,7 +146,6 @@ NUMDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if ((inst->NUMDowner != ARCHme)) goto matrixpointers; startTime = SPfrontEnd->IFseconds(); @@ -222,7 +221,6 @@ if ((inst->ptr = SMPmakeElt(matrix, inst->first, inst->second)) == NULL){\ return(E_NOMEM);\ } -matrixpointers: TSTALLOC(NUMDposPosPtr, NUMDposNode, NUMDposNode) TSTALLOC(NUMDnegNegPtr, NUMDnegNode, NUMDnegNode) TSTALLOC(NUMDnegPosPtr, NUMDnegNode, NUMDposNode) diff --git a/src/spicelib/devices/numd/numdtemp.c b/src/spicelib/devices/numd/numdtemp.c index 0ff7408f6..8ace41d1d 100644 --- a/src/spicelib/devices/numd/numdtemp.c +++ b/src/spicelib/devices/numd/numdtemp.c @@ -53,7 +53,6 @@ NUMDtemp(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if (inst->NUMDowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); diff --git a/src/spicelib/devices/numd/numdtrun.c b/src/spicelib/devices/numd/numdtrun.c index 047f1b3c7..9e8e20085 100644 --- a/src/spicelib/devices/numd/numdtrun.c +++ b/src/spicelib/devices/numd/numdtrun.c @@ -32,7 +32,6 @@ NUMDtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) model->NUMDpInfo->lteCoeff = computeLTECoeff(model->NUMDpInfo); for (inst = model->NUMDinstances; inst != NULL; inst = inst->NUMDnextInstance) { - if (inst->NUMDowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); deltaNew = ONEtrunc(inst->NUMDpDevice, model->NUMDpInfo, ckt->CKTdelta); diff --git a/src/spicelib/devices/numd2/nud2acld.c b/src/spicelib/devices/numd2/nud2acld.c index 85959b3c7..4c61c03cf 100644 --- a/src/spicelib/devices/numd2/nud2acld.c +++ b/src/spicelib/devices/numd2/nud2acld.c @@ -43,7 +43,6 @@ NUMD2acLoad(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/numd2/nud2dump.c b/src/spicelib/devices/numd2/nud2dump.c index 697d9c2f5..b2ddf1925 100644 --- a/src/spicelib/devices/numd2/nud2dump.c +++ b/src/spicelib/devices/numd2/nud2dump.c @@ -60,7 +60,6 @@ NUMD2dump(GENmodel *inModel, CKTcircuit *ckt) output = model->NUMD2outputs; for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) continue; if (inst->NUMD2printGiven) { if ((ckt->CKTmode & MODETRAN) && @@ -148,7 +147,6 @@ NUMD2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file) output = model->NUMD2outputs; for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) continue; if (output->OUTPstats) { TWOmemStats(file, inst->NUMD2pDevice); diff --git a/src/spicelib/devices/numd2/nud2load.c b/src/spicelib/devices/numd2/nud2load.c index 4b08de3e1..83bdd59b9 100644 --- a/src/spicelib/devices/numd2/nud2load.c +++ b/src/spicelib/devices/numd2/nud2load.c @@ -92,7 +92,6 @@ NUMD2load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) continue; pDevice = inst->NUMD2pDevice; diff --git a/src/spicelib/devices/numd2/nud2pzld.c b/src/spicelib/devices/numd2/nud2pzld.c index 8e5704c2f..3f7febdc1 100644 --- a/src/spicelib/devices/numd2/nud2pzld.c +++ b/src/spicelib/devices/numd2/nud2pzld.c @@ -39,7 +39,6 @@ NUMD2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/numd2/nud2set.c b/src/spicelib/devices/numd2/nud2set.c index 3ac349118..4273937cb 100644 --- a/src/spicelib/devices/numd2/nud2set.c +++ b/src/spicelib/devices/numd2/nud2set.c @@ -166,7 +166,6 @@ NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) goto matrixpointers; startTime = SPfrontEnd->IFseconds(); @@ -246,7 +245,6 @@ NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) if ((inst->ptr = SMPmakeElt(matrix, inst->first, inst->second)) == NULL){\ return(E_NOMEM);\ } -matrixpointers: TSTALLOC(NUMD2posPosPtr, NUMD2posNode, NUMD2posNode) TSTALLOC(NUMD2negNegPtr, NUMD2negNode, NUMD2negNode) TSTALLOC(NUMD2negPosPtr, NUMD2negNode, NUMD2posNode) diff --git a/src/spicelib/devices/numd2/nud2temp.c b/src/spicelib/devices/numd2/nud2temp.c index cdd3bddfa..39fad9c89 100644 --- a/src/spicelib/devices/numd2/nud2temp.c +++ b/src/spicelib/devices/numd2/nud2temp.c @@ -56,7 +56,6 @@ NUMD2temp(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); diff --git a/src/spicelib/devices/numd2/nud2trun.c b/src/spicelib/devices/numd2/nud2trun.c index 961649cea..4443861fd 100644 --- a/src/spicelib/devices/numd2/nud2trun.c +++ b/src/spicelib/devices/numd2/nud2trun.c @@ -33,7 +33,6 @@ NUMD2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) model->NUMD2pInfo->lteCoeff = computeLTECoeff(model->NUMD2pInfo); for (inst = model->NUMD2instances; inst != NULL; inst = inst->NUMD2nextInstance) { - if (inst->NUMD2owner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); deltaNew = TWOtrunc(inst->NUMD2pDevice, model->NUMD2pInfo, diff --git a/src/spicelib/devices/numd2/numd2def.h b/src/spicelib/devices/numd2/numd2def.h index 8c87ffdfc..75477d585 100644 --- a/src/spicelib/devices/numd2/numd2def.h +++ b/src/spicelib/devices/numd2/numd2def.h @@ -27,7 +27,6 @@ typedef struct sNUMD2instance { * of current model */ IFuid NUMD2name; /* pointer to character string naming this * instance */ - int NUMD2owner; /* number of owner process */ int NUMD2state; /* pointer to start of state vector for diode */ #define NUMD2voltage NUMD2state diff --git a/src/spicelib/devices/numos/nummacld.c b/src/spicelib/devices/numos/nummacld.c index d01688030..174d89f93 100644 --- a/src/spicelib/devices/numos/nummacld.c +++ b/src/spicelib/devices/numos/nummacld.c @@ -41,7 +41,6 @@ NUMOSacLoad(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/numos/nummdump.c b/src/spicelib/devices/numos/nummdump.c index 067db2cc4..0d96526dd 100644 --- a/src/spicelib/devices/numos/nummdump.c +++ b/src/spicelib/devices/numos/nummdump.c @@ -60,7 +60,6 @@ NUMOSdump(GENmodel *inModel, CKTcircuit *ckt) output = model->NUMOSoutputs; for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) continue; if (inst->NUMOSprintGiven) { if ((ckt->CKTmode & MODETRAN) && @@ -162,7 +161,6 @@ NUMOSacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file) output = model->NUMOSoutputs; for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) continue; if (output->OUTPstats) { TWOmemStats(file, inst->NUMOSpDevice); diff --git a/src/spicelib/devices/numos/nummload.c b/src/spicelib/devices/numos/nummload.c index 54660c234..1502a226e 100644 --- a/src/spicelib/devices/numos/nummload.c +++ b/src/spicelib/devices/numos/nummload.c @@ -93,7 +93,6 @@ NUMOSload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) continue; pDevice = inst->NUMOSpDevice; diff --git a/src/spicelib/devices/numos/nummpzld.c b/src/spicelib/devices/numos/nummpzld.c index 156f84984..f5cd3c433 100644 --- a/src/spicelib/devices/numos/nummpzld.c +++ b/src/spicelib/devices/numos/nummpzld.c @@ -38,7 +38,6 @@ NUMOSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); /* Get Temp.-Dep. Global Parameters */ diff --git a/src/spicelib/devices/numos/nummset.c b/src/spicelib/devices/numos/nummset.c index 0a16c6494..895901ba8 100644 --- a/src/spicelib/devices/numos/nummset.c +++ b/src/spicelib/devices/numos/nummset.c @@ -165,7 +165,6 @@ NUMOSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) goto matrixpointers; startTime = SPfrontEnd->IFseconds(); @@ -246,7 +245,6 @@ if ((inst->ptr = SMPmakeElt(matrix, inst->first, inst->second)) == NULL){\ return(E_NOMEM);\ } -matrixpointers: TSTALLOC(NUMOSdrainDrainPtr, NUMOSdrainNode, NUMOSdrainNode) TSTALLOC(NUMOSdrainSourcePtr, NUMOSdrainNode, NUMOSsourceNode) TSTALLOC(NUMOSdrainGatePtr, NUMOSdrainNode, NUMOSgateNode) diff --git a/src/spicelib/devices/numos/nummtemp.c b/src/spicelib/devices/numos/nummtemp.c index 18d585a3c..15f6611f3 100644 --- a/src/spicelib/devices/numos/nummtemp.c +++ b/src/spicelib/devices/numos/nummtemp.c @@ -57,7 +57,6 @@ NUMOStemp(GENmodel *inModel, CKTcircuit *ckt) for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); diff --git a/src/spicelib/devices/numos/nummtrun.c b/src/spicelib/devices/numos/nummtrun.c index 4aeb914f2..b44bd04f5 100644 --- a/src/spicelib/devices/numos/nummtrun.c +++ b/src/spicelib/devices/numos/nummtrun.c @@ -39,7 +39,6 @@ NUMOStrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) model->NUMOSpInfo->lteCoeff = computeLTECoeff(model->NUMOSpInfo); for (inst = model->NUMOSinstances; inst != NULL; inst = inst->NUMOSnextInstance) { - if (inst->NUMOSowner != ARCHme) continue; startTime = SPfrontEnd->IFseconds(); deltaNew = TWOtrunc(inst->NUMOSpDevice, model->NUMOSpInfo, diff --git a/src/spicelib/devices/numos/numosdef.h b/src/spicelib/devices/numos/numosdef.h index a09f696db..c0bd18ad6 100644 --- a/src/spicelib/devices/numos/numosdef.h +++ b/src/spicelib/devices/numos/numosdef.h @@ -27,7 +27,6 @@ typedef struct sNUMOSinstance { * of current model */ IFuid NUMOSname; /* pointer to character string naming this * instance */ - int NUMOSowner; /* number of owner process */ int NUMOSstate; /* pointer to start of state vector for * mosfet */ diff --git a/src/spicelib/devices/res/resdefs.h b/src/spicelib/devices/res/resdefs.h index 43232b455..18c701e76 100644 --- a/src/spicelib/devices/res/resdefs.h +++ b/src/spicelib/devices/res/resdefs.h @@ -24,7 +24,6 @@ typedef struct sRESinstance { * current model*/ IFuid RESname; /* pointer to character string naming this instance */ - int RESowner; /* number of owner process */ int RESstate; /* not used but needed for sructure consistency */ int RESposNode; /* number of positive node of resistor */ int RESnegNode; /* number of negative node of resistor */ diff --git a/src/spicelib/devices/res/resload.c b/src/spicelib/devices/res/resload.c index 1d05cf61a..d5167efd1 100644 --- a/src/spicelib/devices/res/resload.c +++ b/src/spicelib/devices/res/resload.c @@ -33,8 +33,6 @@ RESload(GENmodel *inModel, CKTcircuit *ckt) if(!here->REStc2Given) here->REStc2 = 0.0; if(!here->RESmGiven) here->RESm = 1.0; - if (here->RESowner != ARCHme) continue; - here->REScurrent = (*(ckt->CKTrhsOld+here->RESposNode) - *(ckt->CKTrhsOld+here->RESnegNode)) * here->RESconduct; @@ -77,8 +75,6 @@ RESacload(GENmodel *inModel, CKTcircuit *ckt) if(!here->REStc1Given) here->REStc1 = 0.0; if(!here->REStc2Given) here->REStc2 = 0.0; if(!here->RESmGiven) here->RESm = 1.0; - - if (here->RESowner != ARCHme) continue; difference = (here->REStemp + here->RESdtemp) - 300.15; factor = 1.0 + (here->REStc1)*difference + diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c index 1a7d6b723..a658c998e 100644 --- a/src/spicelib/devices/res/resnoise.c +++ b/src/spicelib/devices/res/resnoise.c @@ -57,8 +57,6 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (inst = model->RESinstances; inst != NULL; inst = inst->RESnextInstance) { - if (inst->RESowner != ARCHme) continue; - if(!inst->RESnoisy) continue; /* Quiet resistors are skipped */ switch (operation) { diff --git a/src/spicelib/devices/res/respzld.c b/src/spicelib/devices/res/respzld.c index ee0fea6a5..9f9fd8d91 100644 --- a/src/spicelib/devices/res/respzld.c +++ b/src/spicelib/devices/res/respzld.c @@ -32,8 +32,6 @@ RESpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - - if (here->RESowner != ARCHme) continue; m = here->RESm; diff --git a/src/spicelib/devices/res/ressacl.c b/src/spicelib/devices/res/ressacl.c index 5077988b9..a03928939 100644 --- a/src/spicelib/devices/res/ressacl.c +++ b/src/spicelib/devices/res/ressacl.c @@ -32,7 +32,6 @@ RESsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - if (here->RESowner != ARCHme) continue; if(here->RESsenParmNo){ vres = *(ckt->CKTrhsOld+here->RESposNode) - diff --git a/src/spicelib/devices/res/ressload.c b/src/spicelib/devices/res/ressload.c index c37760e2c..dec57eb75 100644 --- a/src/spicelib/devices/res/ressload.c +++ b/src/spicelib/devices/res/ressload.c @@ -30,8 +30,6 @@ RESsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - - if (here->RESowner != ARCHme) continue; if(here->RESsenParmNo){ vres = *(ckt->CKTrhsOld+here->RESposNode) - diff --git a/src/spicelib/devices/res/ressprt.c b/src/spicelib/devices/res/ressprt.c index dcca56c83..cec815e44 100644 --- a/src/spicelib/devices/res/ressprt.c +++ b/src/spicelib/devices/res/ressprt.c @@ -31,8 +31,6 @@ RESsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - - if (here->RESowner != ARCHme) continue; printf(" Instance name:%s\n",here->RESname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/res/ressset.c b/src/spicelib/devices/res/ressset.c index 7c47c9754..f8b61a3d8 100644 --- a/src/spicelib/devices/res/ressset.c +++ b/src/spicelib/devices/res/ressset.c @@ -28,8 +28,6 @@ RESsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - - if (here->RESowner != ARCHme) continue; if(here->RESsenParmNo){ here->RESsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/res/restemp.c b/src/spicelib/devices/res/restemp.c index 26078ac8a..f1581cf4f 100644 --- a/src/spicelib/devices/res/restemp.c +++ b/src/spicelib/devices/res/restemp.c @@ -42,8 +42,6 @@ REStemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->RESinstances; here != NULL ; here=here->RESnextInstance) { - - if (here->RESowner != ARCHme) continue; /* Default Value Processing for Resistor Instance */ diff --git a/src/spicelib/devices/soi3/soi3acld.c b/src/spicelib/devices/soi3/soi3acld.c index 1bc784ca6..1997798f9 100644 --- a/src/spicelib/devices/soi3/soi3acld.c +++ b/src/spicelib/devices/soi3/soi3acld.c @@ -80,9 +80,6 @@ SOI3acLoad(GENmodel *inModel, CKTcircuit *ckt) for(here = model->SOI3instances; here!= NULL; here = here->SOI3nextInstance) { - - if (here->SOI3owner != ARCHme) - continue; if (here->SOI3mode < 0) { diff --git a/src/spicelib/devices/soi3/soi3conv.c b/src/spicelib/devices/soi3/soi3conv.c index f02b63996..9c1753fb8 100644 --- a/src/spicelib/devices/soi3/soi3conv.c +++ b/src/spicelib/devices/soi3/soi3conv.c @@ -61,9 +61,6 @@ SOI3convTest(GENmodel *inModel, CKTcircuit *ckt) for(here = model->SOI3instances; here!= NULL; here = here->SOI3nextInstance) { - if (here->SOI3owner != ARCHme) - continue; - vbs = model->SOI3type * ( *(ckt->CKTrhs+here->SOI3bNode) - *(ckt->CKTrhs+here->SOI3sNodePrime)); diff --git a/src/spicelib/devices/soi3/soi3defs.h b/src/spicelib/devices/soi3/soi3defs.h index 3c246e8bb..89ab69668 100644 --- a/src/spicelib/devices/soi3/soi3defs.h +++ b/src/spicelib/devices/soi3/soi3defs.h @@ -41,7 +41,6 @@ typedef struct sSOI3instance { struct sSOI3instance *SOI3nextInstance; /* pointer to next instance of *current model*/ IFuid SOI3name; /* pointer to character string naming this instance */ - int SOI3owner; /* number of owner process */ int SOI3states; /* index into state table for this device */ diff --git a/src/spicelib/devices/soi3/soi3ic.c b/src/spicelib/devices/soi3/soi3ic.c index 2cfc21f1b..bad6a2f82 100644 --- a/src/spicelib/devices/soi3/soi3ic.c +++ b/src/spicelib/devices/soi3/soi3ic.c @@ -39,9 +39,6 @@ SOI3getic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->SOI3nextModel) { for(here = model->SOI3instances; here ; here = here->SOI3nextInstance) { - - if (here->SOI3owner != ARCHme) - continue; if(!here->SOI3icVBSGiven) { here->SOI3icVBS = diff --git a/src/spicelib/devices/soi3/soi3load.c b/src/spicelib/devices/soi3/soi3load.c index 4d3808a23..cab4b2b02 100644 --- a/src/spicelib/devices/soi3/soi3load.c +++ b/src/spicelib/devices/soi3/soi3load.c @@ -162,9 +162,6 @@ SOI3load(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->SOI3instances; here != NULL ; here=here->SOI3nextInstance) { - - if (here->SOI3owner != ARCHme) - continue; vt = CONSTKoverQ * here->SOI3temp; Check=1; diff --git a/src/spicelib/devices/soi3/soi3nois.c b/src/spicelib/devices/soi3/soi3nois.c index 46cee8fe8..14b010ba1 100644 --- a/src/spicelib/devices/soi3/soi3nois.c +++ b/src/spicelib/devices/soi3/soi3nois.c @@ -73,9 +73,6 @@ SOI3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, for (model=firstModel; model != NULL; model=model->SOI3nextModel) { for (inst=model->SOI3instances; inst != NULL; inst=inst->SOI3nextInstance) { - if (inst->SOI3owner != ARCHme) - continue; - switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/soi3/soi3set.c b/src/spicelib/devices/soi3/soi3set.c index 4622244e0..ab4cd1ef3 100644 --- a/src/spicelib/devices/soi3/soi3set.c +++ b/src/spicelib/devices/soi3/soi3set.c @@ -325,9 +325,6 @@ SOI3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here->SOI3gMd = 0.0; here->SOI3gMdeltaT = 0.0; - if (here->SOI3owner == ARCHme) - { - /* allocate a chunk of the state vector */ here->SOI3states = *states; *states += SOI3numStates; @@ -335,7 +332,6 @@ SOI3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) *states += 10 * (ckt->CKTsenInfo->SENparms); } */ - } /****** Part 4 - check resistance values for internal nodes, ******/ /****** to see which internal nodes need to be created. ******/ diff --git a/src/spicelib/devices/soi3/soi3temp.c b/src/spicelib/devices/soi3/soi3temp.c index 854c6eda1..db75eed0a 100644 --- a/src/spicelib/devices/soi3/soi3temp.c +++ b/src/spicelib/devices/soi3/soi3temp.c @@ -310,10 +310,6 @@ SOI3temp(GENmodel *inModel, CKTcircuit *ckt) double arg; /* 1 - fc */ double sarg; /* (1-fc) ^^ (-mj) */ - - if (here->SOI3owner != ARCHme) - continue; - /* perform the parameter defaulting */ /* JimB - if device temperature not given, OR, if self-heating switched */ diff --git a/src/spicelib/devices/soi3/soi3trun.c b/src/spicelib/devices/soi3/soi3trun.c index 74b78889b..36d603cc9 100644 --- a/src/spicelib/devices/soi3/soi3trun.c +++ b/src/spicelib/devices/soi3/soi3trun.c @@ -37,10 +37,6 @@ SOI3trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) { for(here=model->SOI3instances;here!=NULL;here = here->SOI3nextInstance) { - - if (here->SOI3owner != ARCHme) - continue; - CKTterr(here->SOI3qgf,ckt,timeStep); CKTterr(here->SOI3qd,ckt,timeStep); CKTterr(here->SOI3qs,ckt,timeStep); diff --git a/src/spicelib/devices/sw/swacload.c b/src/spicelib/devices/sw/swacload.c index 43f6d5a01..a6b1f3d12 100644 --- a/src/spicelib/devices/sw/swacload.c +++ b/src/spicelib/devices/sw/swacload.c @@ -30,7 +30,6 @@ SWacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->SWinstances; here != NULL ; here=here->SWnextInstance) { - if (here->SWowner != ARCHme) continue; /* In AC analysis, just propogate the state... */ diff --git a/src/spicelib/devices/sw/swdefs.h b/src/spicelib/devices/sw/swdefs.h index e77ee7b51..ce3c89d44 100644 --- a/src/spicelib/devices/sw/swdefs.h +++ b/src/spicelib/devices/sw/swdefs.h @@ -23,7 +23,6 @@ typedef struct sSWinstance { struct sSWinstance *SWnextInstance; /* pointer to next instance of * current model*/ IFuid SWname; /* pointer to character string naming this instance */ - int SWowner; /* number of owner process */ int SWstate; /* pointer to start of switch's section of state vector */ int SWposNode; /* number of positive node of switch */ diff --git a/src/spicelib/devices/sw/swload.c b/src/spicelib/devices/sw/swload.c index 918721d12..178cd8f98 100644 --- a/src/spicelib/devices/sw/swload.c +++ b/src/spicelib/devices/sw/swload.c @@ -36,7 +36,6 @@ SWload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->SWinstances; here != NULL ; here=here->SWnextInstance) { - if (here->SWowner != ARCHme) continue; old_current_state = *(ckt->CKTstates[0] + here->SWstate); previous_state = *(ckt->CKTstates[1] + here->SWstate); diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c index 723189b96..b7f1e7b3a 100644 --- a/src/spicelib/devices/sw/swnoise.c +++ b/src/spicelib/devices/sw/swnoise.c @@ -39,7 +39,6 @@ SWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *da for (model=firstModel; model != NULL; model=model->SWnextModel) { for (inst=model->SWinstances; inst != NULL; inst=inst->SWnextInstance) { - if (inst->SWowner != ARCHme) continue; switch (operation) { diff --git a/src/spicelib/devices/sw/swpzload.c b/src/spicelib/devices/sw/swpzload.c index 07db97c46..3199c9a52 100644 --- a/src/spicelib/devices/sw/swpzload.c +++ b/src/spicelib/devices/sw/swpzload.c @@ -34,7 +34,6 @@ SWpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->SWinstances; here != NULL ; here=here->SWnextInstance) { - if (here->SWowner != ARCHme) continue; /* In AC analysis, just propogate the state... */ diff --git a/src/spicelib/devices/sw/swsetup.c b/src/spicelib/devices/sw/swsetup.c index bf7a0eb80..44b0f803e 100644 --- a/src/spicelib/devices/sw/swsetup.c +++ b/src/spicelib/devices/sw/swsetup.c @@ -43,7 +43,6 @@ SWsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) /* loop through all the instances of the model */ for (here = model->SWinstances; here != NULL ; here=here->SWnextInstance) { - if (here->SWowner != ARCHme) goto matrixpointers; here->SWstate = *states; *states += SW_NUM_STATES; @@ -57,7 +56,6 @@ if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ return(E_NOMEM);\ } -matrixpointers: TSTALLOC(SWposPosptr, SWposNode, SWposNode) TSTALLOC(SWposNegptr, SWposNode, SWnegNode) TSTALLOC(SWnegPosptr, SWnegNode, SWposNode) diff --git a/src/spicelib/devices/tra/traacct.c b/src/spicelib/devices/tra/traacct.c index ea5d3ffa4..465e7c8b4 100644 --- a/src/spicelib/devices/tra/traacct.c +++ b/src/spicelib/devices/tra/traacct.c @@ -30,7 +30,6 @@ TRAaccept(CKTcircuit *ckt, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->TRAinstances; here != NULL ; here=here->TRAnextInstance) { - if (here->TRAowner != ARCHme) continue; /* XXX */ if( (ckt->CKTtime - here->TRAtd) > *(here->TRAdelays+6)) { /* shift! */ diff --git a/src/spicelib/devices/tra/traacld.c b/src/spicelib/devices/tra/traacld.c index 62a8e14fe..44d429a8f 100644 --- a/src/spicelib/devices/tra/traacld.c +++ b/src/spicelib/devices/tra/traacld.c @@ -26,7 +26,6 @@ TRAacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->TRAinstances; here != NULL ; here=here->TRAnextInstance) { - if (here->TRAowner != ARCHme) continue; real = cos(-ckt->CKTomega*here->TRAtd); imag = sin(-ckt->CKTomega*here->TRAtd); diff --git a/src/spicelib/devices/tra/tradefs.h b/src/spicelib/devices/tra/tradefs.h index 5f566ade6..2da7d66aa 100644 --- a/src/spicelib/devices/tra/tradefs.h +++ b/src/spicelib/devices/tra/tradefs.h @@ -22,7 +22,6 @@ typedef struct sTRAinstance { struct sTRAinstance *TRAnextInstance; /* pointer to next instance of * current model*/ IFuid TRAname; /* pointer to character string naming this instance */ - int TRAowner; /* number of owner process */ int TRAstate; /* not used */ int TRAposNode1; /* number of positive node of end 1 of t. line */ int TRAnegNode1; /* number of negative node of end 1 of t. line */ diff --git a/src/spicelib/devices/tra/traload.c b/src/spicelib/devices/tra/traload.c index a3a9eb51a..e13615030 100644 --- a/src/spicelib/devices/tra/traload.c +++ b/src/spicelib/devices/tra/traload.c @@ -32,7 +32,6 @@ TRAload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->TRAinstances; here != NULL ; here=here->TRAnextInstance) { - if (here->TRAowner != ARCHme) continue; *(here->TRApos1Pos1Ptr) += here->TRAconduct; *(here->TRApos1Int1Ptr) -= here->TRAconduct; diff --git a/src/spicelib/devices/tra/tratemp.c b/src/spicelib/devices/tra/tratemp.c index 8e987dd1d..ed0885d14 100644 --- a/src/spicelib/devices/tra/tratemp.c +++ b/src/spicelib/devices/tra/tratemp.c @@ -31,7 +31,6 @@ TRAtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->TRAinstances; here != NULL ; here=here->TRAnextInstance) { - if (here->TRAowner != ARCHme) continue; if(!here->TRAtdGiven) { here->TRAtd = here->TRAnl/here->TRAf; diff --git a/src/spicelib/devices/tra/tratrunc.c b/src/spicelib/devices/tra/tratrunc.c index 3a049c01b..291687e39 100644 --- a/src/spicelib/devices/tra/tratrunc.c +++ b/src/spicelib/devices/tra/tratrunc.c @@ -28,7 +28,6 @@ TRAtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) /* loop through all the instances of the model */ for (here = model->TRAinstances; here != NULL ; here=here->TRAnextInstance) { - if (here->TRAowner != ARCHme) continue; v1 = ( *(ckt->CKTrhsOld + here->TRAposNode2) - *(ckt->CKTrhsOld + here->TRAnegNode2)) diff --git a/src/spicelib/devices/txl/txldefs.h b/src/spicelib/devices/txl/txldefs.h index 12dce940c..c1dc5178d 100644 --- a/src/spicelib/devices/txl/txldefs.h +++ b/src/spicelib/devices/txl/txldefs.h @@ -16,7 +16,6 @@ typedef struct sTXLinstance { * current model*/ IFuid TXLname; /* pointer to character string naming this instance */ - int TXLowner; /* number of owner process */ int dimensions; /* may we not need this but ... */ int TXLposNode; diff --git a/src/spicelib/devices/urc/urcdefs.h b/src/spicelib/devices/urc/urcdefs.h index cb8ee766b..e2e02687a 100644 --- a/src/spicelib/devices/urc/urcdefs.h +++ b/src/spicelib/devices/urc/urcdefs.h @@ -23,7 +23,6 @@ typedef struct sURCinstance { struct sURCinstance *URCnextInstance; /* pointer to next instance of * current model*/ IFuid URCname; /* pointer to character string naming this instance */ - int URCowner; /* number of owner process */ int URCstate; /* not used */ int URCposNode; /* number of positive node of URC */ int URCnegNode; /* number of negative node of URC */ diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c index a950c38fa..50135e6d9 100644 --- a/src/spicelib/devices/urc/urcsetup.c +++ b/src/spicelib/devices/urc/urcsetup.c @@ -163,7 +163,6 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) ptemp.rValue = r; error = CKTpName("resistance",&ptemp,ckt,rtype,nameelt,&fast); if(error) return(error); - fast->GENowner = here->URCowner; nameelt = TMALLOC(char, 10); (void)sprintf(nameelt,"rhi%d",i); @@ -180,7 +179,6 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) ptemp.rValue = r; error = CKTpName("resistance",&ptemp,ckt,rtype,nameelt,&fast); if(error) return(error); - fast->GENowner = here->URCowner; if(model->URCisPerLGiven) { /* use diode */ @@ -201,7 +199,6 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) ptemp.rValue = prop; error = CKTpName("area",&ptemp,ckt,dtype,nameelt,&fast); if(error) return(error); - fast->GENowner = here->URCowner; } else { /* use simple capacitor */ nameelt = TMALLOC(char, 10); @@ -221,7 +218,6 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) error = CKTpName("capacitance",&ptemp,ckt,ctype,nameelt, &fast); if(error) return(error); - fast->GENowner = here->URCowner; } if(i!=here->URClumps){ @@ -244,7 +240,6 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) ptemp.rValue = prop; error=CKTpName("area",&ptemp,ckt,dtype,nameelt,&fast); if(error) return(error); - fast->GENowner = here->URCowner; } else { /* use simple capacitor */ nameelt = TMALLOC(char, 10); @@ -265,7 +260,6 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) error =CKTpName("capacitance",&ptemp,ckt,ctype,nameelt, &fast); if(error) return(error); - fast->GENowner = here->URCowner; } } prop *= p; diff --git a/src/spicelib/devices/vbic/vbicacld.c b/src/spicelib/devices/vbic/vbicacld.c index 03a8afdec..fb4fab30c 100644 --- a/src/spicelib/devices/vbic/vbicacld.c +++ b/src/spicelib/devices/vbic/vbicacld.c @@ -38,8 +38,6 @@ VBICacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for( here = model->VBICinstances; here!= NULL; here = here->VBICnextInstance) { - - if (here->VBICowner != ARCHme) continue; Ibe_Vbei = *(ckt->CKTstate0 + here->VBICibe_Vbei); Ibex_Vbex = *(ckt->CKTstate0 + here->VBICibex_Vbex); diff --git a/src/spicelib/devices/vbic/vbicconv.c b/src/spicelib/devices/vbic/vbicconv.c index aca8cafce..0118caa40 100644 --- a/src/spicelib/devices/vbic/vbicconv.c +++ b/src/spicelib/devices/vbic/vbicconv.c @@ -48,8 +48,6 @@ VBICconvTest(GENmodel *inModel, CKTcircuit *ckt) for( ; model != NULL; model = model->VBICnextModel) { for(here=model->VBICinstances;here!=NULL;here = here->VBICnextInstance) { - if (here->VBICowner != ARCHme) continue; - Vbei=model->VBICtype*( *(ckt->CKTrhsOld+here->VBICbaseBINode)- *(ckt->CKTrhsOld+here->VBICemitEINode)); diff --git a/src/spicelib/devices/vbic/vbicdefs.h b/src/spicelib/devices/vbic/vbicdefs.h index 53cff2ff1..2fa552a51 100644 --- a/src/spicelib/devices/vbic/vbicdefs.h +++ b/src/spicelib/devices/vbic/vbicdefs.h @@ -23,7 +23,6 @@ typedef struct sVBICinstance { struct sVBICinstance *VBICnextInstance; /* pointer to next instance of current model*/ IFuid VBICname; /* pointer to character string naming this instance */ - int VBICowner; /* number of owner process */ int VBICstate; /* pointer to start of state vector for vbic */ int VBICcollNode; /* number of collector node of vbic */ diff --git a/src/spicelib/devices/vbic/vbicgetic.c b/src/spicelib/devices/vbic/vbicgetic.c index 405c9a4e2..4d2db6dd1 100644 --- a/src/spicelib/devices/vbic/vbicgetic.c +++ b/src/spicelib/devices/vbic/vbicgetic.c @@ -31,8 +31,6 @@ VBICgetic(GENmodel *inModel, CKTcircuit *ckt) for( ; model ; model = model->VBICnextModel) { for(here = model->VBICinstances; here ; here = here->VBICnextInstance) { - if (here->VBICowner != ARCHme) continue; - if(!here->VBICicVBEGiven) { here->VBICicVBE = *(ckt->CKTrhs + here->VBICbaseNode) - diff --git a/src/spicelib/devices/vbic/vbicload.c b/src/spicelib/devices/vbic/vbicload.c index 935c7d27f..2a1890cc8 100644 --- a/src/spicelib/devices/vbic/vbicload.c +++ b/src/spicelib/devices/vbic/vbicload.c @@ -91,8 +91,6 @@ VBICload(GENmodel *inModel, CKTcircuit *ckt) for (here = model->VBICinstances; here != NULL ; here=here->VBICnextInstance) { - if (here->VBICowner != ARCHme) continue; - vt = here->VBICtemp * CONSTKoverQ; if(ckt->CKTsenInfo){ diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c index d04d5173a..367d55cc7 100644 --- a/src/spicelib/devices/vbic/vbicnoise.c +++ b/src/spicelib/devices/vbic/vbicnoise.c @@ -63,8 +63,6 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * for (inst=model->VBICinstances; inst != NULL; inst=inst->VBICnextInstance) { - if (inst->VBICowner != ARCHme) continue; - switch (operation) { case N_OPEN: diff --git a/src/spicelib/devices/vbic/vbicpzld.c b/src/spicelib/devices/vbic/vbicpzld.c index 875e4cebc..a70387a0f 100644 --- a/src/spicelib/devices/vbic/vbicpzld.c +++ b/src/spicelib/devices/vbic/vbicpzld.c @@ -39,8 +39,6 @@ VBICpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) for( here = model->VBICinstances; here!= NULL; here = here->VBICnextInstance) { - if (here->VBICowner != ARCHme) continue; - Ibe_Vbei = *(ckt->CKTstate0 + here->VBICibe_Vbei); Ibex_Vbex = *(ckt->CKTstate0 + here->VBICibex_Vbex); Itzf_Vbei = *(ckt->CKTstate0 + here->VBICitzf_Vbei); diff --git a/src/spicelib/devices/vbic/vbicsetup.c b/src/spicelib/devices/vbic/vbicsetup.c index 16c12cd66..b233105c5 100644 --- a/src/spicelib/devices/vbic/vbicsetup.c +++ b/src/spicelib/devices/vbic/vbicsetup.c @@ -375,9 +375,6 @@ VBICsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmpNode; IFuid tmpName; - if (here->VBICowner != ARCHme) - goto matrixpointers; - if(!here->VBICareaGiven) { here->VBICarea = 1.0; } @@ -394,7 +391,6 @@ VBICsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) *states += 8 * (ckt->CKTsenInfo->SENparms); } -matrixpointers: if(model->VBICextCollResist == 0) { here->VBICcollCXNode = here->VBICcollNode; } else if(here->VBICcollCXNode == 0) { diff --git a/src/spicelib/devices/vbic/vbictemp.c b/src/spicelib/devices/vbic/vbictemp.c index 6f05e5c6f..c97114273 100644 --- a/src/spicelib/devices/vbic/vbictemp.c +++ b/src/spicelib/devices/vbic/vbictemp.c @@ -71,8 +71,6 @@ VBICtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VBICinstances; here != NULL ; here=here->VBICnextInstance) { - - if (here->VBICowner != ARCHme) continue; if(!here->VBICtempGiven) here->VBICtemp = ckt->CKTtemp; diff --git a/src/spicelib/devices/vbic/vbictrunc.c b/src/spicelib/devices/vbic/vbictrunc.c index 3e3636f30..ecda4b98b 100644 --- a/src/spicelib/devices/vbic/vbictrunc.c +++ b/src/spicelib/devices/vbic/vbictrunc.c @@ -26,7 +26,6 @@ VBICtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) for( ; model != NULL; model = model->VBICnextModel) { for(here=model->VBICinstances;here!=NULL; here = here->VBICnextInstance){ - if (here->VBICowner != ARCHme) continue; CKTterr(here->VBICqbe,ckt,timeStep); CKTterr(here->VBICqbex,ckt,timeStep); diff --git a/src/spicelib/devices/vccs/vccsdefs.h b/src/spicelib/devices/vccs/vccsdefs.h index 60001b0c8..9faed4161 100644 --- a/src/spicelib/devices/vccs/vccsdefs.h +++ b/src/spicelib/devices/vccs/vccsdefs.h @@ -22,7 +22,6 @@ typedef struct sVCCSinstance { struct sVCCSinstance *VCCSnextInstance; /* pointer to next instance of *current model*/ IFuid VCCSname; /* pointer to character string naming this instance */ - int VCCSowner; /* number of owner process */ int VCCSstates; /* state info */ int VCCSposNode; /* number of positive node of source */ diff --git a/src/spicelib/devices/vccs/vccsload.c b/src/spicelib/devices/vccs/vccsload.c index 7f56a034b..15e85f4cc 100644 --- a/src/spicelib/devices/vccs/vccsload.c +++ b/src/spicelib/devices/vccs/vccsload.c @@ -31,7 +31,6 @@ VCCSload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCCSinstances; here != NULL ; here=here->VCCSnextInstance) { - if (here->VCCSowner != ARCHme) continue; *(here->VCCSposContPosptr) += here->VCCScoeff ; *(here->VCCSposContNegptr) -= here->VCCScoeff ; diff --git a/src/spicelib/devices/vccs/vccspzld.c b/src/spicelib/devices/vccs/vccspzld.c index e4c248f5f..e27d3cbb4 100644 --- a/src/spicelib/devices/vccs/vccspzld.c +++ b/src/spicelib/devices/vccs/vccspzld.c @@ -33,7 +33,6 @@ VCCSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->VCCSinstances; here != NULL ; here=here->VCCSnextInstance) { - if (here->VCCSowner != ARCHme) continue; *(here->VCCSposContPosptr) += here->VCCScoeff ; *(here->VCCSposContNegptr) -= here->VCCScoeff ; diff --git a/src/spicelib/devices/vccs/vccssacl.c b/src/spicelib/devices/vccs/vccssacl.c index 865b5379f..f6c7eb1c0 100644 --- a/src/spicelib/devices/vccs/vccssacl.c +++ b/src/spicelib/devices/vccs/vccssacl.c @@ -33,7 +33,6 @@ VCCSsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCCSinstances; here != NULL ; here=here->VCCSnextInstance) { - if (here->VCCSowner != ARCHme) continue; if (here->VCCSsenParmNo){ vc = *(ckt->CKTrhsOld + here->VCCScontPosNode) diff --git a/src/spicelib/devices/vccs/vccssld.c b/src/spicelib/devices/vccs/vccssld.c index e19c9d43e..ca0f18866 100644 --- a/src/spicelib/devices/vccs/vccssld.c +++ b/src/spicelib/devices/vccs/vccssld.c @@ -31,7 +31,6 @@ VCCSsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCCSinstances; here != NULL ; here=here->VCCSnextInstance) { - if (here->VCCSowner != ARCHme) continue; if(here->VCCSsenParmNo){ vc = *(ckt->CKTrhsOld + here->VCCScontPosNode) diff --git a/src/spicelib/devices/vccs/vccssprt.c b/src/spicelib/devices/vccs/vccssprt.c index b16112ff7..939bac3b8 100644 --- a/src/spicelib/devices/vccs/vccssprt.c +++ b/src/spicelib/devices/vccs/vccssprt.c @@ -33,7 +33,6 @@ VCCSsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCCSinstances; here != NULL ; here=here->VCCSnextInstance) { - if (here->VCCSowner != ARCHme) continue; printf(" Instance name:%s\n",here->VCCSname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/vccs/vccssset.c b/src/spicelib/devices/vccs/vccssset.c index 4dd389a03..b4a444481 100644 --- a/src/spicelib/devices/vccs/vccssset.c +++ b/src/spicelib/devices/vccs/vccssset.c @@ -30,7 +30,6 @@ VCCSsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->VCCSinstances; here != NULL ; here=here->VCCSnextInstance) { - if (here->VCCSowner != ARCHme) continue; if(here->VCCSsenParmNo){ here->VCCSsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/vcvs/vcvsdefs.h b/src/spicelib/devices/vcvs/vcvsdefs.h index d08628f41..6073121c8 100644 --- a/src/spicelib/devices/vcvs/vcvsdefs.h +++ b/src/spicelib/devices/vcvs/vcvsdefs.h @@ -23,7 +23,6 @@ typedef struct sVCVSinstance { struct sVCVSinstance *VCVSnextInstance; /* pointer to next instance of *current model*/ IFuid VCVSname; /* pointer to character string naming this instance */ - int VCVSowner; /* number of owner process */ int VCVSstates; /* state info */ int VCVSposNode; /* number of positive node of source */ diff --git a/src/spicelib/devices/vcvs/vcvsload.c b/src/spicelib/devices/vcvs/vcvsload.c index e4fb09312..81a154b80 100644 --- a/src/spicelib/devices/vcvs/vcvsload.c +++ b/src/spicelib/devices/vcvs/vcvsload.c @@ -30,7 +30,6 @@ VCVSload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCVSinstances; here != NULL ; here=here->VCVSnextInstance) { - if (here->VCVSowner != ARCHme) continue; *(here->VCVSposIbrptr) += 1.0 ; *(here->VCVSnegIbrptr) -= 1.0 ; diff --git a/src/spicelib/devices/vcvs/vcvspzld.c b/src/spicelib/devices/vcvs/vcvspzld.c index 4d0bf52e2..7978e265f 100644 --- a/src/spicelib/devices/vcvs/vcvspzld.c +++ b/src/spicelib/devices/vcvs/vcvspzld.c @@ -32,7 +32,6 @@ VCVSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->VCVSinstances; here != NULL ; here=here->VCVSnextInstance) { - if (here->VCVSowner != ARCHme) continue; *(here->VCVSposIbrptr) += 1.0 ; *(here->VCVSnegIbrptr) -= 1.0 ; diff --git a/src/spicelib/devices/vcvs/vcvssacl.c b/src/spicelib/devices/vcvs/vcvssacl.c index 162a65abc..614925d1a 100644 --- a/src/spicelib/devices/vcvs/vcvssacl.c +++ b/src/spicelib/devices/vcvs/vcvssacl.c @@ -30,7 +30,6 @@ VCVSsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCVSinstances; here != NULL ; here=here->VCVSnextInstance) { - if (here->VCVSowner != ARCHme) continue; if(here->VCVSsenParmNo){ diff --git a/src/spicelib/devices/vcvs/vcvssld.c b/src/spicelib/devices/vcvs/vcvssld.c index df58f466e..9de63b0dd 100644 --- a/src/spicelib/devices/vcvs/vcvssld.c +++ b/src/spicelib/devices/vcvs/vcvssld.c @@ -29,7 +29,6 @@ VCVSsLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCVSinstances; here != NULL ; here=here->VCVSnextInstance) { - if (here->VCVSowner != ARCHme) continue; if(here->VCVSsenParmNo){ diff --git a/src/spicelib/devices/vcvs/vcvssprt.c b/src/spicelib/devices/vcvs/vcvssprt.c index 35daa17fa..81789c5de 100644 --- a/src/spicelib/devices/vcvs/vcvssprt.c +++ b/src/spicelib/devices/vcvs/vcvssprt.c @@ -31,7 +31,6 @@ VCVSsPrint(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VCVSinstances; here != NULL ; here=here->VCVSnextInstance) { - if (here->VCVSowner != ARCHme) continue; printf(" Instance name:%s\n",here->VCVSname); printf(" Positive, negative nodes: %s, %s\n", diff --git a/src/spicelib/devices/vcvs/vcvssset.c b/src/spicelib/devices/vcvs/vcvssset.c index 45139723a..71b57d02d 100644 --- a/src/spicelib/devices/vcvs/vcvssset.c +++ b/src/spicelib/devices/vcvs/vcvssset.c @@ -29,7 +29,6 @@ VCVSsSetup(SENstruct *info, GENmodel *inModel) /* loop through all the instances of the model */ for (here = model->VCVSinstances; here != NULL ; here=here->VCVSnextInstance) { - if (here->VCVSowner != ARCHme) continue; if(here->VCVSsenParmNo){ here->VCVSsenParmNo = ++(info->SENparms); diff --git a/src/spicelib/devices/vsrc/vsrcacld.c b/src/spicelib/devices/vsrc/vsrcacld.c index 5b6a81bb1..5b7b9058b 100644 --- a/src/spicelib/devices/vsrc/vsrcacld.c +++ b/src/spicelib/devices/vsrc/vsrcacld.c @@ -21,7 +21,6 @@ VSRCacLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VSRCinstances; here != NULL ; here=here->VSRCnextInstance) { - if (here->VSRCowner != ARCHme) continue; *(here->VSRCposIbrptr) += 1.0 ; *(here->VSRCnegIbrptr) -= 1.0 ; diff --git a/src/spicelib/devices/vsrc/vsrcdefs.h b/src/spicelib/devices/vsrc/vsrcdefs.h index 90b81edca..d8f71ec5e 100644 --- a/src/spicelib/devices/vsrc/vsrcdefs.h +++ b/src/spicelib/devices/vsrc/vsrcdefs.h @@ -25,7 +25,6 @@ typedef struct sVSRCinstance { struct sVSRCinstance *VSRCnextInstance; /* pointer to next instance of *current model */ IFuid VSRCname; /* pointer to character string naming this instance */ - int VSRCowner; /* number of owner process */ int VSRCstate; /* not used */ int VSRCposNode; /* number of positive node of source */ diff --git a/src/spicelib/devices/vsrc/vsrcload.c b/src/spicelib/devices/vsrc/vsrcload.c index 671e0e9ce..29926a06e 100644 --- a/src/spicelib/devices/vsrc/vsrcload.c +++ b/src/spicelib/devices/vsrc/vsrcload.c @@ -35,7 +35,6 @@ VSRCload(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VSRCinstances; here != NULL ; here=here->VSRCnextInstance) { - if (here->VSRCowner != ARCHme) continue; *(here->VSRCposIbrptr) += 1.0 ; *(here->VSRCnegIbrptr) -= 1.0 ; diff --git a/src/spicelib/devices/vsrc/vsrcpzld.c b/src/spicelib/devices/vsrc/vsrcpzld.c index d95266de3..3f199f14e 100644 --- a/src/spicelib/devices/vsrc/vsrcpzld.c +++ b/src/spicelib/devices/vsrc/vsrcpzld.c @@ -25,7 +25,6 @@ VSRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) /* loop through all the instances of the model */ for (here = model->VSRCinstances; here != NULL ; here=here->VSRCnextInstance) { - if (here->VSRCowner != ARCHme) continue; if (!(here->VSRCacGiven)) { /*a dc source*/ diff --git a/src/spicelib/devices/vsrc/vsrctemp.c b/src/spicelib/devices/vsrc/vsrctemp.c index f6022d17a..d22ac0e50 100644 --- a/src/spicelib/devices/vsrc/vsrctemp.c +++ b/src/spicelib/devices/vsrc/vsrctemp.c @@ -28,7 +28,6 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = model->VSRCinstances; here != NULL ; here=here->VSRCnextInstance) { - if (here->VSRCowner != ARCHme) continue; if(here->VSRCacGiven && !here->VSRCacMGiven) { here->VSRCacMag = 1; diff --git a/src/spicelib/parser/sperror.c b/src/spicelib/parser/sperror.c index 1db8924f5..63447b1be 100644 --- a/src/spicelib/parser/sperror.c +++ b/src/spicelib/parser/sperror.c @@ -104,11 +104,6 @@ const char *SPerror(int type) case E_NOF2SRC: msg = "no F2 source for IM disto analysis"; break; -#ifdef PARALLEL_ARCH - case E_MULTIERR: - msg = "Multiple errors detected by parallel machine"; - break; -#endif /* PARALLEL_ARCH */ case OK: return (NULL); default: diff --git a/src/tclspice.c b/src/tclspice.c index 91b1e9940..5f2755579 100644 --- a/src/tclspice.c +++ b/src/tclspice.c @@ -2562,10 +2562,6 @@ Spice_Init(Tcl_Interp *interp) /* initilise Tk display */ DevInit(); - /*parrallel arch support, or not */ - ARCHme = 0; - ARCHsize = 1; - /* init the mutex */ #ifdef HAVE_LIBPTHREAD pthread_mutex_init(&triggerMutex, NULL); diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj index 6a9792ca2..daf6ba9ab 100644 --- a/visualc/vngspice.vcproj +++ b/visualc/vngspice.vcproj @@ -4904,10 +4904,6 @@ RelativePath="..\src\spicelib\analysis\cktparam.c" > - - @@ -8136,10 +8132,6 @@ RelativePath="..\src\maths\sparse\spbuild.c" > - -