diff --git a/generate.py b/generate.py index 19b7aa8..d9cfd1b 100755 --- a/generate.py +++ b/generate.py @@ -94,14 +94,12 @@ nn = n*vscale + offset ### COMPUTE LANDSCAPE EVOLUTION # Initialize landscape evolution model print('Initializing model') -model = terrainlib.EvolutionModel(nn, K=1, m=0.35, d=1, sea_level=0, flex_radius=flex_radius) +model = terrainlib.EvolutionModel(nn, K=K, m=m, d=d, sea_level=sea_level, flex_radius=flex_radius) terrainlib.update(model.dem, model.lakes, t=5, title='Initializing...') dt = time/niter # Run the model's processes: the order in which the processes are run is arbitrary and could be changed. -print('Initial flow calculation') -model.calculate_flow() for i in range(niter): disp_niter = 'Iteration {:d} of {:d}...'.format(i+1, niter) @@ -109,12 +107,16 @@ for i in range(niter): print(disp_niter) print('Diffusion') model.diffusion(dt) + print('Flow calculation') + model.calculate_flow() + terrainlib.update(model.dem, model.lakes, title=disp_niter) print('Advection') model.advection(dt) print('Isostatic equilibration') model.adjust_isostasy() - print('Flow calculation') - model.calculate_flow() + +print('Last flow calculation') +model.calculate_flow() print('Done!') diff --git a/terrain.conf b/terrain.conf index ba06a4a..500af9d 100644 --- a/terrain.conf +++ b/terrain.conf @@ -5,9 +5,9 @@ offset = 0 persistence = 0.6 lacunarity = 2.0 -K = 1 -m = 0.35 -d = 0.2 +K = 0.5 +m = 0.5 +d = 0.5 sea_level = 0 flex_radius = 20 diff --git a/terrain_higher.conf b/terrain_higher.conf index 7914988..3fa63ca 100644 --- a/terrain_higher.conf +++ b/terrain_higher.conf @@ -1,15 +1,15 @@ mapsize = 1000 scale = 400 -vscale = 500 +vscale = 600 offset = 0 persistence = 0.65 lacunarity = 2.0 K = 0.5 -m = 0.5 -d = 0.1 +m = 0.55 +d = 0.45 sea_level = 0 -flex_radius = 100 +flex_radius = 50 time = 10 niter = 10