From 53f05d9aef5367c0ffaa3de6b8a2a74bc5904c64 Mon Sep 17 00:00:00 2001
From: r29173 <r29173>
Date: Thu, 26 Apr 2007 13:04:34 +0000
Subject: [PATCH] added cases initializeModel, initiliazeInstance (block name
 used by psp102)

---
 .../adms/admst/ngspiceMODULEguesstopology.c.xml       |  9 ++++++---
 .../devices/adms/admst/ngspiceMODULEload.c.xml        | 11 +++++++----
 src/spicelib/devices/adms/admst/ngspiceVersion.xml    | 11 +++++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
index ebcbce4dd..affb3b1f6 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.8  2007-04-24 12:26:36  r29173
+  Revision 1.9  2007-04-26 13:04:34  r29173
+  added cases initializeModel, initiliazeInstance (block name used by psp102)
+
+  Revision 1.8  2007/04/24 12:26:36  r29173
   add case 'blockvariable'
 
   Revision 1.7  2006/03/06 12:51:29  r29173
@@ -300,7 +303,7 @@
     <admst:assert test="code/adms[datatypename='block']" format="expecting datatypename=block\n"/>
     <admst:for-each select="code/item">
       <admst:if test="adms[datatypename='block']">
-        <admst:if test="[name!='initial_model' and name!='initial_instance'
+        <admst:if test="[name!='initial_model' and name!='initial_instance' and name!='initializeModel' and name!='initializeInstance'
            and name!='initial_step' and name!='noise']">
           <admst:apply-templates select="." match="block:local:declaration"/>
         </admst:if>
@@ -316,7 +319,7 @@
           <admst:apply-templates select="." match="guesstopology"/>
         </admst:when>
         <admst:otherwise>
-          <admst:if test="[name!='initial_model' and name!='initial_instance'
+          <admst:if test="[name!='initial_model' and name!='initial_instance' and name!='initializeModel' and name!='initializeInstance'
              and name!='initial_step' and name!='noise']">
             <admst:apply-templates select="." match="guesstopology"/>
           </admst:if>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
index 335286208..85facc05d 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.4  2006-03-05 09:38:41  pnenzi
+  Revision 1.5  2007-04-26 13:04:34  r29173
+  added cases initializeModel, initiliazeInstance (block name used by psp102)
+
+  Revision 1.4  2006/03/05 09:38:41  pnenzi
 
   Updated version to 2.2.0
 
@@ -239,7 +242,7 @@ int $(module)load(inModel,ckt)
 
 </admst:template>
 
-<!-- analog/![initial_model|initial_instance|initial_step|noise] -->
+<!-- analog/![initializeModel|initializeInstance|initial_model|initial_instance|initial_step|noise] -->
 <admst:template match="debug:strobe">
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
@@ -309,7 +312,7 @@ int $(module)load(inModel,ckt)
     <admst:assert test="code/adms[datatypename='block']" format="expecting datatypename=block\n"/>
     <admst:for-each select="code/item">
       <admst:if test="adms[datatypename='block']">
-        <admst:if test="[name!='initial_model' and name!='initial_instance'
+        <admst:if test="[name!='initial_model' and name!='initial_instance' and name!='initializeModel' and name!='initializeInstance'
            and name!='initial_step' and name!='noise']">
           <admst:apply-templates select="." match="block:local:declaration"/>
         </admst:if>
@@ -326,7 +329,7 @@ int $(module)load(inModel,ckt)
           <admst:apply-templates select="." match="%s"/>
         </admst:when>
         <admst:otherwise>
-          <admst:if test="[name!='initial_model' and name!='initial_instance'
+        <admst:if test="[name!='initial_model' and name!='initial_instance' and name!='initializeModel' and name!='initializeInstance'
              and name!='initial_step' and name!='noise']">
             <admst:apply-templates select="." match="block"/>
           </admst:if>
diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
index 3029860d6..9faaf0492 100644
--- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
@@ -5,7 +5,10 @@
 -->
 <!--
   $Log$
-  Revision 1.14  2007-04-24 12:28:15  r29173
+  Revision 1.15  2007-04-26 13:04:34  r29173
+  added cases initializeModel, initiliazeInstance (block name used by psp102)
+
+  Revision 1.14  2007/04/24 12:28:15  r29173
   add case 'blockvariable'
 
   Revision 1.13  2007/04/24 08:59:09  r29173
@@ -1131,7 +1134,7 @@
   <admst:text format="}\n"/>
 </admst:template>
 
-<!-- analog/[initial_model|initial_instance|initial_step|noise] -->
+<!-- analog/[initializeModel|initializeInstance|initial_model|initial_instance|initial_step|noise] -->
 <admst:template match="block:initial">
   <admst:assert test="adms[datatypename='block']" format="expecting datatypename=block\n"/>
   <admst:apply-templates select="." match="block:local:declaration"/>
@@ -1143,7 +1146,7 @@
     <admst:if test="code/adms[datatypename='block']">
       <admst:for-each select="code/item">
         <admst:if test="adms[datatypename='block']">
-          <admst:apply-templates select="[name='initial_instance']" match="block:initial"/>
+          <admst:apply-templates select="[name='initial_instance' or name='initializeInstance']" match="block:initial"/>
         </admst:if>
       </admst:for-each>
     </admst:if>
@@ -1154,7 +1157,7 @@
     <admst:if test="code/adms[datatypename='block']">
       <admst:for-each select="code/item">
         <admst:if test="adms[datatypename='block']">
-          <admst:apply-templates select="[name='initial_model']" match="block:initial"/>
+          <admst:apply-templates select="[name='initial_model' or name='initializeModel']" match="block:initial"/>
         </admst:if>
       </admst:for-each>
     </admst:if>