summaryrefslogtreecommitdiff
path: root/PropulsionTeamHome.mdwn
authorAnonymous <Anonymous>2003-12-22 21:02:00 (GMT)
committer Anonymous <Anonymous>2003-12-22 21:02:00 (GMT)
commit360f69ec3a3cd0d62b1eaabbc4f14a7587fd6995 (patch) (side-by-side diff)
treeb756ab92d2f6d44c66e59677b0c8adc44c2d4604 /PropulsionTeamHome.mdwn
parentaf944e598143e256c0b82d643625b9354240fb77 (diff)
downloadwiki-360f69ec3a3cd0d62b1eaabbc4f14a7587fd6995.zip
wiki-360f69ec3a3cd0d62b1eaabbc4f14a7587fd6995.tar.gz
PropulsionTeamHome
Diffstat (limited to 'PropulsionTeamHome.mdwn') (more/less context) (ignore whitespace changes)
-rw-r--r--PropulsionTeamHome.mdwn8
1 files changed, 7 insertions, 1 deletions
diff --git a/PropulsionTeamHome.mdwn b/PropulsionTeamHome.mdwn
index 6fa4c62..167c0d4 100644
--- a/PropulsionTeamHome.mdwn
+++ b/PropulsionTeamHome.mdwn
@@ -10,13 +10,19 @@
## <a name="LOX/Paraffin Hybrid Project Info"></a> LOX/Paraffin Hybrid Project Information:
+- [[Nozzle]]
+ - [[Preliminary Nozzle design done|Nozzle/Hybridnozzledesign.pdf]]
+
+- [[Plumbing System|WaxPlumbing]]
+ - [[Oxygen metering orifice design|PropulsionTeamHome/WaxPlumbing/2003test-orifice.pdf]]
+
**PSAS Hybrid Team:** [[HybridTeamRoster]]<br />**Hybrid Team Mailing list:** [psas-propulsion](http://lists.psas.pdx.edu/mailman/listinfo/psas-propulsion)<br />**Upcoming Meetings:** [[Schedule]]<br /><br />
## <a name="Current News"></a> Current News
[Preliminary nozzle design done](http://twiki.psas.pdx.edu/pub/PSAS/Nozzle/Hybridnozzledesign.pdf) 11/15/03
-## <a name="Systems Under Developement:"></a> Systems Under Developement:
+## <a name="Systems Under Development:"></a> Systems Under Development:
[[Lab Scale GOX/Paraffin Hybrid Motor|LabScaleGOX/ParaffinHybridMotor]]<br /><br />[[Flight Article LOX/Paraffin Hybrid Motor|FlightArticleLOX/ParaffinHybridMotor]]<br /><br />