added admittance computation

[blast.git] / ReferenceBlock.cpp

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index 05fd29a785e921fbf1f42fa1ae6869ca1249ef99..12db4b4a9bc683b99cddea0c3ed0724e7d7e4ae2 100644 (file)
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -157,7 +157,7 @@ void ReferenceBlock::loadParameters(QDomElement &elt) throw(Exception) {
         valueStr = "";
     }
     if (contextStr == "user") {
-      param = new BlockParameterUser(this,nameStr,valueStr);
+      param = new BlockParameterUser(this,nameStr,typeStr,valueStr);
     }
     else if (contextStr == "generic") {
       param = new BlockParameterGeneric(this,nameStr,typeStr,valueStr);
@@ -251,7 +251,7 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     nameStr = eltInput.attribute("iface","none");
     AbstractInterface* dataIface = getIfaceFromName(nameStr);
     if (dataIface == NULL) throw (Exception(BLOCKFILE_CORRUPTED));
-    nameStr = dataIface->getName()+"_ctl";
+    nameStr = dataIface->getName()+"_enb";
     inter = new ReferenceInterface(this,nameStr,"boolean","1",AbstractInterface::Input, AbstractInterface::Control, 1);
     if (!inter->setAssociatedIface(dataIface)) {
       throw (Exception(BLOCKFILE_CORRUPTED));      
@@ -283,7 +283,7 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     nameStr = eltOutput.attribute("iface","none");
     AbstractInterface* dataIface = getIfaceFromName(nameStr);
     if (dataIface == NULL) throw (Exception(BLOCKFILE_CORRUPTED));
-    nameStr = dataIface->getName()+"_ctl";
+    nameStr = dataIface->getName()+"_enb";
     inter = new ReferenceInterface(this,nameStr,"boolean","1",AbstractInterface::Output, AbstractInterface::Control, 1);
     if (!inter->setAssociatedIface(dataIface)) {
       throw (Exception(BLOCKFILE_CORRUPTED));      
@@ -471,7 +471,7 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     in >> valueStr;
 
     if (contextStr == "user") {
-      p = new BlockParameterUser(&b,nameStr,valueStr);
+      p = new BlockParameterUser(&b,nameStr,typeStr,valueStr);
     }
     else if (contextStr == "generic") {
       p = new BlockParameterGeneric(&b,nameStr,typeStr,valueStr);
@@ -511,7 +511,7 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setMultiplicity(val);
     b.inputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
-      QString ctlRefName = iface->getName()+"_ctl";
+      QString ctlRefName = iface->getName()+"_enb";
       ReferenceInterface* ctlRefIface = AI_TO_REF(b.getIfaceFromName(ctlRefName));      
       if (ctlRefIface != NULL) {        
         if (! ctlRefIface->setAssociatedIface(iface)) {
@@ -537,7 +537,7 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setMultiplicity(val);
     b.outputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
-      QString ctlRefName = iface->getName()+"_ctl";      
+      QString ctlRefName = iface->getName()+"_enb";      
       ReferenceInterface* ctlRefIface = AI_TO_REF(b.getIfaceFromName(ctlRefName));      
       if (ctlRefIface != NULL) {        
         if (! ctlRefIface->setAssociatedIface(iface)) {
@@ -566,3 +566,8 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
 
   return in;
 }
+
+bool ReferenceBlock::computeOutputPattern(int nbExec) {
+  // does strictly nothing
+  return false;
+}