From c0719d4d4ddb1b9ac25fb7c970ddfb10a96a5138 Mon Sep 17 00:00:00 2001 From: David Minton Date: Thu, 29 Aug 2019 09:54:44 -0400 Subject: [PATCH] fixed some small things in the examples --- .gitignore | 2 + examples/mare-with-rays-model2/ctem.in | 42 +++++++++---------- .../morphology_test_cases/complex/cleanup | 8 ++-- examples/morphology_test_cases/simple/cleanup | 8 ++-- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index ae5d7ba7..02419c52 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ config/ examples/global-lunar-bombardment/.DS_Store examples/mare-with-rays-model2/.DS_Store + +examples/mare-with-rays-model2/__pycache__/ diff --git a/examples/mare-with-rays-model2/ctem.in b/examples/mare-with-rays-model2/ctem.in index 30e49d71..c5daff8f 100644 --- a/examples/mare-with-rays-model2/ctem.in +++ b/examples/mare-with-rays-model2/ctem.in @@ -24,34 +24,34 @@ numlayers 10 ! Number of perched layers pix 1.0 ! Pixel size (m) mat rock ! Material (rock or ice) ! Bedrock scaling parameters -mu_b 0.55d0 ! Experimentally derived parameter for bedrock crater scaling law -kv_b 0.20d0 ! Experimentally derived parameter for bedrock crater scaling law -trho_b 2250.0d0 ! Target density (bedrock) (kg/m**3) -ybar_b 0.0d6 ! Bedrock strength (Pa) +mu_b 0.55e0 ! Experimentally derived parameter for bedrock crater scaling law +kv_b 0.20e0 ! Experimentally derived parameter for bedrock crater scaling law +trho_b 2250.0e0 ! Target density (bedrock) (kg/m**3) +ybar_b 0.0e6 ! Bedrock strength (Pa) ! Regolith scaling parameters -mu_r 0.55d0 ! Experimentally derived parameter for regolith crater scaling law -kv_r 0.20d0 ! Experimentally derived parameter for regolith crater scaling law -trho_r 2250.0d0 ! Target density (regolith) (kg/m**3) -ybar_r 0.00d6 ! Regolith strength (Pa) +mu_r 0.55e0 ! Experimentally derived parameter for regolith crater scaling law +kv_r 0.20e0 ! Experimentally derived parameter for regolith crater scaling law +trho_r 2250.0e0 ! Target density (regolith) (kg/m**3) +ybar_r 0.00e6 ! Regolith strength (Pa) ! Body parameters -gaccel 1.62d0 ! Gravitational acceleration at target (m/s**2) -trad 1737.35d3 ! Target radius (m) -prho 2500.0d0 ! Projectile density (kg/m**3) +gaccel 1.62e0 ! Gravitational acceleration at target (m/s**2) +trad 1737.35e3 ! Target radius (m) +prho 2500.0e0 ! Projectile density (kg/m**3) sfdfile production.dat ! Impactor SFD file (col 1: Dimp (m), col 2: ! impactors > D velfile lunar-MBA-impactor-velocities.dat ! Impactor velocity dist file ! Seismic shaking input (required if seismic shaking is set to T, otherwise ignored) doseismic F ! Perform seismic shaking calculations with each impact - Default F -seisq 2000.0d0 ! Seimsic energy attenuation quality factor, Q +seisq 2000.0e0 ! Seimsic energy attenuation quality factor, Q ! Value taken from Richardson et al. (2005) -tvel 100.d0 ! Target p-wave speed (m/s) +tvel 100.e0 ! Target p-wave speed (m/s) ! Value taken from Watkins and Kovach (1973) LPSC -tfrac 2000.d0 ! Mean free path for seismic wave scattering in target (m) +tfrac 2000.e0 ! Mean free path for seismic wave scattering in target (m) ! Value taken from Dainty et al. (1974) The Moon v. 9 p. 11 -regcoh 520.d0 ! Regolith layer cohesion (Pa) +regcoh 520.e0 ! Regolith layer cohesion (Pa) ! Value taken from Colwell et al. (2007) Rev. of Geophys. v. 45 p. RG2006 ! For upper 0-60 cm @@ -59,10 +59,10 @@ neff 5.0d-10 ! Impact energy seismic efficien ! Optional inputF These have internally set default values that work reasonable well. Comment them out with -deplimit 10d3 ! Depth limit for craters (m) - Default is to ignore. -maxcrat 0.33d0 ! Fraction of gridsize that maximum crater can be - Default 1.0 +deplimit 10e3 ! Depth limit for craters (m) - Default is to ignore. +maxcrat 0.33e0 ! Fraction of gridsize that maximum crater can be - Default 1.0 killatmaxcrater F ! Stop the run if a crater larger than the maximum is produced - Default F -basinimp 35.0d3 ! Size of impactor to switch to lunar basin scaling law - Default is to ignore +basinimp 35.0e3 ! Size of impactor to switch to lunar basin scaling law - Default is to ignore docollapse T ! Do slope collapse - Default T dosoftening T ! Do ejecta softening - Default T doangle T ! Vary the impact angle. Set to F to have only vertical impacts - Default T @@ -75,10 +75,10 @@ dorays T ! Testing input. These are used to perform non-Monte Carlo tests. testflag F ! Set to T to create a single crater with user-defined impactor properties testimp 20.0 ! Diameter of test impactor (m) -testvel 15.d3 ! Velocity of test crater (m/s) +testvel 15.e3 ! Velocity of test crater (m/s) testang 90.0 ! Impact angle of test crater (deg) - Default 90.0 -testxoffset 0.0d0 ! x-axis offset of crater center from grid center (m) - Default 0.0 -testyoffset 0.0d0 ! y-axis offset of crater center from grid center (m) - Default 0.0 +testxoffset 0.0e0 ! x-axis offset of crater center from grid center (m) - Default 0.0 +testyoffset 0.0e0 ! y-axis offset of crater center from grid center (m) - Default 0.0 tallyonly F ! Tally the craters without generating any craters testtally F ! Set to T to count all non-cookie cut craters, regardless of score diff --git a/examples/morphology_test_cases/complex/cleanup b/examples/morphology_test_cases/complex/cleanup index 912eba46..7b2a46f1 100755 --- a/examples/morphology_test_cases/complex/cleanup +++ b/examples/morphology_test_cases/complex/cleanup @@ -1,8 +1,8 @@ #!/bin/bash -rm console/console*.jpg -rm surf/surf*.jpg -rm rego/rego*.jpg -rm shaded/shaded*.jpg +rm console/console*.* +rm surf/surf*.* +rm rego/rego*.* +rm shaded/shaded*.* rm dist/odist_*.dat rm dist/tdist_*.dat rm dist/pdist_*.dat diff --git a/examples/morphology_test_cases/simple/cleanup b/examples/morphology_test_cases/simple/cleanup index 912eba46..7b2a46f1 100755 --- a/examples/morphology_test_cases/simple/cleanup +++ b/examples/morphology_test_cases/simple/cleanup @@ -1,8 +1,8 @@ #!/bin/bash -rm console/console*.jpg -rm surf/surf*.jpg -rm rego/rego*.jpg -rm shaded/shaded*.jpg +rm console/console*.* +rm surf/surf*.* +rm rego/rego*.* +rm shaded/shaded*.* rm dist/odist_*.dat rm dist/tdist_*.dat rm dist/pdist_*.dat