Merge branch 'fix-loadSelector' of https://github.com/tbeu/Modelica_B…

…uildings into tbeu-fix-loadSelector
lbl-srg · Nov 21, 2017 · ddbc607 · ddbc607
2 parents 990b3a9 + 45f18ff
commit ddbc607
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo b/Buildings/ThermalZones/Detailed/BaseClasses/CFDAirHeatMassBalance.mo
@@ -16,7 +16,7 @@ model CFDAirHeatMassBalance
     annotation(Dialog(tab = "Initialization"));
 
   parameter String cfdFilNam "CFD input file name"
-    annotation (Dialog(__Dymola_loadSelector(caption="Select CFD input file")));
+    annotation (Dialog(loadSelector(caption="Select CFD input file")));
   parameter Boolean useCFD=true
     "Set to false to deactivate the CFD interface and use instead yFixed as output"
     annotation (Evaluate=true);

diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/CFDExchange.mo b/Buildings/ThermalZones/Detailed/BaseClasses/CFDExchange.mo
@@ -4,7 +4,7 @@ block CFDExchange "Block that exchanges data with the CFD code"
     firstTrigger(start=false,
                  fixed=true));
   parameter String cfdFilNam "CFD input file name" annotation (Dialog(
-        __Dymola_loadSelector(caption=
+        loadSelector(caption=
             "Select CFD input file")));
   parameter Boolean activateInterface=true
     "Set to false to deactivate interface and use instead yFixed as output"

diff --git a/Buildings/ThermalZones/Detailed/CFD.mo b/Buildings/ThermalZones/Detailed/CFD.mo
@@ -39,7 +39,7 @@ model CFD
     annotation(Dialog(group = "CFD"));
   parameter String cfdFilNam "CFD input file name"
     annotation (Dialog(group = "CFD",
-        __Dymola_loadSelector(caption=
+        loadSelector(caption=
             "Select CFD input file")));
   Modelica.Blocks.Interfaces.RealOutput yCFD[nSen] if
        haveSensor "Sensor for output from CFD"