diff --git a/examples/global-lunar-bombardment/.idea/.gitignore b/examples/global-lunar-bombardment/.idea/.gitignore new file mode 100644 index 00000000..e7e9d11d --- /dev/null +++ b/examples/global-lunar-bombardment/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/examples/global-lunar-bombardment/.idea/global-lunar-bombardment.iml b/examples/global-lunar-bombardment/.idea/global-lunar-bombardment.iml new file mode 100644 index 00000000..d0876a78 --- /dev/null +++ b/examples/global-lunar-bombardment/.idea/global-lunar-bombardment.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/examples/global-lunar-bombardment/.idea/inspectionProfiles/profiles_settings.xml b/examples/global-lunar-bombardment/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/examples/global-lunar-bombardment/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/examples/global-lunar-bombardment/.idea/misc.xml b/examples/global-lunar-bombardment/.idea/misc.xml new file mode 100644 index 00000000..a2e120dc --- /dev/null +++ b/examples/global-lunar-bombardment/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/examples/global-lunar-bombardment/.idea/modules.xml b/examples/global-lunar-bombardment/.idea/modules.xml new file mode 100644 index 00000000..ae1d197d --- /dev/null +++ b/examples/global-lunar-bombardment/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/examples/global-lunar-bombardment/.idea/vcs.xml b/examples/global-lunar-bombardment/.idea/vcs.xml new file mode 100644 index 00000000..b2bdec2d --- /dev/null +++ b/examples/global-lunar-bombardment/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/global-lunar-bombardment/ctem.in b/examples/global-lunar-bombardment/ctem.in index c360af37..e3ecff98 100755 --- a/examples/global-lunar-bombardment/ctem.in +++ b/examples/global-lunar-bombardment/ctem.in @@ -19,9 +19,9 @@ runtype single ! Run type: options are normal / ! CTEM required inputs seed 11082 ! Random number generator seed -gridsize 2000 ! Size of grid in pixels +gridsize 200 ! Size of grid in pixels numlayers 10 ! Number of perched layers -pix 3.08e3 ! Pixel size (m) +pix 3.08e4 ! Pixel size (m) mat rock ! Material (rock or ice) ! Bedrock scaling parameters mu_b 0.55e0 ! Experimentally derived parameter for bedrock crater scaling law diff --git a/examples/morphology_test_cases/.DS_Store b/examples/morphology_test_cases/.DS_Store index 39266ccf..083fdac5 100644 Binary files a/examples/morphology_test_cases/.DS_Store and b/examples/morphology_test_cases/.DS_Store differ diff --git a/examples/morphology_test_cases/complex/.idea/.gitignore b/examples/morphology_test_cases/complex/.idea/.gitignore new file mode 100644 index 00000000..e7e9d11d --- /dev/null +++ b/examples/morphology_test_cases/complex/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/examples/morphology_test_cases/complex/.idea/complex.iml b/examples/morphology_test_cases/complex/.idea/complex.iml new file mode 100644 index 00000000..d0876a78 --- /dev/null +++ b/examples/morphology_test_cases/complex/.idea/complex.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/examples/morphology_test_cases/complex/.idea/inspectionProfiles/profiles_settings.xml b/examples/morphology_test_cases/complex/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/examples/morphology_test_cases/complex/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/examples/morphology_test_cases/complex/.idea/misc.xml b/examples/morphology_test_cases/complex/.idea/misc.xml new file mode 100644 index 00000000..a2e120dc --- /dev/null +++ b/examples/morphology_test_cases/complex/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/examples/morphology_test_cases/complex/.idea/modules.xml b/examples/morphology_test_cases/complex/.idea/modules.xml new file mode 100644 index 00000000..d38df6ca --- /dev/null +++ b/examples/morphology_test_cases/complex/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/examples/morphology_test_cases/complex/.idea/vcs.xml b/examples/morphology_test_cases/complex/.idea/vcs.xml new file mode 100644 index 00000000..c2365ab1 --- /dev/null +++ b/examples/morphology_test_cases/complex/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc b/examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc index a5ce622e..d4458b07 100644 Binary files a/examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc and b/examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc differ diff --git a/examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc b/examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc index 8af689f2..ceb3c471 100644 Binary files a/examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc and b/examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc differ diff --git a/examples/morphology_test_cases/complex/ctem.in b/examples/morphology_test_cases/complex/ctem.in index b66328e6..629b6866 100755 --- a/examples/morphology_test_cases/complex/ctem.in +++ b/examples/morphology_test_cases/complex/ctem.in @@ -32,9 +32,9 @@ runtype single ! Run type: options are normal / ! CTEM required inputs seed 23790 ! Random number generator seed -gridsize 2000 ! Size of grid in pixels +gridsize 200 ! Size of grid in pixels numlayers 10 ! Number of perched layers -pix 2.0e2 ! Pixel size (m) +pix 2.0e3 ! Pixel size (m) mat rock ! Material (rock or ice) ! Bedrock scaling parameters mu_b 0.55e0 ! Experimentally derived parameter for bedrock crater scaling law diff --git a/examples/morphology_test_cases/complex/misc/ctem000001.dat b/examples/morphology_test_cases/complex/misc/ctem000001.dat index f28c1197..957fbe30 100644 --- a/examples/morphology_test_cases/complex/misc/ctem000001.dat +++ b/examples/morphology_test_cases/complex/misc/ctem000001.dat @@ -1,2 +1,2 @@ 0 1 0.000000000000E+00 F 1.000000 0.000000000000E+00 - 33790 + 23790 diff --git a/src/crater/crater_realistic_topography.f90 b/src/crater/crater_realistic_topography.f90 index 5177ec94..44cd93dd 100644 --- a/src/crater/crater_realistic_topography.f90 +++ b/src/crater/crater_realistic_topography.f90 @@ -642,6 +642,11 @@ subroutine ejecta_texture(user,surf,crater,deltaMtot,inc,ejecta_dem) splat_slope = 0.8_DP splat_stretch = 16.0_DP splatmag = 0.10_DP + + open(unit=12,file='params.txt',status='old') + read(12,*) num_octaves + read(12,*) xy_noise_fac + read(12,*) noise_height ! Get the ejecta mass ejbmass = sum(ejecta_dem)