Commit 06919ca9 authored by Greenwood, Scott's avatar Greenwood, Scott
Browse files

seems to work now in Dymola pedantic. OMEdit throws a strange error though

parent 405a5152

examples/modelica/GenericCSM/BaseClasses/ControlBus.mo

+0 −6
Original line number Diff line number Diff line 
within GenericCSM.BaseClasses;

expandable connector ControlBus

  extends ExaDigiT_AutoCSM.BaseClasses.PartialControlBus;

  parameter Structure structure

annotation (Placement(transformation(extent={{-10,60},{10,80}})));

  Systems.Datacenter.BaseClasses.ControlBus datacenter[structure.datacenter.n_int]

  annotation (Dialog(enable=false));

  Systems.CentralEnergyPlant.BaseClasses.ControlBus centralEnergyPlant[structure.centralEnergyPlant.n_int]

  annotation (Dialog(enable=false));

end ControlBus;

examples/modelica/GenericCSM/BaseClasses/PartialControls.mo

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ within GenericCSM.BaseClasses; 
partial model PartialControls

  extends ExaDigiT_AutoCSM.BaseClasses.Systems.PartialControls(

    redeclare replaceable PartialData data constrainedby PartialData,

    redeclare final ControlBus controlBus(final structure=structure),

    redeclare final ControlBus controlBus,

    redeclare Structure structure);

end PartialControls;

examples/modelica/GenericCSM/BaseClasses/PartialModel.mo

+2 −1
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ partial model PartialModel 
  extends ExaDigiT_AutoCSM.BaseClasses.Systems.PartialModel(

    redeclare Summary summary,

    redeclare replaceable PartialData data constrainedby PartialData,

    redeclare final ControlBus controlBus(final structure=structure),

    redeclare final ControlBus controlBus,

    redeclare Structure structure,

    redeclare replaceable PartialControls controls constrainedby PartialControls(final structure=structure),

    redeclare replaceable PartialSources sources constrainedby PartialSources(final structure=structure));



end PartialModel;

examples/modelica/GenericCSM/BaseClasses/PartialSources.mo

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ within GenericCSM.BaseClasses; 
partial model PartialSources

  extends ExaDigiT_AutoCSM.BaseClasses.Systems.PartialSources(

    redeclare replaceable PartialData data constrainedby PartialData,

    redeclare final ControlBus controlBus(final structure=structure),

    redeclare final ControlBus controlBus,

    redeclare Structure structure);

end PartialSources;

examples/modelica/GenericCSM/Systems/CentralEnergyPlant/BaseClasses/ControlBus.mo

+0 −10
Original line number Diff line number Diff line 
within GenericCSM.Systems.CentralEnergyPlant.BaseClasses;

expandable connector ControlBus

  extends ExaDigiT_AutoCSM.BaseClasses.PartialControlBus;

  parameter Structure structure

    annotation (Placement(transformation(extent={{-10,60},{10,80}})));



    // Not including these passes pedantic checks in Dymola but OMEdit fails with: Cannot connect expandable connector intermediateLoop[1].controlBus with non-expandable connector controlBus.intermediateLoop.

   // Adding though and OMEdit gives:  Internal error NFConnection.checkBalance got unbalanced connection connect(sources.controlBus, controlBus):

//   Systems.IntermediateLoop.BaseClasses.ControlBus intermediateLoop[structure.intermediateLoop.n_int]

//     annotation (Dialog(enable=false));

//   Systems.CoolingTowerLoop.BaseClasses.ControlBus coolingTowerLoop[structure.coolingTowerLoop.n_int]

//     annotation (Dialog(enable=false));



end ControlBus;