Merge pull request #189 from tcld/freeze_ocean

Frozen oceans on satellite map

Author: psi29a

generate_protobuf_stubs.sh

@@ -26,7 +26,7 @@
         'console_scripts': ['worldengine=worldengine.cli.main:main'],
     },
     'install_requires': ['PyPlatec==1.4.0', 'pypng>=0.0.18', 'numpy>=1.9.2, <= 1.10.0.post2',
-                         'argparse==1.2.1', 'noise==1.2.2', 'protobuf>=2.6.0'],
+                         'argparse==1.2.1', 'noise==1.2.2', 'protobuf==3.0.0a3'],
     'license': 'MIT License'
 }
 

setup.py

@@ -27,11 +27,12 @@ def test_protobuf_serialize_unserialize(self):
         self.assertTrue(_equal(w.precipitation,     unserialized.precipitation))
         self.assertTrue(_equal(w.temperature,       unserialized.temperature))
         self.assertTrue(_equal(w.sea_depth,         unserialized.sea_depth))
-        self.assertEquals(w.seed,                   unserialized.seed)
-        self.assertEquals(w.n_plates,               unserialized.n_plates)
         self.assertTrue(_equal(w.ocean_level,       unserialized.ocean_level))
         self.assertTrue(_equal(w.lake_map,          unserialized.lake_map))
         self.assertTrue(_equal(w.river_map,         unserialized.river_map))
+        self.assertTrue(_equal(w.icecap,            unserialized.icecap))
+        self.assertEquals(w.seed,                   unserialized.seed)
+        self.assertEquals(w.n_plates,               unserialized.n_plates)
         self.assertEquals(w.step,                   unserialized.step)
         self.assertEqual(sorted(dir(w)),            sorted(dir(unserialized)))
         self.assertEqual(w, unserialized)
@@ -60,11 +61,12 @@ def test_hdf5_serialize_unserialize(self):
             self.assertTrue(_equal(w.precipitation,     unserialized.precipitation))
             self.assertTrue(_equal(w.temperature,       unserialized.temperature))
             self.assertTrue(_equal(w.sea_depth,         unserialized.sea_depth))
-            self.assertEquals(w.seed,                   unserialized.seed)
-            self.assertEquals(w.n_plates,               unserialized.n_plates)
             self.assertTrue(_equal(w.ocean_level,       unserialized.ocean_level))
             self.assertTrue(_equal(w.lake_map,          unserialized.lake_map))
             self.assertTrue(_equal(w.river_map,         unserialized.river_map))
+            self.assertTrue(_equal(w.icecap,            unserialized.icecap))
+            self.assertEquals(w.seed,                   unserialized.seed)
+            self.assertEquals(w.n_plates,               unserialized.n_plates)
             self.assertEquals(w.step,                   unserialized.step)
             self.assertEqual(sorted(dir(w)),            sorted(dir(unserialized)))
             #self.assertEqual(w, unserialized)

tests/serialization_test.py

@@ -8,7 +8,6 @@ deps =
     PyPlatec
     noise
     nose
-    protobuf
     six
     pypng
     h5py
@@ -18,6 +17,7 @@ deps =
     coverage
     numpy==1.9.2
     pygdal==1.10.0.1
+    protobuf==3.0.0a3
     {[base]deps}
 
 

tox.ini

