Version Control Conflict Copyright © Software Carpentry 2010

Slides:

Advertisements

Similar presentations

Slicing Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

Advertisements

Jupiter. Vital Statistics R = 71,492 km M = 1.90 x kg R orbit = x 106 km T = 124° K Eccentricity = axial tilt = 3.08° “day” = 9.84 hours.

The Jovian Planets. Small Moons Galilean Moons.

Moons of the Giant Planets Reading is actually in the earlier chapters of the text: 2,3,4 that we have already done.

Introduction Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

Solar System Łukasz Kowalik MA 42. Gymnasium, Szczecin The sun and its planets.

Mechanics Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

Nacht van Saturnus.

Part 2 of Solar System. Mars Global Surveyor (MGS) 1996 to to ,000 photos 240,000 photos.

Jupiter Largest planet (1300 Earths would fit inside!!! 2.5x the gravity than on Earth Jupiter radiates more energy into space than it receives from the.

The Solar System By Evan

Browsing Directories Copyright © Software Carpentry and The University of Edinburgh This work is licensed under the Creative Commons Attribution.

Pipes and Filters Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

Macros Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

赴国际水稻所访学情况汇报长江大学农学院邢丹英 2010 年 6 月. 学习目的学习时间、地点学习内容学习收获几点体会汇报提纲.

Created by Charlie Sebastian  - The average temperature is -234 Fahrenheit.  - One day on Jupiter is 9.92 hours long.  - One year on Jupiter is 4,329.

Command Line Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

JUPITER By : Denny twigg, Omar Zuaiter, Drew Bae, Kelsey Danielczyk, Kendall Scharbert, Megan Stancil.

Ast 1001, 17 Oct MOONS (= SATELLITES) of the Gas Giant Planets.

Interface and Implementation Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

Mass: 1,898,130,000,000,000,000 billion kg ( x Earth) Equatorial Diameter: 142,984 km Polar Diameter: 133,709 km Equatorial Circumference: 439,264.

Introduction Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

Introduction Copyright © Software Carpentry This work is licensed under the Creative Commons Attribution License See

Part 2 of Solar System. Mars Global Surveyor (MGS) 1996 to to ,000 photos 240,000 photos.

Rollback Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

The Giant Planets – “Gas Giants” Jupiter Saturn Uranus Neptune Mostly H and H compounds under very high pressure in interior + small rocky core.

Jupiter Ajon Daniel & Melvin Melgar Jupiter is the fourth brightest object in the sky after the Sun, The moon, and Venus.

Da DaVinci Code Or, ASTRO FINAL Exam Review 2010.

History The mean distance from the Sun to Jupiter is 778,000,000 kilometers It takes Jupiter years to orbit around the Sun, so a typical year on.

What are natural satellites and how did they form?

Invasion Percolation: Randomness Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

Chapter 14 Satellites. Opener Fig Tidal Heating of Io.

Jupiter. Distance 800 million km (500 million miles) Diameter: 143,000 x 133,000 km (88,000 x 80,000 miles) or 11 x 10 Earths Rotates in 10 hours Polar.

The Jovian Planets. The Jovian, or gaseous, planets have rocky cores surrounded by thick atmospheres. The radius is measured to the point at which the.

Chapter 10: The Outer Planets. Figure 9.6 Moons Jupiter – 63 moons! Saturn- 61 moons! Uranus- 27 moons! Neptune- 14 moons!

Chapter 8 Triton. Figure 8.1 Jupiter, Up Close Figure 8.2 Galilean Moons.

Maddie Barrett, Rachel Bell, and Rachel Bibb

In your Table of Contents…

I. JupiterOuter Planets A. Size:______ the mass of all other planets combined ______ the mass of Earth B. Distance from Sun:_______ (______ the sunlight.

Solar System Montage.

Jupiter By: Jake Lofgren Distance from the Sun Jupiter is the 5 th planet from the sun. Jupiter’s distance from the sun is million miles from the.

南水北调东线第一期工程山东段情况简介. 主要汇报内容二、南水北调山东段工程总体布置三、山东段工程项目划分及工程主要建设内容一、南水北调东线工程概况四、前期工作及工程建设进展情况五、工程总投资.

Patterns Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See

By Joe Ives. The biggest planet in the solar system Looking at the planet that is 140,000 km big!!! And the fourth brightest.

Python Aliasing Copyright © Software Carpentry 2010

Architecture as Homage: The Parthenon in Athens was dedicated to the patron goddess of Athens, Athena. “Parthenos” means “virgin.” The architectural elements.

Program Design Invasion Percolation: Aliasing

Program Design Invasion Percolation: Testing

Sets and Dictionaries Examples Copyright © Software Carpentry 2010

Program Design Invasion Percolation: Resolving Ties

Program Design Invasion Percolation: Neighbors

Announcements Today: Review for Midterm #3 Monday: Midterm #3

Copyrights apply.

Satellites Chapter 14.

Observations and Analysis

Satellites of the Solar System: the Moons of Jupiter

The Outer Solar System.

Part 2 of Solar System.

Research about the planet JUPITER

Version Control Basic Operation Copyright © Software Carpentry 2010

By Jove! Fold 2 pieces of paper into a book. OPEN SOLAR SYSTEM SCOPE FOR ALL YOUR INFO. Full screen works best. Cover: Title and picture (be creative for.

Version Control Introduction Copyright © Software Carpentry 2010

Program Design Invasion Percolation: Bugs

Program Design Invasion Percolation: The Grid

Browsing Directories Using walk

Jupiter: King of Planets

Photo by La Melodie - Creative Commons Attribution License

Jupiter Fifth planet from the Sun Known since ancient times

Presentation transcript:

Version Control Conflict Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See http://software-carpentry.org/license.html for more information.

2

3

revision 8 revision 8 revision 8 4

revision 8 revision 8 revision 8 + 5 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... revision 8 revision 8 + 5

revision 9 revision 8 revision 9 6 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... revision 8 revision 9 6

revision 9 revision 8 + revision 9 7 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 8 + revision 9 7

revision 9 revision 8 + revision 9 8 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 8 + revision 9 8

revision 9 revision 8 + revision 9 9 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 8 + revision 9 9

revision 9 revision 8 + revision 9 10 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 8 + revision 9 10

revision 9 revision 8 + revision 9 11 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 8 + revision 9 11

revision 10 revision 10 revision 9 12 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 10 revision 9 12

revision 10 revision 10 revision 9 13 Name Orbital Radius ... (10**3 km) ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 10 revision 9 13

revision 11 revision 11 revision 9 14 Name Orbital Radius ... (10**3 km) ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 11 revision 9 14

revision 11 revision 11 revision 9 15 Name Orbital Radius ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... revision 11 revision 9 15

revision 11 revision 11 revision 9 16 Name Orbital Radius ... * 10^3 KM ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... revision 11 revision 9 16

revision 11 revision 11 revision 9 17 Name Orbital Radius ... * 10^3 KM ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... revision 11 revision 9 17

revision 11 revision 11 revision 9 18 Name Orbital Radius ... * 10^3 KM ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... revision 11 revision 9 18

revision 11 revision 11 revision 9 + 19 Name Orbital Radius ... (10**3 km) ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 11 revision 9 + 19

revision 11 revision 11 revision 9 + 20 Name Orbital Radius ... *10^3 km ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 11 revision 9 + 20

revision 12 revision 11 revision 12 21 Name Orbital Radius ... *10^3 km ... Amalthea 181.4 ... Io 421.6 ... Europa 670.9 ... Ganymede 1070.4 ... Callisto 1882.7 ... himalia 11460 ... elara 11740 ... revision 11 revision 12 21

Greg Wilson created by July 2010 Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See http://software-carpentry.org/license.html for more information.