Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions VehicleInterfaces/Atmospheres/ConstantAtmosphere.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ within VehicleInterfaces.Atmospheres;
model ConstantAtmosphere "Atmospheres with constant conditions"
extends VehicleInterfaces.Icons.Atmosphere;
extends VehicleInterfaces.Atmospheres.Interfaces.Base(
redeclare final function windVelocity = constantWindVelocity (windVelocity=v),
redeclare final function density = constantDensity (density=rho),
redeclare final function temperature = constantTemperature (T0=T),
redeclare final function humidity = constantHumidity (h0=h));
redeclare function windVelocity = constantWindVelocity(windVelocity=v),
redeclare function density = constantDensity(density=rho),
redeclare function temperature = constantTemperature(T0=T),
redeclare function humidity = constantHumidity(h0=h));

parameter SI.Velocity[3] v=zeros(3) "Wind velocity";
parameter SI.AbsolutePressure ambientPressure=101300
Expand Down
10 changes: 5 additions & 5 deletions VehicleInterfaces/Roads/CircleRoad.mo
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
within VehicleInterfaces.Roads;
model CircleRoad "Circular road (perpendicular to world z-axis)"
extends VehicleInterfaces.Roads.Interfaces.Base(
redeclare final function position = circlePosition (radius=radius, width=width),
redeclare final function trackOffset = constantOffset,
redeclare final function normal = circleNormal,
redeclare final function headingDirection = circleHeadingDirection (radius=radius),
redeclare final function frictionCoefficient = circleFrictionCoefficient (mu_fixed=mu));
redeclare function position = circlePosition (radius=radius, width=width),
redeclare function trackOffset = constantOffset,
redeclare function normal = circleNormal,
redeclare function headingDirection = circleHeadingDirection (radius=radius),
redeclare function frictionCoefficient = circleFrictionCoefficient (mu_fixed=mu));

parameter Boolean animation=true "= true, if road shall be visualized";
parameter SI.Radius radius "Radius of road";
Expand Down
10 changes: 5 additions & 5 deletions VehicleInterfaces/Roads/FlatRoad.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ within VehicleInterfaces.Roads;
model FlatRoad "Straight road along x-axis (perpendicular to world z-axis)"
extends VehicleInterfaces.Icons.Road;
extends VehicleInterfaces.Roads.Interfaces.Base(
redeclare final function position = linePosition,
redeclare final function trackOffset = constantOffset (offset=offset),
redeclare final function normal = lineNormal,
redeclare final function headingDirection = lineHeadingDirection,
redeclare final function frictionCoefficient = lineFrictionCoefficient (mu_fixed=mu));
redeclare function position = linePosition,
redeclare function trackOffset = constantOffset (offset=offset),
redeclare function normal = lineNormal,
redeclare function headingDirection = lineHeadingDirection,
redeclare function frictionCoefficient = lineFrictionCoefficient (mu_fixed=mu));

parameter Boolean animation=true "= true, if road shall be visualized";
parameter Real mu=0.5 "Friction coefficient of road";
Expand Down
2 changes: 1 addition & 1 deletion VehicleInterfaces/Roads/Internal/VisualizeSimpleRoads.mo
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ model VisualizeSimpleRoads
extends Modelica.Mechanics.MultiBody.Visualizers.Advanced.Surface(
final nu=ns,
final nv=nw,
redeclare final function surfaceCharacteristic =
redeclare function surfaceCharacteristic =
roadSurfaceCharacteristic (
final position=road.position,
final s_min=s_min,
Expand Down