@@ -1,3 +1,4 @@
+syntax = "proto2";
 package World;
 
 message World {
@@ -56,7 +57,6 @@ message World {
     required int32  height = 5;
 
     // Elevation
-
     required DoubleMatrix heightMapData  = 6;
     required double heightMapTh_sea      = 7;
     required double heightMapTh_plain    = 8;
@@ -111,6 +111,8 @@ message World {
     optional DoubleMatrix lakemap = 34;
     optional DoubleMatrix rivermap = 35;
 
+    // Ice-caps
+    optional DoubleMatrix icecap  = 36;
 }
 
 

worldengine/World.proto

@@ -6,7 +6,8 @@
 from worldengine.common import array_to_matrix, set_verbose, print_verbose
 from worldengine.draw import draw_ancientmap_on_file, draw_biome_on_file, draw_ocean_on_file, \
     draw_precipitation_on_file, draw_grayscale_heightmap_on_file, draw_simple_elevation_on_file, \
-    draw_temperature_levels_on_file, draw_riversmap_on_file, draw_scatter_plot_on_file, draw_satellite_on_file
+    draw_temperature_levels_on_file, draw_riversmap_on_file, draw_scatter_plot_on_file, \
+    draw_satellite_on_file, draw_icecaps_on_file
 from worldengine.plates import world_gen, generate_plates_simulation
 from worldengine.imex import export
 from worldengine.step import Step
@@ -91,6 +92,10 @@ def draw_satellite_map(world, filename):
     draw_satellite_on_file(world, filename)
     print("+ satellite map generated in '%s'" % filename)
 
+def draw_icecaps_map(world, filename):
+    draw_icecaps_on_file(world, filename)
+    print("+ icecap map generated in '%s'" % filename)
+
 def generate_plates(seed, world_name, output_dir, width, height,
                     num_plates=10):
     """
@@ -314,9 +319,10 @@ def main():
                                default=True)
     g_generate.add_argument('--scatter', dest='scatter_plot',
                             action="store_true", help="generate scatter plot")
-
     g_generate.add_argument('--sat', dest='satelite_map',
                             action="store_true", help="generate satellite map")
+    g_generate.add_argument('--ice', dest='icecaps_map',
+                            action="store_true", help="generate ice caps map")
 
     # -----------------------------------------------------
     g_ancient_map = parser.add_argument_group(
@@ -477,6 +483,7 @@ def main():
         print(' black and white maps : %s' % args.black_and_white)
         print(' step                 : %s' % step.name)
         print(' greyscale heightmap  : %s' % args.grayscale_heightmap)
+        print(' icecaps heightmap    : %s' % args.icecaps_map)
         print(' rivers map           : %s' % args.rivers_map)
         print(' scatter plot         : %s' % args.scatter_plot)
         print(' satellite map        : %s' % args.satelite_map)
@@ -540,7 +547,10 @@ def main():
             '%s/%s_scatter.png' % (args.output_dir, world_name))    
         if args.satelite_map:
             draw_satellite_map(world,
-            '%s/%s_satellite.png' % (args.output_dir, world_name))    
+            '%s/%s_satellite.png' % (args.output_dir, world_name))
+        if args.icecaps_map:
+            draw_icecaps_map(world,
+            '%s/%s_icecaps.png' % (args.output_dir, world_name))
 
     elif operation == 'plates':
         print('')  # empty line

worldengine/cli/main.py

@@ -373,6 +373,7 @@ def draw_satellite(world, target):
 
     # Get an elevation mask where heights are normalized between 0 and 255
     elevation_mask = get_normalized_elevation_array(world)
+    smooth_mask = numpy.invert(world.ocean)  # all land shall be smoothed (other tiles can be included by setting them to True)
 
     rng = numpy.random.RandomState(world.seed)  # create our own random generator; necessary for now to make the tests reproducible, even though it is a bit ugly
 
@@ -390,11 +391,20 @@ def draw_satellite(world, target):
             # the map is smoothed and shaded.
             target.set_pixel(x, y, (r, g, b, 255))
 
+    # Paint frozen areas.
+    ice_color_variation = int(30)  # 0 means perfectly white ice; must be in [0, 255]; only affects R- and G-channel
+    for y in range(world.height):
+        for x in range(world.width):
+            if world.icecap[y, x] > 0.0:
+                smooth_mask[y, x] = True  # smooth the frozen areas, too
+                variation = rng.randint(0, ice_color_variation)
+                target.set_pixel(x, y, (255 - ice_color_variation + variation, 255 - ice_color_variation + variation, 255, 255))
+
     # Loop through and average a pixel with its neighbors to smooth transitions between biomes
     for y in range(1, world.height-1):
         for x in range(1, world.width-1):
             ## Only smooth land tiles
-            if world.is_land((x, y)):
+            if smooth_mask[y, x]:
                 # Lists to hold the separated rgb values of the neighboring pixels
                 all_r = []
                 all_g = []
@@ -404,7 +414,7 @@ def draw_satellite(world, target):
                 for j in range(y-1, y+2):
                     for i in range(x-1, x+2):
                         # Don't include ocean in the smoothing, if this tile happens to border an ocean
-                        if world.is_land((i, j)):
+                        if smooth_mask[j, i]:
                             # Grab each rgb value and append to the list
                             r, g, b, a = target[j, i]
                             all_r.append(r)
@@ -805,3 +815,8 @@ def draw_satellite_on_file(world, filename):
     img = PNGWriter.rgba_from_dimensions(world.width, world.height, filename)
     draw_satellite(world, img)
     img.complete()
+
+
+def draw_icecaps_on_file(world, filename):
+    img = PNGWriter.grayscale_from_array(world.icecap, filename, scale_to_range=True)
+    img.complete()

worldengine/draw.py

@@ -9,6 +9,7 @@
 from worldengine.simulations.erosion import ErosionSimulation
 from worldengine.simulations.precipitation import PrecipitationSimulation
 from worldengine.simulations.biome import BiomeSimulation
+from worldengine.simulations.icecap import IcecapSimulation
 from worldengine.common import anti_alias, get_verbose
 import numpy
 
@@ -210,6 +211,7 @@ def generate_world(w, step):
                  'HumiditySimulation':      sub_seeds[ 5],
                  'PermeabilitySimulation':  sub_seeds[ 6],
                  'BiomeSimulation':         sub_seeds[ 7],
+                 'IcecapSimulation':        sub_seeds[ 8],
                  '':                        sub_seeds[99]
     }
 
@@ -229,7 +231,6 @@ def generate_world(w, step):
     IrrigationSimulation().execute(w, seed_dict['IrrigationSimulation'])  # seed not currently used
     HumiditySimulation().execute(w, seed_dict['HumiditySimulation'])  # seed not currently used
 
-    
     PermeabilitySimulation().execute(w, seed_dict['PermeabilitySimulation'])
 
     cm, biome_cm = BiomeSimulation().execute(w, seed_dict['BiomeSimulation'])  # seed not currently used
@@ -247,4 +248,6 @@ def generate_world(w, step):
         if get_verbose():
             print(" %30s = %7i" % (str(cl), count))
 
+    IcecapSimulation().execute(w, seed_dict['IcecapSimulation'])  # makes use of temperature-map
+
     return w

worldengine/generation.py

@@ -88,12 +88,14 @@ def save_world_to_hdf5(world, filename):
         temperature_data = temperature_grp.create_dataset("data", (world.height, world.width), dtype=numpy.float)
         temperature_data.write_direct(world.temperature['data'])
 
-    # lake_map and river_map have inverted coordinates
+    if hasattr(world, 'icecap'):
+        icecap_data = f.create_dataset("icecap", (world.height, world.width), dtype=numpy.float)
+        icecap_data.write_direct(world.icecap)
+
     if hasattr(world, 'lake_map'):
         lake_map_data = f.create_dataset("lake_map", (world.height, world.width), dtype=numpy.float)
         lake_map_data.write_direct(world.lake_map)
 
-    # lake_map and river_map have inverted coordinates
     if hasattr(world, 'river_map'):
         river_map_data = f.create_dataset("river_map", (world.height, world.width), dtype=numpy.float)
         river_map_data.write_direct(world.river_map)
@@ -207,6 +209,9 @@ def load_world_to_hdf5(filename):
         ]
         w.set_temperature(t, t_th)
 
+    if 'icecap' in f.keys():
+        w.icecap = numpy.array(f['icecap'])
+
     if 'lake_map' in f.keys():
         m = numpy.array(f['lake_map'])
         w.set_lakemap(m)