Fixed 3D noise map, and removed catchment_reference

Now K and m are determined independently.
Alsoo removed debug plotting.
This commit is contained in:
Gael-de-Sailly 2020-12-24 11:46:45 +01:00
parent ae46ada648
commit 32f3cd9925

View File

@ -43,7 +43,7 @@ class noisemap:
n = np.zeros((self.X, self.Y)) n = np.zeros((self.X, self.Y))
for x in range(self.X): for x in range(self.X):
for y in range(self.Y): for y in range(self.Y):
n[x,y] = snoise3(x/self.scale + self.xbase, y/self.scale + self.ybase, t/self.tscale, **self.params) n[x,y] = snoise3(x/self.scale + self.xbase, y/self.scale + self.ybase, t, **self.params)
if self.log: if self.log:
return np.exp(n*self.vscale) * self.offset return np.exp(n*self.vscale) * self.offset
@ -135,10 +135,9 @@ params_sealevel = {
"lacunarity" : 2, "lacunarity" : 2,
} }
catchment_reference = 10000
params_K = { params_K = {
"offset" : K * catchment_reference**m, "offset" : K,
"vscale" : 50, "vscale" : K,
"scale" : 400, "scale" : 400,
"octaves" : 1, "octaves" : 1,
"persistence" : 0.5, "persistence" : 0.5,
@ -148,7 +147,7 @@ params_K = {
params_m = { params_m = {
"offset" : m, "offset" : m,
"vscale" : 0.25, "vscale" : m*0.5,
"scale" : 400, "scale" : 400,
"octaves" : 1, "octaves" : 1,
"persistence" : 0.5, "persistence" : 0.5,
@ -163,16 +162,7 @@ if sea_level_variations != 0.0:
n = noisemap(mapsize+1, mapsize+1, **params).get2d() n = noisemap(mapsize+1, mapsize+1, **params).get2d()
m_map = noisemap(mapsize+1, mapsize+1, **params_m).get2d() m_map = noisemap(mapsize+1, mapsize+1, **params_m).get2d()
K_map = noisemap(mapsize+1, mapsize+1, **params_K).get2d() / catchment_reference**m_map K_map = noisemap(mapsize+1, mapsize+1, **params_K).get2d()
import matplotlib.pyplot as plt
plt.subplot(1,2,1)
plt.imshow(K_map)
plt.colorbar()
plt.subplot(1,2,2)
plt.imshow(m_map)
plt.colorbar()
plt.show()
### COMPUTE LANDSCAPE EVOLUTION ### COMPUTE LANDSCAPE EVOLUTION
# Initialize landscape evolution model # Initialize landscape evolution model