Skip to content

Commit

Permalink
Rename flat Modelica to Base Modelica (#11875)
Browse files Browse the repository at this point in the history
- Rename flag `flatModelica` to `baseModelica`.
- Move test cases from `flatmodelica` to `basemodelica`.
  • Loading branch information
perost committed Jan 25, 2024
1 parent ea10a79 commit 77614c7
Show file tree
Hide file tree
Showing 14 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/NFFrontEnd/NFInstUtil.mo
Expand Up @@ -73,7 +73,7 @@ public
print(stage);
print("\n########################################\n\n");

if Flags.getConfigBool(Flags.FLAT_MODELICA) then
if Flags.getConfigBool(Flags.BASE_MODELICA) then
FlatModel.printFlatString(flat_model, FunctionTree.listValues(functions));
else
FlatModel.printString(flat_model);
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/Util/Config.mo
Expand Up @@ -650,7 +650,7 @@ end synchronousFeaturesAllowed;
public function flatModelica
output Boolean value;
algorithm
value := Flags.getConfigBool(Flags.FLAT_MODELICA);
value := Flags.getConfigBool(Flags.BASE_MODELICA);

// Ignore the flag unless the new frontend is enabled, otherwise it won't work.
if value and not Flags.isSet(Flags.SCODE_INST) then
Expand Down
4 changes: 2 additions & 2 deletions OMCompiler/Compiler/Util/Flags.mo
Expand Up @@ -1345,9 +1345,9 @@ constant ConfigFlag FMI_VERSION = CONFIG_FLAG(137,
"", NONE(), INTERNAL(), STRING_FLAG(""), NONE(),
Gettext.gettext("returns the FMI Version either 1.0 or 2.0."));

constant ConfigFlag FLAT_MODELICA = CONFIG_FLAG(138, "flatModelica",
constant ConfigFlag BASE_MODELICA = CONFIG_FLAG(138, "baseModelica",
SOME("f"), EXTERNAL(), BOOL_FLAG(false), NONE(),
Gettext.gettext("Outputs experimental flat Modelica."));
Gettext.gettext("Outputs experimental Base Modelica."));

constant ConfigFlag FMI_FILTER = CONFIG_FLAG(139, "fmiFilter", NONE(), EXTERNAL(),
ENUM_FLAG(FMI_PROTECTED, {("none", FMI_NONE), ("internal", FMI_INTERNAL), ("protected", FMI_PROTECTED), ("blackBox", FMI_BLACKBOX)}),
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/Util/FlagsUtil.mo
Expand Up @@ -396,7 +396,7 @@ constant list<Flags.ConfigFlag> allConfigFlags = {
Flags.ZEROMQ_SERVER_ID,
Flags.ZEROMQ_CLIENT_ID,
Flags.FMI_VERSION,
Flags.FLAT_MODELICA,
Flags.BASE_MODELICA,
Flags.FMI_FILTER,
Flags.FMI_SOURCES,
Flags.FMI_FLAGS,
Expand Down
6 changes: 3 additions & 3 deletions testsuite/Makefile
Expand Up @@ -175,7 +175,7 @@ scodeinst.log \
xml.log \
xogeny.log \
openmodelicadiff.log \
flatmodelica.log
basemodelica.log

.PHONY : all omc-diff ReferenceFiles failingtest test fast fast.logs $(FASTLOGS) $(SLOWLOGS) $(SIMULATIONLOGS) slow.logs threaded

Expand Down Expand Up @@ -648,8 +648,8 @@ requirements.log: omc-diff
device.log: omc-diff
$(MAKE) -C simulation/libraries/3rdParty/Modelica_DeviceDrivers -f Makefile test > $@
@echo $@ done
flatmodelica.log: omc-diff
$(MAKE) -C openmodelica/flatmodelica -f Makefile test > $@
basemodelica.log: omc-diff
$(MAKE) -C openmodelica/basemodelica -f Makefile test > $@
@echo $@ done
ffi.log: omc-diff
$(MAKE) -C flattening/modelica/ffi -f Makefile test > $@
Expand Down
File renamed without changes.

0 comments on commit 77614c7

Please sign in to comment.