updated for automation

MintonGroup · Apr 29, 2020 · 24c39cd · 24c39cd
1 parent 3d0b9ba
commit 24c39cd
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 5 deletions.
diff --git a/examples/global-lunar-bombardment/.idea/.gitignore b/examples/global-lunar-bombardment/.idea/.gitignore
diff --git a/examples/global-lunar-bombardment/.idea/global-lunar-bombardment.iml b/examples/global-lunar-bombardment/.idea/global-lunar-bombardment.iml
diff --git a/examples/global-lunar-bombardment/.idea/inspectionProfiles/profiles_settings.xml b/examples/global-lunar-bombardment/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/examples/global-lunar-bombardment/.idea/misc.xml b/examples/global-lunar-bombardment/.idea/misc.xml
diff --git a/examples/global-lunar-bombardment/.idea/modules.xml b/examples/global-lunar-bombardment/.idea/modules.xml
diff --git a/examples/global-lunar-bombardment/.idea/vcs.xml b/examples/global-lunar-bombardment/.idea/vcs.xml
diff --git 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
diff --git a/examples/morphology_test_cases/complex/.idea/.gitignore b/examples/morphology_test_cases/complex/.idea/.gitignore
diff --git a/examples/morphology_test_cases/complex/.idea/complex.iml b/examples/morphology_test_cases/complex/.idea/complex.iml
diff --git a/examples/morphology_test_cases/complex/.idea/inspectionProfiles/profiles_settings.xml b/examples/morphology_test_cases/complex/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/examples/morphology_test_cases/complex/.idea/misc.xml b/examples/morphology_test_cases/complex/.idea/misc.xml
diff --git a/examples/morphology_test_cases/complex/.idea/modules.xml b/examples/morphology_test_cases/complex/.idea/modules.xml
diff --git a/examples/morphology_test_cases/complex/.idea/vcs.xml b/examples/morphology_test_cases/complex/.idea/vcs.xml
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
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
diff --git 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
@@ -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
@@ -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)
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		0 1 0.000000000000E+00 F 1.000000 0.000000000000E+00
		33790
		23790