Skip to content

Commit

Permalink
Moved V&V directory to MAPLEAF/Examples
Browse files Browse the repository at this point in the history
  • Loading branch information
henrystoldt committed Jun 6, 2021
1 parent d71d24d commit 878a09d
Show file tree
Hide file tree
Showing 199 changed files with 146 additions and 145 deletions.
18 changes: 9 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ classes*.dot
classes*.pdf

# Exclude regression testing plots
test/V&V/*.pdf
test/V&V/*.png
test/V&V/*.eps
test/V&V/*/*.pdf
test/V&V/*/*.png
test/V&V/*/*.eps
test/V&V/*/*/*.pdf
test/V&V/*/*/*.png
test/V&V/*/*/*.eps
MAPLEAF/Examples/V&V/*.pdf
MAPLEAF/Examples/V&V/*.png
MAPLEAF/Examples/V&V/*.eps
MAPLEAF/Examples/V&V/*/*.pdf
MAPLEAF/Examples/V&V/*/*.png
MAPLEAF/Examples/V&V/*/*.eps
MAPLEAF/Examples/V&V/*/*/*.pdf
MAPLEAF/Examples/V&V/*/*/*.png
MAPLEAF/Examples/V&V/*/*/*.eps

# Exlude temporary files generated with regression testing results in them
*_newExpectedResultsRecorded*
Expand Down
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ include MAPLEAF/Rocket/*.pyx*
include MAPLEAF/Examples/Wind/*
include MAPLEAF/Examples/Simulations/*.mapleaf*
include MAPLEAF/Examples/BatchSims/*.mapleaf*
include MAPLEAF/Examples/V&V/*.csv
include MAPLEAF/Examples/V&V/*/*.csv
include MAPLEAF/Examples/V&V/*/*/*.csv
include MAPLEAF/Examples/Motors/*
include MAPLEAF/Examples/TabulatedData/*
include MAPLEAF/ENV/*.txt*
Expand Down
54 changes: 27 additions & 27 deletions MAPLEAF/Examples/BatchSims/NASAVerificationCases.mapleaf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ NASADraglessSphere{
yLabel ECI X Position (ft)
yLimits 2.0940e7 2.0956e7
legendLabel MAPLEAF
saveLocation ./test/V&V/NASADraglessSphere/X.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADraglessSphere/X.pdf
scalingFactor 3.280840 # Convert to feet

SIM4{
Expand All @@ -34,7 +34,7 @@ NASADraglessSphere{
lineFormat -
lineColors \#7a5195
legendLabel NASA SIM 4
file ./test/V&V/NASADraglessSphere/Atmos_01_sim_04.csv
file ./MAPLEAF/Examples/V&V/NASADraglessSphere/Atmos_01_sim_04.csv
}

SIM5{
Expand All @@ -43,7 +43,7 @@ NASADraglessSphere{
lineFormat -.
lineColors \#ef5675
legendLabel NASA SIM 5
file ./test/V&V/NASADraglessSphere/Atmos_01_sim_05.csv
file ./MAPLEAF/Examples/V&V/NASADraglessSphere/Atmos_01_sim_05.csv
}

SIM6{
Expand All @@ -52,7 +52,7 @@ NASADraglessSphere{
lineFormat --
lineColors \#ffa600
legendLabel NASA SIM 6
file ./test/V&V/NASADraglessSphere/Atmos_01_sim_06.csv
file ./MAPLEAF/Examples/V&V/NASADraglessSphere/Atmos_01_sim_06.csv
}
}

Expand All @@ -61,35 +61,35 @@ NASADraglessSphere{
!removeKeysContaining 'yLimits'
columnsToPlot PositionY
yLabel ECI Y Position (ft)
saveLocation ./test/V&V/NASADraglessSphere/Y.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADraglessSphere/Y.pdf
}

!create ZLoc from NASADraglessSphere.PlotsToGenerate.YLoc{
!replace 'eiPosition_ft_Y' with 'eiPosition_ft_Z'
columnsToPlot PositionZ
yLabel ECI Z Position (ft)
saveLocation ./test/V&V/NASADraglessSphere/Z.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADraglessSphere/Z.pdf
}

!create XVel from NASADraglessSphere.PlotsToGenerate.YLoc{
!replace 'eiPosition_ft_Y' with 'eiVelocity_ft_s_X'
columnsToPlot VelocityX(m/s)
yLabel ECI X Velocity (ft/s)
saveLocation ./test/V&V/NASADraglessSphere/XVel.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADraglessSphere/XVel.pdf
}

!create YVel from NASADraglessSphere.PlotsToGenerate.YLoc{
!replace 'eiPosition_ft_Y' with 'eiVelocity_ft_s_Y'
columnsToPlot VelocityY(m/s)
yLabel ECI Y Velocity (ft/s)
saveLocation ./test/V&V/NASADraglessSphere/YVel.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADraglessSphere/YVel.pdf
}

!create ZVel from NASADraglessSphere.PlotsToGenerate.YLoc{
!replace 'eiPosition_ft_Y' with 'eiVelocity_ft_s_Z'
columnsToPlot VelocityZ(m/s)
yLabel ECI Z Velocity (ft/s)
saveLocation ./test/V&V/NASADraglessSphere/ZVel.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADraglessSphere/ZVel.pdf
}
}
}
Expand Down Expand Up @@ -187,15 +187,15 @@ NASADampedBrick{
lineColors \#003f5c
yLabel NED X (Roll) Euler Angle (deg)
legendLabel MAPLEAF
saveLocation ./test/V&V/NASADampedBrick/NED_XAngle.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADampedBrick/NED_XAngle.pdf
scalingFactor 57.2957795131 # Convert to degrees

SIM2{
columnsToPlot eulerAngle_deg_Roll
xColumnName time
lineFormat -
legendLabel NASA SIM 2
file ./test/V&V/NASADampedBrick/Atmos_03_sim_02.csv
file ./MAPLEAF/Examples/V&V/NASADampedBrick/Atmos_03_sim_02.csv
}

SIM4{
Expand All @@ -204,7 +204,7 @@ NASADampedBrick{
lineFormat -
legendLabel NASA SIM 4
lineColors \#7a5195
file ./test/V&V/NASADampedBrick/Atmos_03_sim_04.csv
file ./MAPLEAF/Examples/V&V/NASADampedBrick/Atmos_03_sim_04.csv
}

SIM5{
Expand All @@ -213,7 +213,7 @@ NASADampedBrick{
lineFormat -.
lineColors \#ef5675
legendLabel NASA SIM 5
file ./test/V&V/NASADampedBrick/Atmos_03_sim_05.csv
file ./MAPLEAF/Examples/V&V/NASADampedBrick/Atmos_03_sim_05.csv
}

SIM6{
Expand All @@ -222,22 +222,22 @@ NASADampedBrick{
lineFormat --
lineColors \#ffa600
legendLabel NASA SIM 6
file ./test/V&V/NASADampedBrick/Atmos_03_sim_06.csv
file ./MAPLEAF/Examples/V&V/NASADampedBrick/Atmos_03_sim_06.csv
}
}

!create YAngle from NASADampedBrick.PlotsToGenerate.XAngle{
!replace 'eulerAngle_deg_Roll' with 'eulerAngle_deg_Pitch'
columnsToPlot EulerAngleY
yLabel NED Y (Pitch) Euler Angle (deg)
saveLocation ./test/V&V/NASADampedBrick/NED_YAngle.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADampedBrick/NED_YAngle.pdf
}

!create ZAngle from NASADampedBrick.PlotsToGenerate.XAngle{
!replace 'eulerAngle_deg_Roll' with 'eulerAngle_deg_Yaw'
columnsToPlot EulerAngleZ
yLabel NED Z (Yaw) Euler Angle (deg)
saveLocation ./test/V&V/NASADampedBrick/NED_ZAngle.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASADampedBrick/NED_ZAngle.pdf
}
}
}
Expand Down Expand Up @@ -294,31 +294,31 @@ NASATwoStageOrbitalRocket{
yLimits 0 0.0001
yLabel Air Density (slug / ft^3)
legendLabel MAPLEAF
saveLocation ./test/V&V/NASAOrbitalRocket/Density.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/Density.pdf
scalingFactor 0.00194032 # Convert to slug / ft^3 from kg/m^3

SIM4{
columnsToPlot airDensity_slug_ft3
xColumnName time
lineFormat -
legendLabel NASA SIM 4
file ./test/V&V/NASAOrbitalRocket/Atmos_17_sim_04.csv
file ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/Atmos_17_sim_04.csv
}

SIM5{
columnsToPlot airDensity_slug_ft3
xColumnName time
lineFormat -.
legendLabel NASA SIM 5
file ./test/V&V/NASAOrbitalRocket/Atmos_17_sim_05.csv
file ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/Atmos_17_sim_05.csv
}

SIM6{
columnsToPlot airDensity_slug_ft3
xColumnName time
lineFormat --
legendLabel NASA SIM 6
file ./test/V&V/NASAOrbitalRocket/Atmos_17_sim_06.csv
file ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/Atmos_17_sim_06.csv
}
}

Expand All @@ -327,55 +327,55 @@ NASATwoStageOrbitalRocket{
!removeKeysContaining 'yLimits'
columnsToPlot DynamicP
yLabel Dynamic Pressure (psf)
saveLocation ./test/V&V/NASAOrbitalRocket/DynamicP.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/DynamicP.pdf
scalingFactor 0.021 # Convert to psf from Pa
}

!create Mach from NASATwoStageOrbitalRocket.PlotsToGenerate.DynamicPressure{
!replace "dynamicPressure_lbf_ft2" with "mach"
columnsToPlot Mach
yLabel Mach
saveLocation ./test/V&V/NASAOrbitalRocket/Mach.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/Mach.pdf
scalingFactor 1
}

!create AeroMY from NASATwoStageOrbitalRocket.PlotsToGenerate.DynamicPressure{
!replace "dynamicPressure_lbf_ft2" with "aero_bodyMoment_ftlbf_M"
columnsToPlot AeroMY
yLabel Aerodynamic Pitching Moment (ft lb)
saveLocation ./test/V&V/NASAOrbitalRocket/AeroPitchMoment.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/AeroPitchMoment.pdf
scalingFactor -0.7375621493 # Convert from Nm to ft lb
}

!create AeroMX from NASATwoStageOrbitalRocket.PlotsToGenerate.DynamicPressure{
!replace "dynamicPressure_lbf_ft2" with "aero_bodyMoment_ftlbf_N"
columnsToPlot AeroMX
yLabel Aerodynamic Yawing Moment (ft lb)
saveLocation ./test/V&V/NASAOrbitalRocket/AeroYawMoment.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/AeroYawMoment.pdf
scalingFactor 0.7375621493 # Convert from Nm to ft lb
}

!create AeroFX from NASATwoStageOrbitalRocket.PlotsToGenerate.DynamicPressure{
!replace "dynamicPressure_lbf_ft2" with "aero_bodyForce_lbf_Z"
columnsToPlot AeroFX
yLabel Aerodynamic Z-Force (lbf)
saveLocation ./test/V&V/NASAOrbitalRocket/AeroXForce.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/AeroXForce.pdf
scalingFactor 0.22480894244319 # Convert from N to lb
}

!create AeroFY from NASATwoStageOrbitalRocket.PlotsToGenerate.DynamicPressure{
!replace "dynamicPressure_lbf_ft2" with "aero_bodyForce_lbf_Y"
columnsToPlot AeroFY
yLabel Aerodynamic Y-Force (lbf)
saveLocation ./test/V&V/NASAOrbitalRocket/AeroYForce.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/AeroYForce.pdf
scalingFactor 0.22480894244319 # Convert from N to lb
}

!create AeroFZ from NASATwoStageOrbitalRocket.PlotsToGenerate.DynamicPressure{
!replace "dynamicPressure_lbf_ft2" with "aero_bodyForce_lbf_X"
columnsToPlot TabulatedAeroForcesFZ
yLabel Aerodynamic Axial Force (lbf)
saveLocation ./test/V&V/NASAOrbitalRocket/AeroAxialForce.pdf
saveLocation ./MAPLEAF/Examples/V&V/NASAOrbitalRocket/AeroAxialForce.pdf
scalingFactor 0.22480894244319 # Convert from N to lb
}
}
Expand Down
18 changes: 9 additions & 9 deletions MAPLEAF/Examples/BatchSims/OpenRocketCases.mapleaf
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ OpenRocketWindTunnelCase{
scalingFactor -1
legendLabel MAPLEAF
overwrite True
saveLocation ./test/V&V/WindTunnel/OpenRocketWindTunnelPlot.pdf
saveLocation ./MAPLEAF/Examples/V&V/WindTunnel/OpenRocketWindTunnelPlot.pdf

ComparisonDataExp{
columnsToPlot Cd_Experimental
xColumnName Mach
lineFormat .y
legendLabel Flight Data
file ./test/V&V/WindTunnel/WindTunnelExpCd.csv
file ./MAPLEAF/Examples/V&V/WindTunnel/WindTunnelExpCd.csv
}

ComparisonDataOR1{
columnsToPlot Cd_OR_Replicated
xColumnName Mach
lineFormat -.c
legendLabel OR Replicated
file ./test/V&V/WindTunnel/OpenRocketCdNotBT.csv
file ./MAPLEAF/Examples/V&V/WindTunnel/OpenRocketCdNotBT.csv
validationData False
}

Expand All @@ -53,7 +53,7 @@ OpenRocketWindTunnelCase{
xColumnName Mach
lineFormat :k
legendLabel OR Original
file ./test/V&V/WindTunnel/WindTunnelOpenRocket.csv
file ./MAPLEAF/Examples/V&V/WindTunnel/WindTunnelOpenRocket.csv
validationData False
}

Expand Down Expand Up @@ -85,7 +85,7 @@ B4-4SimpleRocketCase{

Altitude{
columnsToPlot PositionZ
saveLocation ./test/V&V/B4-4SimpleRocket/B4-4SimpleRocketPlot.pdf
saveLocation ./MAPLEAF/Examples/V&V/B4-4SimpleRocket/B4-4SimpleRocketPlot.pdf
lineFormat --r
lineColors \#003f5c
xLabel Time (s)
Expand All @@ -100,7 +100,7 @@ B4-4SimpleRocketCase{
lineFormat :
lineColors \#ff6361
legendLabel OpenRocket v0.9
file ./test/V&V/B4-4SimpleRocket/B4-4OriginalOR.csv
file ./MAPLEAF/Examples/V&V/B4-4SimpleRocket/B4-4OriginalOR.csv
validationData False
}

Expand All @@ -110,7 +110,7 @@ B4-4SimpleRocketCase{
lineFormat -.
lineColors \#bc5090
legendLabel OpenRocket v15.03
file ./test/V&V/B4-4SimpleRocket/B4-4ReplicatedOR.csv
file ./MAPLEAF/Examples/V&V/B4-4SimpleRocket/B4-4ReplicatedOR.csv
validationData False
}

Expand All @@ -120,7 +120,7 @@ B4-4SimpleRocketCase{
lineFormat --
lineColors \#ffa600
legendLabel RockSim v8
file ./test/V&V/B4-4SimpleRocket/B4-4RockSim.csv
file ./MAPLEAF/Examples/V&V/B4-4SimpleRocket/B4-4RockSim.csv
validationData False
}

Expand All @@ -129,7 +129,7 @@ B4-4SimpleRocketCase{
xColumnName t(s)
lineFormat .k
legendLabel Flight Data
file ./test/V&V/B4-4SimpleRocket/B4-4ExpData.csv
file ./MAPLEAF/Examples/V&V/B4-4SimpleRocket/B4-4ExpData.csv
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions MAPLEAF/Examples/BatchSims/ParametricFinBodyCases.mapleaf
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ ParametricFin5{
yLimits 0.3 1
legendLabel MAPLEAF
overwrite True
saveLocation ./test/V&V/Parametric/Fin5/CN.pdf
saveLocation ./MAPLEAF/Examples/V&V/Parametric/Fin5/CN.pdf

WindTunnel{
columnsToPlot CN
xColumnName Mach
lineFormat Pk
legendLabel Wind Tunnel
file ./test/V&V/Parametric/Fin5/ParametricFin5CN.csv
file ./MAPLEAF/Examples/V&V/Parametric/Fin5/ParametricFin5CN.csv
}

OpenRocket{
Expand All @@ -72,7 +72,7 @@ ParametricFin5{
lineFormat d
lineColors \#bc5090
legendLabel OpenRocket v15.03
file ./test/V&V/Parametric/Fin5/ParametricFin5CNOR.csv
file ./MAPLEAF/Examples/V&V/Parametric/Fin5/ParametricFin5CNOR.csv
validationData False
}
}
Expand All @@ -94,7 +94,7 @@ ParametricFin5{
yLimits -0.8 0.6

OpenRocket{
file ./test/V&V/Parametric/Fin5/ParametricFin5CNOR.csv
file ./MAPLEAF/Examples/V&V/Parametric/Fin5/ParametricFin5CNOR.csv
}
}
}
Expand Down
Loading

0 comments on commit 878a09d

Please sign in to comment.