diff --git a/.gitignore b/.gitignore index 466def83..ae5d7ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ INSTALL Makefile.in config/ + +examples/global-lunar-bombardment/.DS_Store + +examples/mare-with-rays-model2/.DS_Store diff --git a/examples/.DS_Store b/examples/.DS_Store new file mode 100644 index 00000000..11748541 Binary files /dev/null and b/examples/.DS_Store differ diff --git a/tests/global-lunar-bombardment/CTEM b/examples/global-lunar-bombardment/CTEM similarity index 100% rename from tests/global-lunar-bombardment/CTEM rename to examples/global-lunar-bombardment/CTEM diff --git a/tests/Minton_et_al_2019_ray2/FassettCounts.txt b/examples/global-lunar-bombardment/FassettCounts.txt old mode 100644 new mode 100755 similarity index 100% rename from tests/Minton_et_al_2019_ray2/FassettCounts.txt rename to examples/global-lunar-bombardment/FassettCounts.txt diff --git a/tests/global-lunar-bombardment/LOLASethCraterCatalogv8gt20-binned.dat b/examples/global-lunar-bombardment/LOLASethCraterCatalogv8gt20-binned.dat similarity index 100% rename from tests/global-lunar-bombardment/LOLASethCraterCatalogv8gt20-binned.dat rename to examples/global-lunar-bombardment/LOLASethCraterCatalogv8gt20-binned.dat diff --git a/tests/global-lunar-bombardment/NPFextrap.dat b/examples/global-lunar-bombardment/NPFextrap.dat similarity index 100% rename from tests/global-lunar-bombardment/NPFextrap.dat rename to examples/global-lunar-bombardment/NPFextrap.dat diff --git a/tests/Minton_et_al_2019_ray2/cleanup b/examples/global-lunar-bombardment/cleanup similarity index 100% rename from tests/Minton_et_al_2019_ray2/cleanup rename to examples/global-lunar-bombardment/cleanup diff --git a/tests/global-lunar-bombardment/coeffit.dat b/examples/global-lunar-bombardment/coeffit.dat similarity index 100% rename from tests/global-lunar-bombardment/coeffit.dat rename to examples/global-lunar-bombardment/coeffit.dat diff --git a/tests/global-lunar-bombardment/counttest.eps b/examples/global-lunar-bombardment/counttest.eps similarity index 100% rename from tests/global-lunar-bombardment/counttest.eps rename to examples/global-lunar-bombardment/counttest.eps diff --git a/tests/global-lunar-bombardment/ctem.in b/examples/global-lunar-bombardment/ctem.in similarity index 100% rename from tests/global-lunar-bombardment/ctem.in rename to examples/global-lunar-bombardment/ctem.in diff --git a/tests/Minton_et_al_2019_ray2/ctem_driver.pro b/examples/global-lunar-bombardment/ctem_driver.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_driver.pro rename to examples/global-lunar-bombardment/ctem_driver.pro diff --git a/tests/global-lunar-bombardment/ctem_driver.py b/examples/global-lunar-bombardment/ctem_driver.py similarity index 100% rename from tests/global-lunar-bombardment/ctem_driver.py rename to examples/global-lunar-bombardment/ctem_driver.py diff --git a/tests/Minton_et_al_2019_ray2/ctem_image_dem.pro b/examples/global-lunar-bombardment/ctem_image_dem.pro similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_image_dem.pro rename to examples/global-lunar-bombardment/ctem_image_dem.pro diff --git a/tests/Minton_et_al_2019_ray2/ctem_image_presentation.pro b/examples/global-lunar-bombardment/ctem_image_presentation.pro similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_image_presentation.pro rename to examples/global-lunar-bombardment/ctem_image_presentation.pro diff --git a/tests/Minton_et_al_2019_ray2/ctem_image_regolith.pro b/examples/global-lunar-bombardment/ctem_image_regolith.pro similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_image_regolith.pro rename to examples/global-lunar-bombardment/ctem_image_regolith.pro diff --git a/tests/Minton_et_al_2019_ray2/ctem_image_shaded_relief.pro b/examples/global-lunar-bombardment/ctem_image_shaded_relief.pro similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_image_shaded_relief.pro rename to examples/global-lunar-bombardment/ctem_image_shaded_relief.pro diff --git a/tests/Minton_et_al_2019_ray2/ctem_io_read_input.pro b/examples/global-lunar-bombardment/ctem_io_read_input.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_io_read_input.pro rename to examples/global-lunar-bombardment/ctem_io_read_input.pro diff --git a/tests/Minton_et_al_2019_ray2/ctem_io_read_old.pro b/examples/global-lunar-bombardment/ctem_io_read_old.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_io_read_old.pro rename to examples/global-lunar-bombardment/ctem_io_read_old.pro diff --git a/tests/Minton_et_al_2019_ray2/ctem_io_readers.py b/examples/global-lunar-bombardment/ctem_io_readers.py similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_io_readers.py rename to examples/global-lunar-bombardment/ctem_io_readers.py diff --git a/tests/Minton_et_al_2019_ray2/ctem_io_writers.py b/examples/global-lunar-bombardment/ctem_io_writers.py similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_io_writers.py rename to examples/global-lunar-bombardment/ctem_io_writers.py diff --git a/tests/Minton_et_al_2019_ray2/ctem_window_display.pro b/examples/global-lunar-bombardment/ctem_window_display.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_window_display.pro rename to examples/global-lunar-bombardment/ctem_window_display.pro diff --git a/tests/global-lunar-bombardment/fit.log b/examples/global-lunar-bombardment/fit.log similarity index 100% rename from tests/global-lunar-bombardment/fit.log rename to examples/global-lunar-bombardment/fit.log diff --git a/tests/global-lunar-bombardment/getjob b/examples/global-lunar-bombardment/getjob similarity index 100% rename from tests/global-lunar-bombardment/getjob rename to examples/global-lunar-bombardment/getjob diff --git a/tests/Minton_et_al_2019_ray2/lunar-MBA-impactor-velocities.dat b/examples/global-lunar-bombardment/lunar-MBA-impactor-velocities.dat old mode 100644 new mode 100755 similarity index 100% rename from tests/Minton_et_al_2019_ray2/lunar-MBA-impactor-velocities.dat rename to examples/global-lunar-bombardment/lunar-MBA-impactor-velocities.dat diff --git a/tests/global-lunar-bombardment/misc/ctem000001.dat b/examples/global-lunar-bombardment/misc/ctem000001.dat similarity index 100% rename from tests/global-lunar-bombardment/misc/ctem000001.dat rename to examples/global-lunar-bombardment/misc/ctem000001.dat diff --git a/tests/global-lunar-bombardment/runjob b/examples/global-lunar-bombardment/runjob similarity index 100% rename from tests/global-lunar-bombardment/runjob rename to examples/global-lunar-bombardment/runjob diff --git a/tests/Minton_et_al_2019_ray2/start.in b/examples/global-lunar-bombardment/start.in old mode 100644 new mode 100755 similarity index 100% rename from tests/Minton_et_al_2019_ray2/start.in rename to examples/global-lunar-bombardment/start.in diff --git a/examples/mare-with-rays-model2/CTEM b/examples/mare-with-rays-model2/CTEM new file mode 120000 index 00000000..604970bd --- /dev/null +++ b/examples/mare-with-rays-model2/CTEM @@ -0,0 +1 @@ +../../build/src/CTEM \ No newline at end of file diff --git a/tests/global-lunar-bombardment/FassettCounts.txt b/examples/mare-with-rays-model2/FassettCounts.txt old mode 100755 new mode 100644 similarity index 100% rename from tests/global-lunar-bombardment/FassettCounts.txt rename to examples/mare-with-rays-model2/FassettCounts.txt diff --git a/tests/Minton_et_al_2019_ray2/RAYPARAMS.txt b/examples/mare-with-rays-model2/RAYPARAMS.txt similarity index 100% rename from tests/Minton_et_al_2019_ray2/RAYPARAMS.txt rename to examples/mare-with-rays-model2/RAYPARAMS.txt diff --git a/tests/Minton_et_al_2019_ray2/Robbins2014-A15-FassettCounts-binned.dat b/examples/mare-with-rays-model2/Robbins2014-A15-FassettCounts-binned.dat similarity index 100% rename from tests/Minton_et_al_2019_ray2/Robbins2014-A15-FassettCounts-binned.dat rename to examples/mare-with-rays-model2/Robbins2014-A15-FassettCounts-binned.dat diff --git a/tests/global-lunar-bombardment/cleanup b/examples/mare-with-rays-model2/cleanup similarity index 100% rename from tests/global-lunar-bombardment/cleanup rename to examples/mare-with-rays-model2/cleanup diff --git a/tests/Minton_et_al_2019_ray2/ctem.in b/examples/mare-with-rays-model2/ctem.in similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem.in rename to examples/mare-with-rays-model2/ctem.in diff --git a/tests/global-lunar-bombardment/ctem_driver.pro b/examples/mare-with-rays-model2/ctem_driver.pro old mode 100755 new mode 100644 similarity index 100% rename from tests/global-lunar-bombardment/ctem_driver.pro rename to examples/mare-with-rays-model2/ctem_driver.pro diff --git a/tests/Minton_et_al_2019_ray2/ctem_driver.py b/examples/mare-with-rays-model2/ctem_driver.py similarity index 100% rename from tests/Minton_et_al_2019_ray2/ctem_driver.py rename to examples/mare-with-rays-model2/ctem_driver.py diff --git a/tests/global-lunar-bombardment/ctem_image_dem.pro b/examples/mare-with-rays-model2/ctem_image_dem.pro similarity index 100% rename from tests/global-lunar-bombardment/ctem_image_dem.pro rename to examples/mare-with-rays-model2/ctem_image_dem.pro diff --git a/tests/global-lunar-bombardment/ctem_image_presentation.pro b/examples/mare-with-rays-model2/ctem_image_presentation.pro similarity index 100% rename from tests/global-lunar-bombardment/ctem_image_presentation.pro rename to examples/mare-with-rays-model2/ctem_image_presentation.pro diff --git a/tests/global-lunar-bombardment/ctem_image_regolith.pro b/examples/mare-with-rays-model2/ctem_image_regolith.pro similarity index 100% rename from tests/global-lunar-bombardment/ctem_image_regolith.pro rename to examples/mare-with-rays-model2/ctem_image_regolith.pro diff --git a/tests/global-lunar-bombardment/ctem_image_shaded_relief.pro b/examples/mare-with-rays-model2/ctem_image_shaded_relief.pro similarity index 100% rename from tests/global-lunar-bombardment/ctem_image_shaded_relief.pro rename to examples/mare-with-rays-model2/ctem_image_shaded_relief.pro diff --git a/tests/global-lunar-bombardment/ctem_io_read_input.pro b/examples/mare-with-rays-model2/ctem_io_read_input.pro old mode 100755 new mode 100644 similarity index 100% rename from tests/global-lunar-bombardment/ctem_io_read_input.pro rename to examples/mare-with-rays-model2/ctem_io_read_input.pro diff --git a/tests/global-lunar-bombardment/ctem_io_read_old.pro b/examples/mare-with-rays-model2/ctem_io_read_old.pro old mode 100755 new mode 100644 similarity index 100% rename from tests/global-lunar-bombardment/ctem_io_read_old.pro rename to examples/mare-with-rays-model2/ctem_io_read_old.pro diff --git a/tests/global-lunar-bombardment/ctem_io_readers.py b/examples/mare-with-rays-model2/ctem_io_readers.py similarity index 100% rename from tests/global-lunar-bombardment/ctem_io_readers.py rename to examples/mare-with-rays-model2/ctem_io_readers.py diff --git a/tests/global-lunar-bombardment/ctem_io_writers.py b/examples/mare-with-rays-model2/ctem_io_writers.py similarity index 100% rename from tests/global-lunar-bombardment/ctem_io_writers.py rename to examples/mare-with-rays-model2/ctem_io_writers.py diff --git a/tests/global-lunar-bombardment/ctem_window_display.pro b/examples/mare-with-rays-model2/ctem_window_display.pro old mode 100755 new mode 100644 similarity index 100% rename from tests/global-lunar-bombardment/ctem_window_display.pro rename to examples/mare-with-rays-model2/ctem_window_display.pro diff --git a/tests/Minton_et_al_2019_ray2/eta-3.2.dat b/examples/mare-with-rays-model2/eta-3.2.dat similarity index 100% rename from tests/Minton_et_al_2019_ray2/eta-3.2.dat rename to examples/mare-with-rays-model2/eta-3.2.dat diff --git a/tests/global-lunar-bombardment/lunar-MBA-impactor-velocities.dat b/examples/mare-with-rays-model2/lunar-MBA-impactor-velocities.dat old mode 100755 new mode 100644 similarity index 100% rename from tests/global-lunar-bombardment/lunar-MBA-impactor-velocities.dat rename to examples/mare-with-rays-model2/lunar-MBA-impactor-velocities.dat diff --git a/tests/Minton_et_al_2019_ray2/params.plt b/examples/mare-with-rays-model2/params.plt similarity index 100% rename from tests/Minton_et_al_2019_ray2/params.plt rename to examples/mare-with-rays-model2/params.plt diff --git a/tests/Minton_et_al_2019_ray2/runjob b/examples/mare-with-rays-model2/runjob similarity index 100% rename from tests/Minton_et_al_2019_ray2/runjob rename to examples/mare-with-rays-model2/runjob diff --git a/tests/global-lunar-bombardment/start.in b/examples/mare-with-rays-model2/start.in old mode 100755 new mode 100644 similarity index 100% rename from tests/global-lunar-bombardment/start.in rename to examples/mare-with-rays-model2/start.in diff --git a/tests/morphology_test_cases/.DS_Store b/examples/morphology_test_cases/.DS_Store similarity index 100% rename from tests/morphology_test_cases/.DS_Store rename to examples/morphology_test_cases/.DS_Store diff --git a/examples/morphology_test_cases/complex/CTEM b/examples/morphology_test_cases/complex/CTEM new file mode 120000 index 00000000..9173fccf --- /dev/null +++ b/examples/morphology_test_cases/complex/CTEM @@ -0,0 +1 @@ +../../../build/src/CTEM \ No newline at end of file diff --git a/tests/mare-with-rays-model2/FassettCounts.txt b/examples/morphology_test_cases/complex/FassettCounts.txt old mode 100644 new mode 100755 similarity index 100% rename from tests/mare-with-rays-model2/FassettCounts.txt rename to examples/morphology_test_cases/complex/FassettCounts.txt diff --git a/tests/morphology_test_cases/complex/LOLASethCraterCatalogv8gt20-binned.dat b/examples/morphology_test_cases/complex/LOLASethCraterCatalogv8gt20-binned.dat similarity index 100% rename from tests/morphology_test_cases/complex/LOLASethCraterCatalogv8gt20-binned.dat rename to examples/morphology_test_cases/complex/LOLASethCraterCatalogv8gt20-binned.dat diff --git a/tests/morphology_test_cases/complex/NPFextrap.dat b/examples/morphology_test_cases/complex/NPFextrap.dat similarity index 100% rename from tests/morphology_test_cases/complex/NPFextrap.dat rename to examples/morphology_test_cases/complex/NPFextrap.dat diff --git a/tests/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc b/examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc similarity index 100% rename from tests/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc rename to examples/morphology_test_cases/complex/__pycache__/ctem_io_readers.cpython-37.pyc diff --git a/tests/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc b/examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc similarity index 100% rename from tests/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc rename to examples/morphology_test_cases/complex/__pycache__/ctem_io_writers.cpython-37.pyc diff --git a/tests/morphology_test_cases/complex/cleanup b/examples/morphology_test_cases/complex/cleanup similarity index 100% rename from tests/morphology_test_cases/complex/cleanup rename to examples/morphology_test_cases/complex/cleanup diff --git a/tests/morphology_test_cases/complex/ctem.in b/examples/morphology_test_cases/complex/ctem.in similarity index 100% rename from tests/morphology_test_cases/complex/ctem.in rename to examples/morphology_test_cases/complex/ctem.in diff --git a/tests/mare-with-rays-model2/ctem_driver.pro b/examples/morphology_test_cases/complex/ctem_driver.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/mare-with-rays-model2/ctem_driver.pro rename to examples/morphology_test_cases/complex/ctem_driver.pro diff --git a/tests/morphology_test_cases/complex/ctem_driver.py b/examples/morphology_test_cases/complex/ctem_driver.py similarity index 100% rename from tests/morphology_test_cases/complex/ctem_driver.py rename to examples/morphology_test_cases/complex/ctem_driver.py diff --git a/tests/mare-with-rays-model2/ctem_image_dem.pro b/examples/morphology_test_cases/complex/ctem_image_dem.pro similarity index 100% rename from tests/mare-with-rays-model2/ctem_image_dem.pro rename to examples/morphology_test_cases/complex/ctem_image_dem.pro diff --git a/tests/mare-with-rays-model2/ctem_image_presentation.pro b/examples/morphology_test_cases/complex/ctem_image_presentation.pro similarity index 100% rename from tests/mare-with-rays-model2/ctem_image_presentation.pro rename to examples/morphology_test_cases/complex/ctem_image_presentation.pro diff --git a/tests/mare-with-rays-model2/ctem_image_regolith.pro b/examples/morphology_test_cases/complex/ctem_image_regolith.pro similarity index 100% rename from tests/mare-with-rays-model2/ctem_image_regolith.pro rename to examples/morphology_test_cases/complex/ctem_image_regolith.pro diff --git a/tests/mare-with-rays-model2/ctem_image_shaded_relief.pro b/examples/morphology_test_cases/complex/ctem_image_shaded_relief.pro similarity index 100% rename from tests/mare-with-rays-model2/ctem_image_shaded_relief.pro rename to examples/morphology_test_cases/complex/ctem_image_shaded_relief.pro diff --git a/tests/mare-with-rays-model2/ctem_io_read_input.pro b/examples/morphology_test_cases/complex/ctem_io_read_input.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/mare-with-rays-model2/ctem_io_read_input.pro rename to examples/morphology_test_cases/complex/ctem_io_read_input.pro diff --git a/tests/mare-with-rays-model2/ctem_io_read_old.pro b/examples/morphology_test_cases/complex/ctem_io_read_old.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/mare-with-rays-model2/ctem_io_read_old.pro rename to examples/morphology_test_cases/complex/ctem_io_read_old.pro diff --git a/tests/mare-with-rays-model2/ctem_io_readers.py b/examples/morphology_test_cases/complex/ctem_io_readers.py similarity index 100% rename from tests/mare-with-rays-model2/ctem_io_readers.py rename to examples/morphology_test_cases/complex/ctem_io_readers.py diff --git a/tests/mare-with-rays-model2/ctem_io_writers.py b/examples/morphology_test_cases/complex/ctem_io_writers.py similarity index 100% rename from tests/mare-with-rays-model2/ctem_io_writers.py rename to examples/morphology_test_cases/complex/ctem_io_writers.py diff --git a/tests/mare-with-rays-model2/ctem_window_display.pro b/examples/morphology_test_cases/complex/ctem_window_display.pro old mode 100644 new mode 100755 similarity index 100% rename from tests/mare-with-rays-model2/ctem_window_display.pro rename to examples/morphology_test_cases/complex/ctem_window_display.pro diff --git a/tests/morphology_test_cases/complex/getjob b/examples/morphology_test_cases/complex/getjob similarity index 100% rename from tests/morphology_test_cases/complex/getjob rename to examples/morphology_test_cases/complex/getjob diff --git a/tests/mare-with-rays-model2/lunar-MBA-impactor-velocities.dat b/examples/morphology_test_cases/complex/lunar-MBA-impactor-velocities.dat old mode 100644 new mode 100755 similarity index 100% rename from tests/mare-with-rays-model2/lunar-MBA-impactor-velocities.dat rename to examples/morphology_test_cases/complex/lunar-MBA-impactor-velocities.dat diff --git a/tests/morphology_test_cases/complex/misc/ctem000001.dat b/examples/morphology_test_cases/complex/misc/ctem000001.dat similarity index 100% rename from tests/morphology_test_cases/complex/misc/ctem000001.dat rename to examples/morphology_test_cases/complex/misc/ctem000001.dat diff --git a/tests/morphology_test_cases/complex/runjob b/examples/morphology_test_cases/complex/runjob similarity index 100% rename from tests/morphology_test_cases/complex/runjob rename to examples/morphology_test_cases/complex/runjob diff --git a/tests/mare-with-rays-model2/start.in b/examples/morphology_test_cases/complex/start.in old mode 100644 new mode 100755 similarity index 100% rename from tests/mare-with-rays-model2/start.in rename to examples/morphology_test_cases/complex/start.in diff --git a/tests/morphology_test_cases/complex/surf/surf000000.png b/examples/morphology_test_cases/complex/surf/surf000000.png similarity index 100% rename from tests/morphology_test_cases/complex/surf/surf000000.png rename to examples/morphology_test_cases/complex/surf/surf000000.png diff --git a/tests/morphology_test_cases/complex/surf/surf000001.png b/examples/morphology_test_cases/complex/surf/surf000001.png similarity index 100% rename from tests/morphology_test_cases/complex/surf/surf000001.png rename to examples/morphology_test_cases/complex/surf/surf000001.png diff --git a/tests/morphology_test_cases/complex/testprofile.dat b/examples/morphology_test_cases/complex/testprofile.dat similarity index 100% rename from tests/morphology_test_cases/complex/testprofile.dat rename to examples/morphology_test_cases/complex/testprofile.dat diff --git a/tests/morphology_test_cases/complex/testprofile.plt b/examples/morphology_test_cases/complex/testprofile.plt similarity index 100% rename from tests/morphology_test_cases/complex/testprofile.plt rename to examples/morphology_test_cases/complex/testprofile.plt diff --git a/examples/morphology_test_cases/simple/CTEM b/examples/morphology_test_cases/simple/CTEM new file mode 120000 index 00000000..9173fccf --- /dev/null +++ b/examples/morphology_test_cases/simple/CTEM @@ -0,0 +1 @@ +../../../build/src/CTEM \ No newline at end of file diff --git a/tests/morphology_test_cases/complex/FassettCounts.txt b/examples/morphology_test_cases/simple/FassettCounts.txt similarity index 100% rename from tests/morphology_test_cases/complex/FassettCounts.txt rename to examples/morphology_test_cases/simple/FassettCounts.txt diff --git a/tests/morphology_test_cases/simple/LOLASethCraterCatalogv8gt20-binned.dat b/examples/morphology_test_cases/simple/LOLASethCraterCatalogv8gt20-binned.dat similarity index 100% rename from tests/morphology_test_cases/simple/LOLASethCraterCatalogv8gt20-binned.dat rename to examples/morphology_test_cases/simple/LOLASethCraterCatalogv8gt20-binned.dat diff --git a/tests/morphology_test_cases/simple/NPFextrap.dat b/examples/morphology_test_cases/simple/NPFextrap.dat similarity index 100% rename from tests/morphology_test_cases/simple/NPFextrap.dat rename to examples/morphology_test_cases/simple/NPFextrap.dat diff --git a/tests/morphology_test_cases/simple/__pycache__/ctem_io_readers.cpython-37.pyc b/examples/morphology_test_cases/simple/__pycache__/ctem_io_readers.cpython-37.pyc similarity index 100% rename from tests/morphology_test_cases/simple/__pycache__/ctem_io_readers.cpython-37.pyc rename to examples/morphology_test_cases/simple/__pycache__/ctem_io_readers.cpython-37.pyc diff --git a/tests/morphology_test_cases/simple/__pycache__/ctem_io_writers.cpython-37.pyc b/examples/morphology_test_cases/simple/__pycache__/ctem_io_writers.cpython-37.pyc similarity index 100% rename from tests/morphology_test_cases/simple/__pycache__/ctem_io_writers.cpython-37.pyc rename to examples/morphology_test_cases/simple/__pycache__/ctem_io_writers.cpython-37.pyc diff --git a/tests/morphology_test_cases/simple/cleanup b/examples/morphology_test_cases/simple/cleanup similarity index 100% rename from tests/morphology_test_cases/simple/cleanup rename to examples/morphology_test_cases/simple/cleanup diff --git a/tests/morphology_test_cases/simple/ctem.in b/examples/morphology_test_cases/simple/ctem.in similarity index 100% rename from tests/morphology_test_cases/simple/ctem.in rename to examples/morphology_test_cases/simple/ctem.in diff --git a/tests/morphology_test_cases/complex/ctem_driver.pro b/examples/morphology_test_cases/simple/ctem_driver.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_driver.pro rename to examples/morphology_test_cases/simple/ctem_driver.pro diff --git a/tests/morphology_test_cases/simple/ctem_driver.py b/examples/morphology_test_cases/simple/ctem_driver.py similarity index 100% rename from tests/morphology_test_cases/simple/ctem_driver.py rename to examples/morphology_test_cases/simple/ctem_driver.py diff --git a/tests/morphology_test_cases/complex/ctem_image_dem.pro b/examples/morphology_test_cases/simple/ctem_image_dem.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_image_dem.pro rename to examples/morphology_test_cases/simple/ctem_image_dem.pro diff --git a/tests/morphology_test_cases/complex/ctem_image_presentation.pro b/examples/morphology_test_cases/simple/ctem_image_presentation.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_image_presentation.pro rename to examples/morphology_test_cases/simple/ctem_image_presentation.pro diff --git a/tests/morphology_test_cases/complex/ctem_image_regolith.pro b/examples/morphology_test_cases/simple/ctem_image_regolith.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_image_regolith.pro rename to examples/morphology_test_cases/simple/ctem_image_regolith.pro diff --git a/tests/morphology_test_cases/complex/ctem_image_shaded_relief.pro b/examples/morphology_test_cases/simple/ctem_image_shaded_relief.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_image_shaded_relief.pro rename to examples/morphology_test_cases/simple/ctem_image_shaded_relief.pro diff --git a/tests/morphology_test_cases/complex/ctem_io_read_input.pro b/examples/morphology_test_cases/simple/ctem_io_read_input.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_io_read_input.pro rename to examples/morphology_test_cases/simple/ctem_io_read_input.pro diff --git a/tests/morphology_test_cases/complex/ctem_io_read_old.pro b/examples/morphology_test_cases/simple/ctem_io_read_old.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_io_read_old.pro rename to examples/morphology_test_cases/simple/ctem_io_read_old.pro diff --git a/tests/morphology_test_cases/complex/ctem_io_readers.py b/examples/morphology_test_cases/simple/ctem_io_readers.py similarity index 100% rename from tests/morphology_test_cases/complex/ctem_io_readers.py rename to examples/morphology_test_cases/simple/ctem_io_readers.py diff --git a/tests/morphology_test_cases/complex/ctem_io_writers.py b/examples/morphology_test_cases/simple/ctem_io_writers.py similarity index 100% rename from tests/morphology_test_cases/complex/ctem_io_writers.py rename to examples/morphology_test_cases/simple/ctem_io_writers.py diff --git a/tests/morphology_test_cases/complex/ctem_window_display.pro b/examples/morphology_test_cases/simple/ctem_window_display.pro similarity index 100% rename from tests/morphology_test_cases/complex/ctem_window_display.pro rename to examples/morphology_test_cases/simple/ctem_window_display.pro diff --git a/tests/morphology_test_cases/simple/getjob b/examples/morphology_test_cases/simple/getjob similarity index 100% rename from tests/morphology_test_cases/simple/getjob rename to examples/morphology_test_cases/simple/getjob diff --git a/tests/morphology_test_cases/complex/lunar-MBA-impactor-velocities.dat b/examples/morphology_test_cases/simple/lunar-MBA-impactor-velocities.dat similarity index 100% rename from tests/morphology_test_cases/complex/lunar-MBA-impactor-velocities.dat rename to examples/morphology_test_cases/simple/lunar-MBA-impactor-velocities.dat diff --git a/tests/morphology_test_cases/simple/misc/ctem000001.dat b/examples/morphology_test_cases/simple/misc/ctem000001.dat similarity index 100% rename from tests/morphology_test_cases/simple/misc/ctem000001.dat rename to examples/morphology_test_cases/simple/misc/ctem000001.dat diff --git a/tests/morphology_test_cases/simple/runjob b/examples/morphology_test_cases/simple/runjob similarity index 100% rename from tests/morphology_test_cases/simple/runjob rename to examples/morphology_test_cases/simple/runjob diff --git a/tests/morphology_test_cases/complex/start.in b/examples/morphology_test_cases/simple/start.in similarity index 100% rename from tests/morphology_test_cases/complex/start.in rename to examples/morphology_test_cases/simple/start.in diff --git a/tests/morphology_test_cases/simple/surf/surf000000.png b/examples/morphology_test_cases/simple/surf/surf000000.png similarity index 100% rename from tests/morphology_test_cases/simple/surf/surf000000.png rename to examples/morphology_test_cases/simple/surf/surf000000.png diff --git a/tests/morphology_test_cases/simple/surf/surf000001.png b/examples/morphology_test_cases/simple/surf/surf000001.png similarity index 100% rename from tests/morphology_test_cases/simple/surf/surf000001.png rename to examples/morphology_test_cases/simple/surf/surf000001.png diff --git a/tests/morphology_test_cases/simple/testprofile.dat b/examples/morphology_test_cases/simple/testprofile.dat similarity index 100% rename from tests/morphology_test_cases/simple/testprofile.dat rename to examples/morphology_test_cases/simple/testprofile.dat diff --git a/examples/ray-generation-test-environment/CTEM b/examples/ray-generation-test-environment/CTEM new file mode 120000 index 00000000..604970bd --- /dev/null +++ b/examples/ray-generation-test-environment/CTEM @@ -0,0 +1 @@ +../../build/src/CTEM \ No newline at end of file diff --git a/tests/ray-generation-test-environment/LOLASethCraterCatalogv8gt20-binned.dat b/examples/ray-generation-test-environment/LOLASethCraterCatalogv8gt20-binned.dat similarity index 100% rename from tests/ray-generation-test-environment/LOLASethCraterCatalogv8gt20-binned.dat rename to examples/ray-generation-test-environment/LOLASethCraterCatalogv8gt20-binned.dat diff --git a/tests/ray-generation-test-environment/MintonLunarProduction.dat b/examples/ray-generation-test-environment/MintonLunarProduction.dat similarity index 100% rename from tests/ray-generation-test-environment/MintonLunarProduction.dat rename to examples/ray-generation-test-environment/MintonLunarProduction.dat diff --git a/tests/ray-generation-test-environment/SinusMedii-data-binned.dat b/examples/ray-generation-test-environment/SinusMedii-data-binned.dat similarity index 100% rename from tests/ray-generation-test-environment/SinusMedii-data-binned.dat rename to examples/ray-generation-test-environment/SinusMedii-data-binned.dat diff --git a/tests/ray-generation-test-environment/Strom-frontside-highlands.csv b/examples/ray-generation-test-environment/Strom-frontside-highlands.csv similarity index 100% rename from tests/ray-generation-test-environment/Strom-frontside-highlands.csv rename to examples/ray-generation-test-environment/Strom-frontside-highlands.csv diff --git a/tests/ray-generation-test-environment/bar.pro b/examples/ray-generation-test-environment/bar.pro similarity index 100% rename from tests/ray-generation-test-environment/bar.pro rename to examples/ray-generation-test-environment/bar.pro diff --git a/tests/ray-generation-test-environment/cleanup b/examples/ray-generation-test-environment/cleanup similarity index 100% rename from tests/ray-generation-test-environment/cleanup rename to examples/ray-generation-test-environment/cleanup diff --git a/tests/ray-generation-test-environment/ctem.in b/examples/ray-generation-test-environment/ctem.in similarity index 100% rename from tests/ray-generation-test-environment/ctem.in rename to examples/ray-generation-test-environment/ctem.in diff --git a/tests/ray-generation-test-environment/ctem_driver.pro b/examples/ray-generation-test-environment/ctem_driver.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_driver.pro rename to examples/ray-generation-test-environment/ctem_driver.pro diff --git a/tests/morphology_test_cases/simple/ctem_image_dem.pro b/examples/ray-generation-test-environment/ctem_image_dem.pro similarity index 100% rename from tests/morphology_test_cases/simple/ctem_image_dem.pro rename to examples/ray-generation-test-environment/ctem_image_dem.pro diff --git a/tests/morphology_test_cases/simple/ctem_image_presentation.pro b/examples/ray-generation-test-environment/ctem_image_presentation.pro similarity index 100% rename from tests/morphology_test_cases/simple/ctem_image_presentation.pro rename to examples/ray-generation-test-environment/ctem_image_presentation.pro diff --git a/tests/ray-generation-test-environment/ctem_image_regolith.pro b/examples/ray-generation-test-environment/ctem_image_regolith.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_image_regolith.pro rename to examples/ray-generation-test-environment/ctem_image_regolith.pro diff --git a/tests/morphology_test_cases/simple/ctem_image_shaded_relief.pro b/examples/ray-generation-test-environment/ctem_image_shaded_relief.pro similarity index 100% rename from tests/morphology_test_cases/simple/ctem_image_shaded_relief.pro rename to examples/ray-generation-test-environment/ctem_image_shaded_relief.pro diff --git a/tests/ray-generation-test-environment/ctem_io_read_input.pro b/examples/ray-generation-test-environment/ctem_io_read_input.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_io_read_input.pro rename to examples/ray-generation-test-environment/ctem_io_read_input.pro diff --git a/tests/morphology_test_cases/simple/ctem_io_read_old.pro b/examples/ray-generation-test-environment/ctem_io_read_old.pro old mode 100755 new mode 100644 similarity index 100% rename from tests/morphology_test_cases/simple/ctem_io_read_old.pro rename to examples/ray-generation-test-environment/ctem_io_read_old.pro diff --git a/tests/morphology_test_cases/simple/ctem_window_display.pro b/examples/ray-generation-test-environment/ctem_window_display.pro old mode 100755 new mode 100644 similarity index 100% rename from tests/morphology_test_cases/simple/ctem_window_display.pro rename to examples/ray-generation-test-environment/ctem_window_display.pro diff --git a/tests/ray-generation-test-environment/lunar-MBA-impactor-velocities.dat b/examples/ray-generation-test-environment/lunar-MBA-impactor-velocities.dat similarity index 100% rename from tests/ray-generation-test-environment/lunar-MBA-impactor-velocities.dat rename to examples/ray-generation-test-environment/lunar-MBA-impactor-velocities.dat diff --git a/tests/morphology_test_cases/simple/start.in b/examples/ray-generation-test-environment/start.in old mode 100755 new mode 100644 similarity index 100% rename from tests/morphology_test_cases/simple/start.in rename to examples/ray-generation-test-environment/start.in diff --git a/tests/ray-generation-test-environment/testprofile.dat b/examples/ray-generation-test-environment/testprofile.dat similarity index 100% rename from tests/ray-generation-test-environment/testprofile.dat rename to examples/ray-generation-test-environment/testprofile.dat diff --git a/tests/ray-generation-test-environment/CTEM b/examples/regolith-transport-run-example/CTEM similarity index 100% rename from tests/ray-generation-test-environment/CTEM rename to examples/regolith-transport-run-example/CTEM diff --git a/tests/regolith-transport-run-example/LOLASethCraterCatalogv8gt20-binned.dat b/examples/regolith-transport-run-example/LOLASethCraterCatalogv8gt20-binned.dat similarity index 100% rename from tests/regolith-transport-run-example/LOLASethCraterCatalogv8gt20-binned.dat rename to examples/regolith-transport-run-example/LOLASethCraterCatalogv8gt20-binned.dat diff --git a/tests/regolith-transport-run-example/MintonLunarProduction.dat b/examples/regolith-transport-run-example/MintonLunarProduction.dat similarity index 100% rename from tests/regolith-transport-run-example/MintonLunarProduction.dat rename to examples/regolith-transport-run-example/MintonLunarProduction.dat diff --git a/tests/regolith-transport-run-example/SinusMedii-data-binned.dat b/examples/regolith-transport-run-example/SinusMedii-data-binned.dat similarity index 100% rename from tests/regolith-transport-run-example/SinusMedii-data-binned.dat rename to examples/regolith-transport-run-example/SinusMedii-data-binned.dat diff --git a/tests/regolith-transport-run-example/bar.pro b/examples/regolith-transport-run-example/bar.pro similarity index 100% rename from tests/regolith-transport-run-example/bar.pro rename to examples/regolith-transport-run-example/bar.pro diff --git a/tests/regolith-transport-run-example/cleanup b/examples/regolith-transport-run-example/cleanup similarity index 100% rename from tests/regolith-transport-run-example/cleanup rename to examples/regolith-transport-run-example/cleanup diff --git a/tests/regolith-transport-run-example/ctem.in b/examples/regolith-transport-run-example/ctem.in similarity index 100% rename from tests/regolith-transport-run-example/ctem.in rename to examples/regolith-transport-run-example/ctem.in diff --git a/tests/regolith-transport-run-example/ctem_driver.pro b/examples/regolith-transport-run-example/ctem_driver.pro similarity index 100% rename from tests/regolith-transport-run-example/ctem_driver.pro rename to examples/regolith-transport-run-example/ctem_driver.pro diff --git a/tests/ray-generation-test-environment/ctem_image_dem.pro b/examples/regolith-transport-run-example/ctem_image_dem.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_image_dem.pro rename to examples/regolith-transport-run-example/ctem_image_dem.pro diff --git a/tests/ray-generation-test-environment/ctem_image_presentation.pro b/examples/regolith-transport-run-example/ctem_image_presentation.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_image_presentation.pro rename to examples/regolith-transport-run-example/ctem_image_presentation.pro diff --git a/tests/morphology_test_cases/simple/ctem_image_regolith.pro b/examples/regolith-transport-run-example/ctem_image_regolith.pro similarity index 100% rename from tests/morphology_test_cases/simple/ctem_image_regolith.pro rename to examples/regolith-transport-run-example/ctem_image_regolith.pro diff --git a/tests/ray-generation-test-environment/ctem_image_shaded_relief.pro b/examples/regolith-transport-run-example/ctem_image_shaded_relief.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_image_shaded_relief.pro rename to examples/regolith-transport-run-example/ctem_image_shaded_relief.pro diff --git a/tests/regolith-transport-run-example/ctem_io_read_input.pro b/examples/regolith-transport-run-example/ctem_io_read_input.pro similarity index 100% rename from tests/regolith-transport-run-example/ctem_io_read_input.pro rename to examples/regolith-transport-run-example/ctem_io_read_input.pro diff --git a/tests/ray-generation-test-environment/ctem_io_read_old.pro b/examples/regolith-transport-run-example/ctem_io_read_old.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_io_read_old.pro rename to examples/regolith-transport-run-example/ctem_io_read_old.pro diff --git a/tests/ray-generation-test-environment/ctem_window_display.pro b/examples/regolith-transport-run-example/ctem_window_display.pro similarity index 100% rename from tests/ray-generation-test-environment/ctem_window_display.pro rename to examples/regolith-transport-run-example/ctem_window_display.pro diff --git a/tests/regolith-transport-run-example/lunar-MBA-impactor-velocities.dat b/examples/regolith-transport-run-example/lunar-MBA-impactor-velocities.dat similarity index 100% rename from tests/regolith-transport-run-example/lunar-MBA-impactor-velocities.dat rename to examples/regolith-transport-run-example/lunar-MBA-impactor-velocities.dat diff --git a/tests/ray-generation-test-environment/start.in b/examples/regolith-transport-run-example/start.in similarity index 100% rename from tests/ray-generation-test-environment/start.in rename to examples/regolith-transport-run-example/start.in diff --git a/tests/Minton_et_al_2019_ray2/CTEM b/tests/Minton_et_al_2019_ray2/CTEM deleted file mode 100755 index 2eb87649..00000000 Binary files a/tests/Minton_et_al_2019_ray2/CTEM and /dev/null differ diff --git a/tests/Minton_et_al_2019_ray2/N11_vs_interval.dat b/tests/Minton_et_al_2019_ray2/N11_vs_interval.dat deleted file mode 100644 index b1606043..00000000 --- a/tests/Minton_et_al_2019_ray2/N11_vs_interval.dat +++ /dev/null @@ -1,300 +0,0 @@ - 11.0485 15.6250 12.5444 17. 26. 0.007333 - 11.0485 15.6250 12.5769 33. 54. 0.014345 - 11.0485 15.6250 12.3068 38. 65. 0.015477 - 11.0485 15.6250 12.4471 61. 99. 0.025704 - 11.0485 15.6250 12.4790 76. 118. 0.032272 - 11.0485 15.6250 12.5352 97. 149. 0.041748 - 11.0485 15.6250 12.5708 114. 172. 0.049484 - 11.0485 15.6250 12.5772 134. 202. 0.058254 - 11.0485 15.6250 12.5932 139. 217. 0.060659 - 11.0485 15.6250 12.6342 154. 240. 0.067863 - 11.0485 15.6250 12.6421 165. 255. 0.072847 - 11.0485 15.6250 12.6804 178. 275. 0.079304 - 11.0485 15.6250 12.7610 151. 248. 0.068565 - 11.0485 15.6250 12.8145 161. 264. 0.074028 - 11.0485 15.6250 12.8154 161. 272. 0.074045 - 11.0485 15.6250 12.7823 172. 290. 0.078493 - 11.0485 15.6250 12.8309 191. 313. 0.088161 - 11.0485 15.6250 12.8309 177. 291. 0.081698 - 11.0485 15.6250 12.7910 185. 302. 0.084597 - 11.0485 15.6250 12.7820 185. 306. 0.084418 - 11.0485 15.6250 12.8042 186. 311. 0.085319 - 11.0485 15.6250 12.8043 189. 319. 0.086696 - 11.0485 15.6250 12.7369 171. 309. 0.077207 - 11.0485 15.6250 12.7371 176. 314. 0.079468 - 11.0485 15.6250 12.7233 179. 320. 0.080561 - 11.0485 15.6250 12.7262 179. 321. 0.080615 - 11.0485 15.6250 12.6818 183. 332. 0.081557 - 11.0485 15.6250 12.6361 177. 332. 0.078034 - 11.0485 15.6250 12.6673 180. 342. 0.079946 - 11.0485 15.6250 12.7148 187. 350. 0.083993 - 11.0485 15.6250 12.7949 176. 342. 0.080556 - 11.0485 15.6250 12.7985 174. 334. 0.079708 - 11.0485 15.6250 12.7359 177. 341. 0.079898 - 11.0485 15.6250 12.7436 178. 346. 0.080495 - 11.0485 15.6250 12.7914 181. 351. 0.082777 - 11.0485 15.6250 12.8455 148. 310. 0.068546 - 11.0485 15.6250 12.8567 152. 314. 0.070583 - 11.0485 15.6250 12.8628 150. 307. 0.069753 - 11.0485 15.6250 12.8701 150. 307. 0.069872 - 11.0485 15.6250 12.8366 109. 243. 0.050379 - 11.0485 15.6250 12.8347 116. 257. 0.053590 - 11.0485 15.6250 12.9057 119. 264. 0.055894 - 11.0485 15.6250 12.8177 131. 282. 0.060279 - 11.0485 15.6250 12.8518 140. 294. 0.064937 - 11.0485 15.6250 12.8919 161. 315. 0.075379 - 11.0485 15.6250 12.8879 167. 321. 0.078115 - 11.0485 15.6250 12.8540 174. 328. 0.080749 - 11.0485 15.6250 12.8925 179. 337. 0.083818 - 11.0485 15.6250 12.8542 190. 349. 0.088177 - 11.0485 15.6250 12.8406 209. 371. 0.096689 - 11.0485 15.6250 12.8582 209. 373. 0.097086 - 11.0485 15.6250 12.8640 207. 371. 0.096287 - 11.0485 15.6250 12.9123 191. 351. 0.089849 - 11.0485 15.6250 12.8686 158. 311. 0.073573 - 11.0485 15.6250 12.8394 168. 328. 0.077699 - 11.0485 15.6250 12.7960 14. 35. 0.006410 - 11.0485 15.6250 12.4806 32. 56. 0.013593 - 11.0485 15.6250 12.7422 51. 82. 0.023056 - 11.0485 15.6250 12.7561 73. 111. 0.033109 - 11.0485 15.6250 12.7141 89. 131. 0.039968 - 11.0485 15.6250 12.6162 89. 140. 0.039052 - 11.0485 15.6250 12.6188 103. 156. 0.045223 - 11.0485 15.6250 12.6676 104. 162. 0.046195 - 11.0485 15.6250 12.7173 105. 168. 0.047189 - 11.0485 15.6250 12.8120 120. 188. 0.055144 - 11.0485 15.6250 12.8670 105. 168. 0.048876 - 11.0485 15.6250 12.7501 115. 186. 0.052084 - 11.0485 15.6250 12.6808 89. 145. 0.039655 - 11.0485 15.6250 12.5788 105. 165. 0.045664 - 11.0485 15.6250 12.6656 117. 183. 0.051944 - 11.0485 15.6250 12.6831 124. 195. 0.055280 - 11.0485 15.6250 12.7161 137. 216. 0.061553 - 11.0485 15.6250 12.7405 140. 223. 0.063264 - 11.0485 15.6250 12.7110 138. 229. 0.061929 - 11.0485 15.6250 12.8127 135. 229. 0.062048 - 11.0485 15.6250 12.8469 143. 244. 0.066252 - 11.0485 15.6250 12.8422 157. 265. 0.072659 - 11.0485 15.6250 12.8004 166. 275. 0.076076 - 11.0485 15.6250 12.7853 174. 290. 0.079461 - 11.0485 15.6250 12.8371 192. 316. 0.088751 - 11.0485 15.6250 12.8540 186. 316. 0.086318 - 11.0485 15.6250 12.9070 171. 306. 0.080342 - 11.0485 15.6250 12.9567 177. 315. 0.084125 - 11.0485 15.6250 13.0140 168. 309. 0.080912 - 11.0485 15.6250 13.0587 175. 320. 0.085155 - 11.0485 15.6250 13.0531 173. 310. 0.084074 - 11.0485 15.6250 13.0695 169. 312. 0.082440 - 11.0485 15.6250 13.0254 169. 315. 0.081607 - 11.0485 15.6250 13.0343 157. 300. 0.075969 - 11.0485 15.6250 13.0143 159. 301. 0.076582 - 11.0485 15.6250 13.0669 154. 299. 0.075078 - 11.0485 15.6250 13.1178 43. 127. 0.021209 - 11.0485 15.6250 12.8640 51. 128. 0.023723 - 11.0485 15.6250 12.7337 57. 137. 0.025716 - 11.0485 15.6250 12.7918 69. 156. 0.031559 - 11.0485 15.6250 12.8822 78. 177. 0.036436 - 11.0485 15.6250 12.8920 90. 194. 0.042139 - 11.0485 15.6250 13.0355 97. 205. 0.046949 - 11.0485 15.6250 12.9664 89. 183. 0.042396 - 11.0485 15.6250 12.9463 97. 200. 0.045992 - 11.0485 15.6250 12.9537 106. 215. 0.050345 - 11.0485 15.6250 12.9103 110. 226. 0.051721 - 11.0485 15.6250 12.8739 124. 247. 0.057812 - 11.0485 15.6250 12.7806 141. 268. 0.064320 - 11.0485 15.6250 12.7056 125. 250. 0.056023 - 11.0485 15.6250 12.7519 90. 196. 0.040779 - 11.0485 15.6250 12.7395 92. 206. 0.041564 - 11.0485 15.6250 12.6526 66. 153. 0.029212 - 11.0485 15.6250 12.5854 77. 169. 0.033540 - 11.0485 15.6250 12.6177 86. 187. 0.037749 - 11.0485 15.6250 12.6679 87. 198. 0.038646 - 11.0485 15.6250 12.7063 105. 220. 0.047067 - 11.0485 15.6250 12.6866 117. 235. 0.052203 - 11.0485 15.6250 12.7301 133. 256. 0.059954 - 11.0485 15.6250 12.7691 145. 270. 0.065966 - 11.0485 15.6250 12.7182 156. 283. 0.070124 - 11.0485 15.6250 12.8283 170. 304. 0.078420 - 11.0485 15.6250 12.8371 171. 311. 0.079044 - 11.0485 15.6250 12.8645 169. 309. 0.078620 - 11.0485 15.6250 12.8685 186. 335. 0.086611 - 11.0485 15.6250 12.9195 181. 333. 0.085287 - 11.0485 15.6250 12.9540 175. 331. 0.083123 - 11.0485 15.6250 12.9901 176. 338. 0.084299 - 11.0485 15.6250 12.9680 183. 347. 0.087205 - 11.0485 15.6250 13.0097 190. 360. 0.091417 - 11.0485 15.6250 12.9901 194. 373. 0.092919 - 11.0485 15.6250 12.9734 198. 380. 0.094472 - 11.0485 15.6250 13.0086 204. 386. 0.098129 - 11.0485 15.6250 13.0225 205. 396. 0.098925 - 11.0485 15.6250 13.0120 186. 369. 0.089540 - 11.0485 15.6250 13.1047 193. 378. 0.094909 - 11.0485 15.6250 13.0492 91. 204. 0.044184 - 11.0485 15.6250 12.9874 102. 218. 0.048824 - 11.0485 15.6250 13.0027 108. 233. 0.051880 - 11.0485 15.6250 12.9881 96. 198. 0.045959 - 11.0485 15.6250 12.8960 88. 181. 0.041240 - 11.0485 15.6250 12.8680 105. 199. 0.048886 - 11.0485 15.6250 12.9253 116. 209. 0.054733 - 11.0485 15.6250 12.9331 119. 216. 0.056251 - 11.0485 15.6250 12.8319 127. 225. 0.058634 - 11.0485 15.6250 12.7856 139. 241. 0.063482 - 11.0485 15.6250 12.8547 113. 215. 0.052448 - 11.0485 15.6250 12.8151 110. 218. 0.050586 - 11.0485 15.6250 12.7832 124. 237. 0.056599 - 11.0485 15.6250 12.7127 130. 250. 0.058362 - 11.0485 15.6250 12.6722 139. 260. 0.061807 - 11.0485 15.6250 12.7157 146. 276. 0.065592 - 11.0485 15.6250 12.6752 141. 262. 0.062742 - 11.0485 15.6250 12.7460 151. 274. 0.068324 - 11.0485 15.6250 12.8163 149. 275. 0.068540 - 11.0485 15.6250 12.8008 150. 278. 0.068750 - 11.0485 15.6250 12.7650 154. 284. 0.069993 - 11.0485 15.6250 12.7762 152. 285. 0.069266 - 11.0485 15.6250 12.8117 163. 305. 0.074900 - 11.0485 15.6250 12.7890 167. 312. 0.076330 - 11.0485 15.6250 12.9474 166. 321. 0.078728 - 11.0485 15.6250 12.9439 172. 336. 0.081507 - 11.0485 15.6250 13.0045 135. 278. 0.064876 - 11.0485 15.6250 13.0199 153. 298. 0.073787 - 11.0485 15.6250 13.0239 158. 307. 0.076269 - 11.0485 15.6250 13.0140 170. 325. 0.081876 - 11.0485 15.6250 12.8778 161. 312. 0.075131 - 11.0485 15.6250 12.8391 153. 312. 0.070757 - 11.0485 15.6250 12.8304 158. 321. 0.072920 - 11.0485 15.6250 12.8641 159. 325. 0.073962 - 11.0485 15.6250 12.9828 73. 152. 0.034906 - 11.0485 15.6250 13.0638 81. 167. 0.039460 - 11.0485 15.6250 13.0747 44. 121. 0.021489 - 11.0485 15.6250 13.0324 64. 148. 0.030955 - 11.0485 15.6250 12.8651 85. 174. 0.039549 - 11.0485 15.6250 12.9561 100. 194. 0.047522 - 11.0485 15.6250 12.9820 111. 210. 0.053066 - 11.0485 15.6250 12.9471 86. 159. 0.040784 - 11.0485 15.6250 12.8668 80. 155. 0.037236 - 11.0485 15.6250 12.9479 94. 173. 0.044586 - 11.0485 15.6250 12.8798 96. 179. 0.044819 - 11.0485 15.6250 12.8727 100. 184. 0.046610 - 11.0485 15.6250 12.8903 109. 203. 0.051014 - 11.0485 15.6250 12.8377 109. 190. 0.050392 - 11.0485 15.6250 12.8330 113. 202. 0.052183 - 11.0485 15.6250 12.8406 110. 200. 0.050889 - 11.0485 15.6250 12.7812 118. 213. 0.053835 - 11.0485 15.6250 12.8024 123. 221. 0.056396 - 11.0485 15.6250 12.7968 129. 236. 0.059070 - 11.0485 15.6250 12.7499 141. 255. 0.063857 - 11.0485 15.6250 12.8075 88. 187. 0.040397 - 11.0485 15.6250 12.7021 67. 142. 0.030004 - 11.0485 15.6250 12.6583 81. 160. 0.035899 - 11.0485 15.6250 12.7088 90. 175. 0.040367 - 11.0485 15.6250 12.7430 108. 199. 0.048833 - 11.0485 15.6250 12.7338 119. 216. 0.053690 - 11.0485 15.6250 12.6207 52. 120. 0.022842 - 11.0485 15.6250 12.6634 59. 130. 0.026180 - 11.0485 15.6250 12.6228 65. 144. 0.028566 - 11.0485 15.6250 12.6797 65. 148. 0.028954 - 11.0485 15.6250 12.7135 70. 158. 0.031431 - 11.0485 15.6250 12.7019 35. 77. 0.015673 - 11.0485 15.6250 12.8172 50. 104. 0.023005 - 11.0485 15.6250 12.9060 67. 131. 0.031471 - 11.0485 15.6250 12.9353 83. 149. 0.039254 - 11.0485 15.6250 13.0290 103. 175. 0.049779 - 11.0485 15.6250 13.0030 109. 187. 0.052364 - 11.0485 15.6250 13.0506 114. 201. 0.055369 - 11.0485 15.6250 12.9699 121. 219. 0.057685 - 11.0485 15.6250 12.9198 125. 234. 0.058904 - 11.0485 15.6250 12.9154 132. 249. 0.062140 - 11.0485 15.6250 12.9026 133. 255. 0.062425 - 11.0485 15.6250 12.8651 115. 242. 0.053507 - 11.0485 15.6250 12.7599 114. 247. 0.051751 - 11.0485 15.6250 12.8606 132. 272. 0.061353 - 11.0485 15.6250 12.8870 137. 285. 0.064069 - 11.0485 15.6250 12.8430 149. 301. 0.068969 - 11.0485 15.6250 12.8937 158. 310. 0.074005 - 11.0485 15.6250 12.8741 150. 305. 0.069937 - 11.0485 15.6250 12.8669 149. 312. 0.069356 - 11.0485 15.6250 12.9464 137. 299. 0.064959 - 11.0485 15.6250 12.9321 144. 312. 0.068052 - 11.0485 15.6250 12.8488 143. 312. 0.066282 - 11.0485 15.6250 12.8245 145. 318. 0.066828 - 11.0485 15.6250 12.7955 145. 316. 0.066376 - 11.0485 15.6250 12.8343 139. 309. 0.064210 - 11.0485 15.6250 12.8105 152. 326. 0.069826 - 11.0485 15.6250 13.0371 20. 28. 0.009684 - 11.0485 15.6250 12.8902 44. 61. 0.020592 - 11.0485 15.6250 12.6846 60. 82. 0.026758 - 11.0485 15.6250 12.7114 76. 103. 0.034109 - 11.0485 15.6250 12.6656 88. 126. 0.039069 - 11.0485 15.6250 12.7052 108. 157. 0.048399 - 11.0485 15.6250 12.6600 113. 170. 0.050101 - 11.0485 15.6250 12.7307 126. 187. 0.056807 - 11.0485 15.6250 12.8852 95. 158. 0.044409 - 11.0485 15.6250 12.8711 112. 179. 0.052184 - 11.0485 15.6250 12.8002 116. 188. 0.053160 - 11.0485 15.6250 12.9277 106. 177. 0.050043 - 11.0485 15.6250 12.9434 117. 194. 0.055437 - 11.0485 15.6250 12.9582 114. 192. 0.054201 - 11.0485 15.6250 12.9900 108. 186. 0.051727 - 11.0485 15.6250 13.0191 106. 190. 0.051112 - 11.0485 15.6250 13.0093 108. 196. 0.051959 - 11.0485 15.6250 12.9548 110. 202. 0.052258 - 11.0485 15.6250 12.9218 112. 208. 0.052803 - 11.0485 15.6250 12.9215 126. 227. 0.059400 - 11.0485 15.6250 12.8893 138. 243. 0.064571 - 11.0485 15.6250 12.8705 127. 227. 0.059164 - 11.0485 15.6250 12.8595 145. 255. 0.067377 - 11.0485 15.6250 12.8231 150. 261. 0.069110 - 11.0485 15.6250 12.8568 161. 276. 0.074765 - 11.0485 15.6250 12.8659 143. 257. 0.066547 - 11.0485 15.6250 12.9468 148. 267. 0.070180 - 11.0485 15.6250 12.9802 156. 282. 0.074549 - 11.0485 15.6250 13.0190 155. 290. 0.074737 - 11.0485 15.6250 12.9624 162. 302. 0.077097 - 11.0485 15.6250 13.0031 159. 308. 0.076385 - 11.0485 15.6250 12.9220 170. 322. 0.080151 - 11.0485 15.6250 12.9686 174. 331. 0.082928 - 11.0485 15.6250 12.9935 181. 344. 0.086762 - 11.0485 15.6250 12.9664 177. 341. 0.084314 - 11.0485 15.6250 12.9060 171. 339. 0.080324 - 11.0485 15.6250 12.9204 186. 357. 0.087662 - 11.0485 15.6250 12.9162 196. 367. 0.092284 - 11.0485 15.6250 12.8791 191. 361. 0.089158 - 11.0485 15.6250 12.8549 193. 366. 0.089585 - 11.0485 15.6250 12.8296 199. 375. 0.091825 - 11.0485 15.6250 12.7983 189. 362. 0.086575 - 11.0485 15.6250 12.7596 195. 371. 0.088514 - 11.0485 15.6250 12.7279 197. 367. 0.088757 - 11.0485 15.6250 12.7993 186. 356. 0.085221 - 11.0485 15.6250 12.7972 192. 367. 0.087927 - 11.0485 15.6250 12.8628 181. 355. 0.084169 - 11.0485 15.6250 12.8806 156. 305. 0.072845 - 11.0485 15.6250 12.9249 162. 315. 0.076431 - 11.0485 15.6250 12.9222 169. 322. 0.079683 - 11.0485 15.6250 12.9952 134. 270. 0.064258 - 11.0485 15.6250 13.0051 139. 281. 0.066807 - 11.0485 15.6250 13.0289 149. 296. 0.072008 - 11.0485 15.6250 13.0087 155. 299. 0.074560 - 11.0485 15.6250 12.9377 165. 311. 0.078078 - 11.0485 15.6250 12.9375 152. 293. 0.071922 - 11.0485 15.6250 12.9173 164. 312. 0.077238 - 11.0485 15.6250 12.9360 161. 314. 0.076155 - 11.0485 15.6250 12.8488 168. 319. 0.077870 - 11.0485 15.6250 12.8273 167. 321. 0.077018 - 11.0485 15.6250 12.8098 174. 332. 0.079919 - 11.0485 15.6250 12.8591 145. 292. 0.067370 - 11.0485 15.6250 12.9051 153. 309. 0.071854 - 11.0485 15.6250 12.9639 158. 324. 0.075219 - 11.0485 15.6250 12.9557 163. 333. 0.077454 - 11.0485 15.6250 12.9317 115. 258. 0.054342 - 11.0485 15.6250 12.9783 118. 263. 0.056365 - 11.0485 15.6250 12.9421 122. 272. 0.057789 - 11.0485 15.6250 12.9905 118. 267. 0.056524 - 11.0485 15.6250 12.9605 127. 281. 0.060414 - 11.0485 15.6250 12.9645 138. 298. 0.065708 - 11.0485 15.6250 12.9023 149. 310. 0.069929 - 11.0485 15.6250 12.9416 160. 320. 0.075780 - 11.0485 15.6250 12.8879 162. 321. 0.075776 - 11.0485 15.6250 12.9527 172. 333. 0.081674 - 11.0485 15.6250 13.0298 147. 307. 0.071056 - 11.0485 15.6250 13.1806 142. 307. 0.071050 - 11.0485 15.6250 13.1577 154. 326. 0.076654 diff --git a/tests/mare-with-rays-model2/N11_vs_interval.dat b/tests/mare-with-rays-model2/N11_vs_interval.dat deleted file mode 100644 index b1606043..00000000 --- a/tests/mare-with-rays-model2/N11_vs_interval.dat +++ /dev/null @@ -1,300 +0,0 @@ - 11.0485 15.6250 12.5444 17. 26. 0.007333 - 11.0485 15.6250 12.5769 33. 54. 0.014345 - 11.0485 15.6250 12.3068 38. 65. 0.015477 - 11.0485 15.6250 12.4471 61. 99. 0.025704 - 11.0485 15.6250 12.4790 76. 118. 0.032272 - 11.0485 15.6250 12.5352 97. 149. 0.041748 - 11.0485 15.6250 12.5708 114. 172. 0.049484 - 11.0485 15.6250 12.5772 134. 202. 0.058254 - 11.0485 15.6250 12.5932 139. 217. 0.060659 - 11.0485 15.6250 12.6342 154. 240. 0.067863 - 11.0485 15.6250 12.6421 165. 255. 0.072847 - 11.0485 15.6250 12.6804 178. 275. 0.079304 - 11.0485 15.6250 12.7610 151. 248. 0.068565 - 11.0485 15.6250 12.8145 161. 264. 0.074028 - 11.0485 15.6250 12.8154 161. 272. 0.074045 - 11.0485 15.6250 12.7823 172. 290. 0.078493 - 11.0485 15.6250 12.8309 191. 313. 0.088161 - 11.0485 15.6250 12.8309 177. 291. 0.081698 - 11.0485 15.6250 12.7910 185. 302. 0.084597 - 11.0485 15.6250 12.7820 185. 306. 0.084418 - 11.0485 15.6250 12.8042 186. 311. 0.085319 - 11.0485 15.6250 12.8043 189. 319. 0.086696 - 11.0485 15.6250 12.7369 171. 309. 0.077207 - 11.0485 15.6250 12.7371 176. 314. 0.079468 - 11.0485 15.6250 12.7233 179. 320. 0.080561 - 11.0485 15.6250 12.7262 179. 321. 0.080615 - 11.0485 15.6250 12.6818 183. 332. 0.081557 - 11.0485 15.6250 12.6361 177. 332. 0.078034 - 11.0485 15.6250 12.6673 180. 342. 0.079946 - 11.0485 15.6250 12.7148 187. 350. 0.083993 - 11.0485 15.6250 12.7949 176. 342. 0.080556 - 11.0485 15.6250 12.7985 174. 334. 0.079708 - 11.0485 15.6250 12.7359 177. 341. 0.079898 - 11.0485 15.6250 12.7436 178. 346. 0.080495 - 11.0485 15.6250 12.7914 181. 351. 0.082777 - 11.0485 15.6250 12.8455 148. 310. 0.068546 - 11.0485 15.6250 12.8567 152. 314. 0.070583 - 11.0485 15.6250 12.8628 150. 307. 0.069753 - 11.0485 15.6250 12.8701 150. 307. 0.069872 - 11.0485 15.6250 12.8366 109. 243. 0.050379 - 11.0485 15.6250 12.8347 116. 257. 0.053590 - 11.0485 15.6250 12.9057 119. 264. 0.055894 - 11.0485 15.6250 12.8177 131. 282. 0.060279 - 11.0485 15.6250 12.8518 140. 294. 0.064937 - 11.0485 15.6250 12.8919 161. 315. 0.075379 - 11.0485 15.6250 12.8879 167. 321. 0.078115 - 11.0485 15.6250 12.8540 174. 328. 0.080749 - 11.0485 15.6250 12.8925 179. 337. 0.083818 - 11.0485 15.6250 12.8542 190. 349. 0.088177 - 11.0485 15.6250 12.8406 209. 371. 0.096689 - 11.0485 15.6250 12.8582 209. 373. 0.097086 - 11.0485 15.6250 12.8640 207. 371. 0.096287 - 11.0485 15.6250 12.9123 191. 351. 0.089849 - 11.0485 15.6250 12.8686 158. 311. 0.073573 - 11.0485 15.6250 12.8394 168. 328. 0.077699 - 11.0485 15.6250 12.7960 14. 35. 0.006410 - 11.0485 15.6250 12.4806 32. 56. 0.013593 - 11.0485 15.6250 12.7422 51. 82. 0.023056 - 11.0485 15.6250 12.7561 73. 111. 0.033109 - 11.0485 15.6250 12.7141 89. 131. 0.039968 - 11.0485 15.6250 12.6162 89. 140. 0.039052 - 11.0485 15.6250 12.6188 103. 156. 0.045223 - 11.0485 15.6250 12.6676 104. 162. 0.046195 - 11.0485 15.6250 12.7173 105. 168. 0.047189 - 11.0485 15.6250 12.8120 120. 188. 0.055144 - 11.0485 15.6250 12.8670 105. 168. 0.048876 - 11.0485 15.6250 12.7501 115. 186. 0.052084 - 11.0485 15.6250 12.6808 89. 145. 0.039655 - 11.0485 15.6250 12.5788 105. 165. 0.045664 - 11.0485 15.6250 12.6656 117. 183. 0.051944 - 11.0485 15.6250 12.6831 124. 195. 0.055280 - 11.0485 15.6250 12.7161 137. 216. 0.061553 - 11.0485 15.6250 12.7405 140. 223. 0.063264 - 11.0485 15.6250 12.7110 138. 229. 0.061929 - 11.0485 15.6250 12.8127 135. 229. 0.062048 - 11.0485 15.6250 12.8469 143. 244. 0.066252 - 11.0485 15.6250 12.8422 157. 265. 0.072659 - 11.0485 15.6250 12.8004 166. 275. 0.076076 - 11.0485 15.6250 12.7853 174. 290. 0.079461 - 11.0485 15.6250 12.8371 192. 316. 0.088751 - 11.0485 15.6250 12.8540 186. 316. 0.086318 - 11.0485 15.6250 12.9070 171. 306. 0.080342 - 11.0485 15.6250 12.9567 177. 315. 0.084125 - 11.0485 15.6250 13.0140 168. 309. 0.080912 - 11.0485 15.6250 13.0587 175. 320. 0.085155 - 11.0485 15.6250 13.0531 173. 310. 0.084074 - 11.0485 15.6250 13.0695 169. 312. 0.082440 - 11.0485 15.6250 13.0254 169. 315. 0.081607 - 11.0485 15.6250 13.0343 157. 300. 0.075969 - 11.0485 15.6250 13.0143 159. 301. 0.076582 - 11.0485 15.6250 13.0669 154. 299. 0.075078 - 11.0485 15.6250 13.1178 43. 127. 0.021209 - 11.0485 15.6250 12.8640 51. 128. 0.023723 - 11.0485 15.6250 12.7337 57. 137. 0.025716 - 11.0485 15.6250 12.7918 69. 156. 0.031559 - 11.0485 15.6250 12.8822 78. 177. 0.036436 - 11.0485 15.6250 12.8920 90. 194. 0.042139 - 11.0485 15.6250 13.0355 97. 205. 0.046949 - 11.0485 15.6250 12.9664 89. 183. 0.042396 - 11.0485 15.6250 12.9463 97. 200. 0.045992 - 11.0485 15.6250 12.9537 106. 215. 0.050345 - 11.0485 15.6250 12.9103 110. 226. 0.051721 - 11.0485 15.6250 12.8739 124. 247. 0.057812 - 11.0485 15.6250 12.7806 141. 268. 0.064320 - 11.0485 15.6250 12.7056 125. 250. 0.056023 - 11.0485 15.6250 12.7519 90. 196. 0.040779 - 11.0485 15.6250 12.7395 92. 206. 0.041564 - 11.0485 15.6250 12.6526 66. 153. 0.029212 - 11.0485 15.6250 12.5854 77. 169. 0.033540 - 11.0485 15.6250 12.6177 86. 187. 0.037749 - 11.0485 15.6250 12.6679 87. 198. 0.038646 - 11.0485 15.6250 12.7063 105. 220. 0.047067 - 11.0485 15.6250 12.6866 117. 235. 0.052203 - 11.0485 15.6250 12.7301 133. 256. 0.059954 - 11.0485 15.6250 12.7691 145. 270. 0.065966 - 11.0485 15.6250 12.7182 156. 283. 0.070124 - 11.0485 15.6250 12.8283 170. 304. 0.078420 - 11.0485 15.6250 12.8371 171. 311. 0.079044 - 11.0485 15.6250 12.8645 169. 309. 0.078620 - 11.0485 15.6250 12.8685 186. 335. 0.086611 - 11.0485 15.6250 12.9195 181. 333. 0.085287 - 11.0485 15.6250 12.9540 175. 331. 0.083123 - 11.0485 15.6250 12.9901 176. 338. 0.084299 - 11.0485 15.6250 12.9680 183. 347. 0.087205 - 11.0485 15.6250 13.0097 190. 360. 0.091417 - 11.0485 15.6250 12.9901 194. 373. 0.092919 - 11.0485 15.6250 12.9734 198. 380. 0.094472 - 11.0485 15.6250 13.0086 204. 386. 0.098129 - 11.0485 15.6250 13.0225 205. 396. 0.098925 - 11.0485 15.6250 13.0120 186. 369. 0.089540 - 11.0485 15.6250 13.1047 193. 378. 0.094909 - 11.0485 15.6250 13.0492 91. 204. 0.044184 - 11.0485 15.6250 12.9874 102. 218. 0.048824 - 11.0485 15.6250 13.0027 108. 233. 0.051880 - 11.0485 15.6250 12.9881 96. 198. 0.045959 - 11.0485 15.6250 12.8960 88. 181. 0.041240 - 11.0485 15.6250 12.8680 105. 199. 0.048886 - 11.0485 15.6250 12.9253 116. 209. 0.054733 - 11.0485 15.6250 12.9331 119. 216. 0.056251 - 11.0485 15.6250 12.8319 127. 225. 0.058634 - 11.0485 15.6250 12.7856 139. 241. 0.063482 - 11.0485 15.6250 12.8547 113. 215. 0.052448 - 11.0485 15.6250 12.8151 110. 218. 0.050586 - 11.0485 15.6250 12.7832 124. 237. 0.056599 - 11.0485 15.6250 12.7127 130. 250. 0.058362 - 11.0485 15.6250 12.6722 139. 260. 0.061807 - 11.0485 15.6250 12.7157 146. 276. 0.065592 - 11.0485 15.6250 12.6752 141. 262. 0.062742 - 11.0485 15.6250 12.7460 151. 274. 0.068324 - 11.0485 15.6250 12.8163 149. 275. 0.068540 - 11.0485 15.6250 12.8008 150. 278. 0.068750 - 11.0485 15.6250 12.7650 154. 284. 0.069993 - 11.0485 15.6250 12.7762 152. 285. 0.069266 - 11.0485 15.6250 12.8117 163. 305. 0.074900 - 11.0485 15.6250 12.7890 167. 312. 0.076330 - 11.0485 15.6250 12.9474 166. 321. 0.078728 - 11.0485 15.6250 12.9439 172. 336. 0.081507 - 11.0485 15.6250 13.0045 135. 278. 0.064876 - 11.0485 15.6250 13.0199 153. 298. 0.073787 - 11.0485 15.6250 13.0239 158. 307. 0.076269 - 11.0485 15.6250 13.0140 170. 325. 0.081876 - 11.0485 15.6250 12.8778 161. 312. 0.075131 - 11.0485 15.6250 12.8391 153. 312. 0.070757 - 11.0485 15.6250 12.8304 158. 321. 0.072920 - 11.0485 15.6250 12.8641 159. 325. 0.073962 - 11.0485 15.6250 12.9828 73. 152. 0.034906 - 11.0485 15.6250 13.0638 81. 167. 0.039460 - 11.0485 15.6250 13.0747 44. 121. 0.021489 - 11.0485 15.6250 13.0324 64. 148. 0.030955 - 11.0485 15.6250 12.8651 85. 174. 0.039549 - 11.0485 15.6250 12.9561 100. 194. 0.047522 - 11.0485 15.6250 12.9820 111. 210. 0.053066 - 11.0485 15.6250 12.9471 86. 159. 0.040784 - 11.0485 15.6250 12.8668 80. 155. 0.037236 - 11.0485 15.6250 12.9479 94. 173. 0.044586 - 11.0485 15.6250 12.8798 96. 179. 0.044819 - 11.0485 15.6250 12.8727 100. 184. 0.046610 - 11.0485 15.6250 12.8903 109. 203. 0.051014 - 11.0485 15.6250 12.8377 109. 190. 0.050392 - 11.0485 15.6250 12.8330 113. 202. 0.052183 - 11.0485 15.6250 12.8406 110. 200. 0.050889 - 11.0485 15.6250 12.7812 118. 213. 0.053835 - 11.0485 15.6250 12.8024 123. 221. 0.056396 - 11.0485 15.6250 12.7968 129. 236. 0.059070 - 11.0485 15.6250 12.7499 141. 255. 0.063857 - 11.0485 15.6250 12.8075 88. 187. 0.040397 - 11.0485 15.6250 12.7021 67. 142. 0.030004 - 11.0485 15.6250 12.6583 81. 160. 0.035899 - 11.0485 15.6250 12.7088 90. 175. 0.040367 - 11.0485 15.6250 12.7430 108. 199. 0.048833 - 11.0485 15.6250 12.7338 119. 216. 0.053690 - 11.0485 15.6250 12.6207 52. 120. 0.022842 - 11.0485 15.6250 12.6634 59. 130. 0.026180 - 11.0485 15.6250 12.6228 65. 144. 0.028566 - 11.0485 15.6250 12.6797 65. 148. 0.028954 - 11.0485 15.6250 12.7135 70. 158. 0.031431 - 11.0485 15.6250 12.7019 35. 77. 0.015673 - 11.0485 15.6250 12.8172 50. 104. 0.023005 - 11.0485 15.6250 12.9060 67. 131. 0.031471 - 11.0485 15.6250 12.9353 83. 149. 0.039254 - 11.0485 15.6250 13.0290 103. 175. 0.049779 - 11.0485 15.6250 13.0030 109. 187. 0.052364 - 11.0485 15.6250 13.0506 114. 201. 0.055369 - 11.0485 15.6250 12.9699 121. 219. 0.057685 - 11.0485 15.6250 12.9198 125. 234. 0.058904 - 11.0485 15.6250 12.9154 132. 249. 0.062140 - 11.0485 15.6250 12.9026 133. 255. 0.062425 - 11.0485 15.6250 12.8651 115. 242. 0.053507 - 11.0485 15.6250 12.7599 114. 247. 0.051751 - 11.0485 15.6250 12.8606 132. 272. 0.061353 - 11.0485 15.6250 12.8870 137. 285. 0.064069 - 11.0485 15.6250 12.8430 149. 301. 0.068969 - 11.0485 15.6250 12.8937 158. 310. 0.074005 - 11.0485 15.6250 12.8741 150. 305. 0.069937 - 11.0485 15.6250 12.8669 149. 312. 0.069356 - 11.0485 15.6250 12.9464 137. 299. 0.064959 - 11.0485 15.6250 12.9321 144. 312. 0.068052 - 11.0485 15.6250 12.8488 143. 312. 0.066282 - 11.0485 15.6250 12.8245 145. 318. 0.066828 - 11.0485 15.6250 12.7955 145. 316. 0.066376 - 11.0485 15.6250 12.8343 139. 309. 0.064210 - 11.0485 15.6250 12.8105 152. 326. 0.069826 - 11.0485 15.6250 13.0371 20. 28. 0.009684 - 11.0485 15.6250 12.8902 44. 61. 0.020592 - 11.0485 15.6250 12.6846 60. 82. 0.026758 - 11.0485 15.6250 12.7114 76. 103. 0.034109 - 11.0485 15.6250 12.6656 88. 126. 0.039069 - 11.0485 15.6250 12.7052 108. 157. 0.048399 - 11.0485 15.6250 12.6600 113. 170. 0.050101 - 11.0485 15.6250 12.7307 126. 187. 0.056807 - 11.0485 15.6250 12.8852 95. 158. 0.044409 - 11.0485 15.6250 12.8711 112. 179. 0.052184 - 11.0485 15.6250 12.8002 116. 188. 0.053160 - 11.0485 15.6250 12.9277 106. 177. 0.050043 - 11.0485 15.6250 12.9434 117. 194. 0.055437 - 11.0485 15.6250 12.9582 114. 192. 0.054201 - 11.0485 15.6250 12.9900 108. 186. 0.051727 - 11.0485 15.6250 13.0191 106. 190. 0.051112 - 11.0485 15.6250 13.0093 108. 196. 0.051959 - 11.0485 15.6250 12.9548 110. 202. 0.052258 - 11.0485 15.6250 12.9218 112. 208. 0.052803 - 11.0485 15.6250 12.9215 126. 227. 0.059400 - 11.0485 15.6250 12.8893 138. 243. 0.064571 - 11.0485 15.6250 12.8705 127. 227. 0.059164 - 11.0485 15.6250 12.8595 145. 255. 0.067377 - 11.0485 15.6250 12.8231 150. 261. 0.069110 - 11.0485 15.6250 12.8568 161. 276. 0.074765 - 11.0485 15.6250 12.8659 143. 257. 0.066547 - 11.0485 15.6250 12.9468 148. 267. 0.070180 - 11.0485 15.6250 12.9802 156. 282. 0.074549 - 11.0485 15.6250 13.0190 155. 290. 0.074737 - 11.0485 15.6250 12.9624 162. 302. 0.077097 - 11.0485 15.6250 13.0031 159. 308. 0.076385 - 11.0485 15.6250 12.9220 170. 322. 0.080151 - 11.0485 15.6250 12.9686 174. 331. 0.082928 - 11.0485 15.6250 12.9935 181. 344. 0.086762 - 11.0485 15.6250 12.9664 177. 341. 0.084314 - 11.0485 15.6250 12.9060 171. 339. 0.080324 - 11.0485 15.6250 12.9204 186. 357. 0.087662 - 11.0485 15.6250 12.9162 196. 367. 0.092284 - 11.0485 15.6250 12.8791 191. 361. 0.089158 - 11.0485 15.6250 12.8549 193. 366. 0.089585 - 11.0485 15.6250 12.8296 199. 375. 0.091825 - 11.0485 15.6250 12.7983 189. 362. 0.086575 - 11.0485 15.6250 12.7596 195. 371. 0.088514 - 11.0485 15.6250 12.7279 197. 367. 0.088757 - 11.0485 15.6250 12.7993 186. 356. 0.085221 - 11.0485 15.6250 12.7972 192. 367. 0.087927 - 11.0485 15.6250 12.8628 181. 355. 0.084169 - 11.0485 15.6250 12.8806 156. 305. 0.072845 - 11.0485 15.6250 12.9249 162. 315. 0.076431 - 11.0485 15.6250 12.9222 169. 322. 0.079683 - 11.0485 15.6250 12.9952 134. 270. 0.064258 - 11.0485 15.6250 13.0051 139. 281. 0.066807 - 11.0485 15.6250 13.0289 149. 296. 0.072008 - 11.0485 15.6250 13.0087 155. 299. 0.074560 - 11.0485 15.6250 12.9377 165. 311. 0.078078 - 11.0485 15.6250 12.9375 152. 293. 0.071922 - 11.0485 15.6250 12.9173 164. 312. 0.077238 - 11.0485 15.6250 12.9360 161. 314. 0.076155 - 11.0485 15.6250 12.8488 168. 319. 0.077870 - 11.0485 15.6250 12.8273 167. 321. 0.077018 - 11.0485 15.6250 12.8098 174. 332. 0.079919 - 11.0485 15.6250 12.8591 145. 292. 0.067370 - 11.0485 15.6250 12.9051 153. 309. 0.071854 - 11.0485 15.6250 12.9639 158. 324. 0.075219 - 11.0485 15.6250 12.9557 163. 333. 0.077454 - 11.0485 15.6250 12.9317 115. 258. 0.054342 - 11.0485 15.6250 12.9783 118. 263. 0.056365 - 11.0485 15.6250 12.9421 122. 272. 0.057789 - 11.0485 15.6250 12.9905 118. 267. 0.056524 - 11.0485 15.6250 12.9605 127. 281. 0.060414 - 11.0485 15.6250 12.9645 138. 298. 0.065708 - 11.0485 15.6250 12.9023 149. 310. 0.069929 - 11.0485 15.6250 12.9416 160. 320. 0.075780 - 11.0485 15.6250 12.8879 162. 321. 0.075776 - 11.0485 15.6250 12.9527 172. 333. 0.081674 - 11.0485 15.6250 13.0298 147. 307. 0.071056 - 11.0485 15.6250 13.1806 142. 307. 0.071050 - 11.0485 15.6250 13.1577 154. 326. 0.076654 diff --git a/tests/mare-with-rays-model2/RAYPARAMS.txt b/tests/mare-with-rays-model2/RAYPARAMS.txt deleted file mode 100644 index d7d58855..00000000 --- a/tests/mare-with-rays-model2/RAYPARAMS.txt +++ /dev/null @@ -1,8 +0,0 @@ -rw0 = rmin * pi / Nraymax / 2 -ireal(DP),parameter :: rray = 16_DP -integer(I4B),parameter :: Nraymax = 16 -real(DP),parameter :: fpeak = 8000_DP -real(DP),parameter :: rayp = 2.0_DP -integer(I4B),parameter :: rayq = 4 -real(DP),parameter :: rayfmult = (5)**(-4.0_DP / (1.2_DP)) - diff --git a/tests/mare-with-rays-model2/Robbins2014-A15-FassettCounts-binned.dat b/tests/mare-with-rays-model2/Robbins2014-A15-FassettCounts-binned.dat deleted file mode 100644 index e7a8761f..00000000 --- a/tests/mare-with-rays-model2/Robbins2014-A15-FassettCounts-binned.dat +++ /dev/null @@ -1,13 +0,0 @@ - 5.1241684784040373 6.23948354994535758E-004 21.000000000000000 - 6.9159685663443886 1.94218692856060401E-002 376.00000000000000 - 9.1971717131274460 5.97003450726182050E-002 695.00000000000000 - 12.816081239799573 6.62346057220059986E-002 403.00000000000000 - 17.996125645322635 5.46997230809128931E-002 170.00000000000000 - 25.800613087626900 6.43643621282638384E-002 96.000000000000000 - 36.348639964664329 5.70035776365636210E-002 43.000000000000000 - 50.608244555146413 5.81896598544816915E-002 23.000000000000000 - 72.473302918894660 8.93145572505870955E-002 17.000000000000000 - 101.84498213506704 8.24770394157215703E-002 8.0000000000000000 - 147.19614402527847 0.13205344016811349 6.0000000000000000 - 210.22410381342851 0.0000000000000000 0.0000000000000000 - 262.53658899999999 6.24379576535417230E-002 1.0000000000000000 diff --git a/tests/mare-with-rays-model2/cleanup b/tests/mare-with-rays-model2/cleanup deleted file mode 100755 index 7b2a46f1..00000000 --- a/tests/mare-with-rays-model2/cleanup +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -rm console/console*.* -rm surf/surf*.* -rm rego/rego*.* -rm shaded/shaded*.* -rm dist/odist_*.dat -rm dist/tdist_*.dat -rm dist/pdist_*.dat -rm dist/ocum_*.dat -rm dist/tcum_*.dat -rm misc/mass_*.dat -rm misc/ctem_*.dat -rm presentation/presentation*.jpg -rm surface_*.dat -rm odistribution.dat -rm pdistribution.dat -rm tdistribution.dat -rm tcumulative.dat -rm ocumulative.dat -rm craterscale.dat -rm ctem.dat -rm fracdone.dat -rm production.dat -rm ejecta_table_max.dat -rm ejecta_table_min.dat -rm impactmass.dat -rm frames/* -rm regolithdepth.dat -rm avgkdiff.dat -rm *.o* -rm term.out -rm time.out diff --git a/tests/mare-with-rays-model2/ctem.in b/tests/mare-with-rays-model2/ctem.in deleted file mode 100644 index 30e49d71..00000000 --- a/tests/mare-with-rays-model2/ctem.in +++ /dev/null @@ -1,84 +0,0 @@ -! CTEM Input file: Compatible with v. 1.1 - -! IDL driver in uts -interval 0.899606 -numintervals 300 ! Total number of intervals -restart F ! Restart a previous run -impfile eta-3.2.dat ! Impactor SFD rate file (col 1: Dimp (m), col 2: ! impactors > D (m**(-2) y**(-1)) -popupconsole F ! Pop up console window every output interval -saveshaded F ! Output shaded relief images -saverego F ! Output regolith map images -savepres F ! Output simplified console display images (presentation-compatible images) -savetruelist F ! Save the true cumulative crater distribution for each interval (large file size) -sfdcompare Robbins2014-A15-FassettCounts-binned.dat ! File name for the SFD comparison file used in the console display -shadedminh -85.0 ! Minimum height for shaded relief map (m) (Default - automatic) -shadedmaxh 85.0 ! Maximum height for shaded relief map (m) (Default - automatic) -runtype single ! Run type: options are normal / statistical - ! single: craters accumulate in successive intervals - ! statistical: surface is reset between intervals - -! CTEM required inputs -seed 21286 ! Random number generator seed -gridsize 1000 ! Size of grid in pixels -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) -! 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) -! 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) -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 - ! Value taken from Richardson et al. (2005) - -tvel 100.d0 ! 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) - ! Value taken from Dainty et al. (1974) The Moon v. 9 p. 11 - -regcoh 520.d0 ! Regolith layer cohesion (Pa) - ! Value taken from Colwell et al. (2007) Rev. of Geophys. v. 45 p. RG2006 - ! For upper 0-60 cm - -neff 5.0d-10 ! Impact energy seismic efficiency factor - - -! 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 -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 -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 -Kd1 0.00312669649143281 -psi 2.000 -fe 10.0 -ejecta_truncation 20.0 -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) -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 -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/tests/mare-with-rays-model2/ctem_driver.py b/tests/mare-with-rays-model2/ctem_driver.py deleted file mode 100644 index 2936bae4..00000000 --- a/tests/mare-with-rays-model2/ctem_driver.py +++ /dev/null @@ -1,231 +0,0 @@ -#!/usr/local/bin/python -# -#Cratered Terrain Evolution Model driver -# -#Original IDL design: Jim Richardson, Arecibo Observatory -#Revised IDL design: David Minton, Purdue University -#Re-engineered design and Python implementation: Matthew Route, Purdue University -#August 2016 - -#Import general purpose modules -import numpy -import os -import subprocess -import shutil - -#Import CTEM modules -import ctem_io_readers -import ctem_io_writers - -#Create and initialize data dictionaries for parameters and options from CTEM.in -notset = '-NOTSET-' -currentdir = os.getcwd() + os.sep - -parameters={'restart': notset, - 'runtype': notset, - 'popupconsole': notset, - 'saveshaded': notset, - 'saverego': notset, - 'savepres': notset, - 'savetruelist': notset, - 'seedn': 1, - 'totalimpacts': 0, - 'ncount': 0, - 'curyear': 0.0, - 'fracdone': 1.0, - 'masstot': 0.0, - 'interval': 0.0, - 'numintervals': 0, - 'pix': -1.0, - 'gridsize': -1, - 'seed': 0, - 'maxcrat': 1.0, - 'shadedminhdefault': 1, - 'shadedmaxhdefault': 1, - 'shadedminh': 0.0, - 'shadedmaxh': 0.0, - 'workingdir': currentdir, - 'ctemfile': 'ctem.in', - 'datfile': 'ctem.dat', - 'impfile': notset, - 'sfdcompare': notset, - 'sfdfile': notset} - -#Read ctem.in to initialize parameter values based on user input -ctem_io_readers.read_ctemin(parameters,notset) - -#Read sfdcompare file -sfdfile = parameters['workingdir'] + parameters['sfdcompare'] -ph1 = ctem_io_readers.read_formatted_ascii(sfdfile, skip_lines = 0) - -#Set up data arrays -seedarr = numpy.zeros(100, dtype = numpy.int) -seedarr[0] = parameters['seed'] -odist = numpy.zeros([1, 6]) -pdist = numpy.zeros([1, 6]) -tdist = numpy.zeros([1, 6]) -surface_dem = numpy.zeros([parameters['gridsize'], parameters['gridsize']], dtype = numpy.float) -regolith = numpy.zeros([parameters['gridsize'], parameters['gridsize']], dtype =numpy.float) - -#Read production function file -impfile = parameters['workingdir'] + parameters['impfile'] -prodfunction = ctem_io_readers.read_formatted_ascii(impfile, skip_lines = 0) - -#Create impactor production population -area = (parameters['gridsize'] * parameters['pix'])**2 -production = numpy.copy(prodfunction) -production[:,1] = production[:,1] * area * parameters['interval'] - -#Write corrected production function to file -ctem_io_writers.write_production(parameters, production) - -#Starting new or old run? -if (parameters['restart'].upper() == 'F'): - print('Starting a new run') - - if (parameters['runtype'].upper() == 'STATISTICAL'): - parameters['ncount'] = 1 - - #Write ctem.dat file - ctem_io_writers.write_ctemdat(parameters, seedarr) - - else: - parameters['ncount'] = 0 - - #Delete tdistribution file, if it exists - tdist_file = parameters['workingdir'] + 'tdistribution.dat' - if os.path.isfile(tdist_file): - os.remove(tdist_file) - -else: - print('Continuing a previous run') - - #Read surface dem(shaded relief) and ejecta data files - dem_file = parameters['workingdir'] + 'surface_dem.dat' - surface_dem = ctem_io_readers.read_unformatted_binary(dem_file, parameters['gridsize']) - ejecta_file = parameters['workingdir'] + 'surface_ejc.dat' - regolith = ctem_io_readers.read_unformatted_binary(ejecta_file, parameters['gridsize']) - - #Read odistribution, tdistribution, and pdistribution files - ofile = parameters['workingdir'] + 'odistribution.dat' - odist = ctem_io_readers.read_formatted_ascii(ofile, skip_lines = 1) - tfile = parameters['workingdir'] + 'tdistribution.dat' - tdist = ctem_io_readers.read_formatted_ascii(tfile, skip_lines = 1) - pfile = parameters['workingdir'] + 'pdistribution.dat' - pdist = ctem_io_readers.read_formatted_ascii(pfile, skip_lines = 1) - - #Read impact mass from file - massfile = parameters['workingdir'] + 'impactmass.dat' - impact_mass = ctem_io_readers.read_impact_mass(massfile) - - #Read ctem.dat file - ctem_io_readers.read_ctemdat(parameters, seedarr) - -#Open fracdonefile and regodepthfile for writing -filename = parameters['workingdir'] + 'fracdone.dat' -fp_frac = open(filename,'w') -filename = parameters['workingdir'] + 'regolithdepth.dat' -fp_reg = open(filename,'w') - -#Begin CTEM processing loops -print('Beginning loops') - -ctem_io_writers.create_dir_structure(parameters) - -while (parameters['ncount'] <= parameters['numintervals']): - - #Create crater population - if (parameters['ncount'] > 0): - - #Move ctem.dat - forig = parameters['workingdir'] + 'ctem.dat' - fdest = parameters['workingdir'] + 'misc' + os.sep + "ctem%06d.dat" % parameters['ncount'] - shutil.copy2(forig, fdest) - - #Create crater population and display CTEM progress on screen - print(parameters['ncount'], ' Calling FORTRAN routine') - #proc = subprocess.Popen([parameters['workingdir']+'CTEM'],stdout=subprocess.PIPE,bufsize=1, universal_newlines=True) - #for line in proc.stdout: - # print(line) - #proc.wait() - with subprocess.Popen([parameters['workingdir']+'CTEM'], stdout=subprocess.PIPE, bufsize=1,universal_newlines=True) as p: - for line in p.stdout: - print(line, end='') - - - #Optional: do not pipe CTEM progress to the screen - #subprocess.check_output([parameters['workingdir']+'CTEM']) - - #Read Fortran output - print(parameters['ncount'], ' Reading Fortran output') - - #Read surface dem(shaded relief) and ejecta data files - dem_file = parameters['workingdir'] + 'surface_dem.dat' - surface_dem = ctem_io_readers.read_unformatted_binary(dem_file, parameters['gridsize']) - ejecta_file = parameters['workingdir'] + 'surface_ejc.dat' - regolith = ctem_io_readers.read_unformatted_binary(ejecta_file, parameters['gridsize']) - - #Read odistribution, tdistribution, and pdistribution files - ofile = parameters['workingdir'] + 'odistribution.dat' - odist = ctem_io_readers.read_formatted_ascii(ofile, skip_lines = 1) - tfile = parameters['workingdir'] + 'tdistribution.dat' - tdist = ctem_io_readers.read_formatted_ascii(tfile, skip_lines = 1) - pfile = parameters['workingdir'] + 'pdistribution.dat' - pdist = ctem_io_readers.read_formatted_ascii(pfile, skip_lines = 1) - - #Read impact mass from file - massfile = parameters['workingdir'] + 'impactmass.dat' - impact_mass = ctem_io_readers.read_impact_mass(massfile) - - #Read ctem.dat file - ctem_io_readers.read_ctemdat(parameters, seedarr) - - #Update parameters: mass, curyear, regolith properties - parameters['masstot'] = parameters['masstot'] + impact_mass - - parameters['curyear'] = parameters['curyear'] + parameters['fracdone'] * parameters['interval'] - template = "%(fracdone)9.6f %(curyear)19.12E\n" - fp_frac.write(template % parameters) - - reg_text = "%19.12E %19.12E %19.12E %19.12E\n" % (parameters['curyear'], - numpy.mean(regolith), numpy.amax(regolith), numpy.amin(regolith)) - fp_reg.write(reg_text) - - #Save copy of crater distribution files - ctem_io_writers.copy_dists(parameters) - - #Display results - print(parameters['ncount'], ' Displaying results') - - #Write surface dem, surface ejecta, shaded relief, and rplot data - ctem_io_writers.image_dem(parameters, surface_dem) - if (parameters['saverego'].upper() == 'T'): - ctem_io_writers.image_regolith(parameters, regolith) - if (parameters['saveshaded'].upper() == 'T'): - ctem_io_writers.image_shaded_relief(parameters, surface_dem) - if (parameters['savepres'].upper() == 'T'): - ctem_io_writers.create_rplot(parameters,odist,pdist,tdist,ph1) - - #Update ncount - parameters['ncount'] = parameters['ncount'] + 1 - - if ((parameters['runtype'].upper() == 'STATISTICAL') or (parameters['ncount'] == 1)): - parameters['restart'] = 'F' - parameters['curyear'] = 0.0 - parameters['totalimpacts'] = 0 - parameters['masstot'] = 0.0 - - #Delete tdistribution file, if it exists - tdist_file = parameters['workingdir'] + 'tdistribution.dat' - if os.path.isfile(tdist_file): - os.remove(tdist_file) - - else: - parameters['restart'] = 'T' - - #Write ctem.dat file - ctem_io_writers.write_ctemdat(parameters, seedarr) - -#Close updateable fracdonefile and regodepthfile files -fp_frac.close() -fp_reg.close() \ No newline at end of file diff --git a/tests/mare-with-rays-model2/eta-3.2.dat b/tests/mare-with-rays-model2/eta-3.2.dat deleted file mode 100644 index c918cedb..00000000 --- a/tests/mare-with-rays-model2/eta-3.2.dat +++ /dev/null @@ -1,1628 +0,0 @@ - 1.0000000000000001E-009 2877147499498532.0 - 1.0200000000000000E-009 2737646795893616.0 - 1.0404000000000000E-009 2604909890915519.0 - 1.0612080000000001E-009 2478608836599235.5 - 1.0824321600000001E-009 2358431585788416.0 - 1.1040808032000001E-009 2244081221172459.2 - 1.1261624192640001E-009 2135275221704339.5 - 1.1486856676492801E-009 2031744764586719.5 - 1.1716593810022658E-009 1933234061101808.0 - 1.1950925686223112E-009 1839499724644015.0 - 1.2189944199947575E-009 1750310169394025.8 - 1.2433743083946527E-009 1665445038148629.0 - 1.2682417945625457E-009 1584694657892648.2 - 1.2936066304537966E-009 1507859521767890.0 - 1.3194787630628725E-009 1434749796159225.2 - 1.3458683383241301E-009 1365184851679976.8 - 1.3727857050906126E-009 1298992816897844.8 - 1.4002414191924248E-009 1236010153698768.0 - 1.4282462475762733E-009 1176081253239597.2 - 1.4568111725277987E-009 1119058051491313.2 - 1.4859473959783548E-009 1064799663422924.4 - 1.5156663438979220E-009 1013172034922242.1 - 1.5459796707758804E-009 964047611593541.62 - 1.5768992641913980E-009 917305023613822.62 - 1.6084372494752259E-009 872828785869057.62 - 1.6406059944647304E-009 830509012629562.25 - 1.6734181143540251E-009 790241146059550.75 - 1.7068864766411057E-009 751925697890113.00 - 1.7410242061739278E-009 715468003617375.38 - 1.7758446902974063E-009 680777988618552.75 - 1.8113615841033544E-009 647769945608043.12 - 1.8475888157854215E-009 616362322883733.50 - 1.8845405921011299E-009 586477522840347.50 - 1.9222314039431525E-009 558041710252026.19 - 1.9606760320220155E-009 530984629850476.75 - 1.9998895526624558E-009 505239432747982.62 - 2.0398873437157050E-009 480742511276428.81 - 2.0806850905900193E-009 457433341834283.31 - 2.1222987924018196E-009 435254335353262.50 - 2.1647447682498559E-009 414150695015235.56 - 2.2080396636148532E-009 394070280867834.12 - 2.2522004568871503E-009 374963481004277.75 - 2.2972444660248935E-009 356783088989143.81 - 2.3431893553453915E-009 339484187227243.75 - 2.3900531424522993E-009 323024035987448.75 - 2.4378542053013454E-009 307361967807279.62 - 2.4866112894073724E-009 292459287017372.00 - 2.5363435151955198E-009 278279174137574.75 - 2.5870703854994304E-009 264786594908476.09 - 2.6388117932094188E-009 251948213733607.41 - 2.6915880290736073E-009 239732311318466.72 - 2.7454197896550797E-009 228108706302878.09 - 2.8003281854481814E-009 217048680693066.62 - 2.8563347491571452E-009 206524908909215.03 - 2.9134614441402881E-009 196511390273205.44 - 2.9717306730230940E-009 186983384769743.91 - 3.0311652864835558E-009 177917351922156.34 - 3.0917885922132270E-009 169290892631838.28 - 3.1536243640574918E-009 161082693837663.81 - 3.2166968513386418E-009 153272475858625.16 - 3.2810307883654148E-009 145840942289604.94 - 3.3466514041327232E-009 138769732326490.44 - 3.4135844322153777E-009 132041375402841.08 - 3.4818561208596854E-009 125639248026031.98 - 3.5514932432768790E-009 119547532706230.39 - 3.6225231081424166E-009 113751178876731.67 - 3.6949735703052649E-009 108235865709103.47 - 3.7688730417113704E-009 102987966731265.55 - 3.8442505025455979E-009 97994516161089.562 - 3.9211355125965100E-009 93243176872339.844 - 3.9995582228484400E-009 88722209913810.172 - 4.0795493873054091E-009 84420445506348.656 - 4.1611403750515173E-009 80327255446114.078 - 4.2443631825525480E-009 76432526845881.406 - 4.3292504462035990E-009 72726637149520.500 - 4.4158354551276712E-009 69200430357916.695 - 4.5041521642302245E-009 65845194407596.117 - 4.5942352075148293E-009 62652639646165.500 - 4.6861199116651259E-009 59614878351386.992 - 4.7798423098984285E-009 56724405243286.180 - 4.8754391560963972E-009 53974078941145.578 - 4.9729479392183253E-009 51357104319570.047 - 5.0724068980026919E-009 48867015720031.844 - 5.1738550359627457E-009 46497660976416.820 - 5.2773321366820008E-009 44243186215104.242 - 5.3828787794156406E-009 42098021392026.477 - 5.4905363550039534E-009 40056866530975.344 - 5.6003470821040330E-009 38114678629154.781 - 5.7123540237461134E-009 36266659197627.867 - 5.8266011042210357E-009 34508242405874.707 - 5.9431331263054570E-009 32835083801170.707 - 6.0619957888315665E-009 31243049574914.289 - 6.1832357046081981E-009 29728206349385.012 - 6.3069004187003620E-009 28286811459698.551 - 6.4330384270743695E-009 26915303706948.527 - 6.5616991956158571E-009 25610294559689.383 - 6.6929331795281742E-009 24368559782022.078 - 6.8267918431187378E-009 23187031467598.484 - 6.9633276799811128E-009 22062790459863.180 - 7.1025942335807350E-009 20993059139805.660 - 7.2446461182523501E-009 19975194563403.875 - 7.3895390406173968E-009 19006681931804.129 - 7.5373298214297441E-009 18085128378104.277 - 7.6880764178583384E-009 17208257055389.500 - 7.8418379462155052E-009 16373901511414.256 - 7.9986747051398157E-009 15580000336032.035 - 8.1586481992426127E-009 14824592068148.607 - 8.3218211632274651E-009 14105810349615.564 - 8.4882575864920139E-009 13421879314091.020 - 8.6580227382218550E-009 12771109199474.955 - 8.8311831929862929E-009 12151892173079.016 - 9.0078068568460189E-009 11562698359216.129 - 9.1879629939829401E-009 11002072059395.488 - 9.3717222538625987E-009 10468628155784.299 - 9.5591566989398507E-009 9961048689050.4297 - 9.7503398329186472E-009 9478079602130.9844 - 9.9453466295770211E-009 9018527641881.7656 - 1.0144253562168562E-008 8581257410952.6338 - 1.0347138633411934E-008 8165188562604.9385 - 1.0554081406080172E-008 7769293131540.4082 - 1.0765163034201776E-008 7392592994146.8125 - 1.0980466294885811E-008 7034157451885.5957 - 1.1200075620783529E-008 6693100931850.7900 - 1.1424077133199200E-008 6368580798818.1074 - 1.1652558675863184E-008 6059795273378.5059 - 1.1885609849380449E-008 5765981451012.6416 - 1.2123322046368058E-008 5486413417212.0244 - 1.2365788487295419E-008 5220400453989.9688 - 1.2613104257041328E-008 4967285333351.2256 - 1.2865366342182155E-008 4726442693504.0654 - 1.3122673669025798E-008 4497277493802.9541 - 1.3385127142406314E-008 4279223544604.5146 - 1.3652829685254440E-008 4071742108404.5625 - 1.3925886278959530E-008 3874320568800.0737 - 1.4204404004538721E-008 3686471163987.5591 - 1.4488492084629495E-008 3507729781668.7402 - 1.4778261926322086E-008 3337654812386.1440 - 1.5073827164848527E-008 3175826058455.6084 - 1.5375303708145499E-008 3021843695800.0249 - 1.5682809782308408E-008 2875327286119.3745 - 1.5996465977954577E-008 2735914836956.4517 - 1.6316395297513668E-008 2603261907336.0283 - 1.6642723203463941E-008 2477040756767.7832 - 1.6975577667533219E-008 2356939535510.4834 - 1.7315089220883884E-008 2242661514096.8208 - 1.7661391005301560E-008 2133924350215.3369 - 1.8014618825407591E-008 2030459391138.1299 - 1.8374911201915743E-008 1932011009970.8977 - 1.8742409425954057E-008 1838335974085.4031 - 1.9117257614473137E-008 1749202844173.9749 - 1.9499602766762601E-008 1664391402441.3137 - 1.9889594822097853E-008 1583692108520.8577 - 2.0287386718539812E-008 1506905581771.4570 - 2.0693134452910610E-008 1433842108675.2969 - 2.1106997141968824E-008 1364321174120.0037 - 2.1529137084808202E-008 1298171015406.9033 - 2.1959719826504365E-008 1235228197883.5278 - 2.2398914223034452E-008 1175337211151.9060 - 2.2846892507495143E-008 1118350084855.0063 - 2.3303830357645048E-008 1064126023092.0679 - 2.3769906964797950E-008 1012531056559.5840 - 2.4245305104093908E-008 963437711558.49878 - 2.4730211206175788E-008 916724695049.83960 - 2.5224815430299305E-008 872276594980.67554 - 2.5729311738905292E-008 829983595139.99524 - 2.6243897973683398E-008 789741203840.01904 - 2.6768775933157068E-008 751449995752.60645 - 2.7304151451820208E-008 715015366262.92224 - 2.7850234480856614E-008 680347297733.45337 - 2.8407239170473746E-008 647360137100.89539 - 2.8975383953883221E-008 615972384256.42346 - 2.9554891632960885E-008 586106490686.50879 - 3.0145989465620103E-008 557688667876.78931 - 3.0748909254932506E-008 530648705005.62585 - 3.1363887440031157E-008 504919795476.92603 - 3.1991165188831783E-008 480438371863.65662 - 3.2630988492608421E-008 457143948854.24805 - 3.3283608262460593E-008 434978973813.86060 - 3.3949280427709808E-008 413888684591.30432 - 3.4628266036264005E-008 393820974220.29840 - 3.5320831356989287E-008 374726262180.79364 - 3.6027247984129073E-008 356557371902.28955 - 3.6747792943811655E-008 339269414206.49573 - 3.7482748802687892E-008 322819676401.36639 - 3.8232403778741651E-008 307167516752.49500 - 3.8997051854316486E-008 292274264071.14423 - 3.9776992891402813E-008 278103122170.82794 - 4.0572532749230869E-008 264619078956.38849 - 4.1383983404215484E-008 251788819920.96011 - 4.2211663072299797E-008 239580645837.09830 - 4.3055896333745796E-008 227964394438.71817 - 4.3917014260420710E-008 216911365900.34375 - 4.4795354545629123E-008 206394251929.55304 - 4.5691261636541709E-008 196387068297.43079 - 4.6605086869272545E-008 186865090640.33344 - 4.7537188606657998E-008 177804793374.35504 - 4.8487932378791157E-008 169183791571.57205 - 4.9457691026366980E-008 160980785654.46304 - 5.0446844846894323E-008 153175508771.86176 - 5.1455781743832214E-008 145748676726.42780 - 5.2484897378708861E-008 138681940329.92184 - 5.3534595326283036E-008 131957840068.57234 - 5.4605287232808700E-008 125559762966.52617 - 5.5697392977464876E-008 119471901540.80855 - 5.6811340837014176E-008 113679214746.38281 - 5.7947567653754463E-008 108167390814.81903 - 5.9106519006829551E-008 102922811894.75836 - 6.0288649386966144E-008 97932520406.811432 - 6.1494422374705462E-008 93184187029.765533 - 6.2724310822199568E-008 88666080239.004837 - 6.3978797038643560E-008 84367037321.883972 - 6.5258372979416429E-008 80276436798.443176 - 6.6563540439004761E-008 76384172179.326385 - 6.7894811247784854E-008 72680626996.066803 - 6.9252707472740550E-008 69156651042.048126 - 7.0637761622195364E-008 65803537765.441017 - 7.2050516854639269E-008 62613002758.260582 - 7.3491527191732061E-008 59577163288.398033 - 7.4961357735566697E-008 56688518824.057884 - 7.6460584890278028E-008 53939932502.482445 - 7.7989796588083593E-008 51324613497.179611 - 7.9549592519845266E-008 48836100240.089073 - 8.1140584370242176E-008 46468244457.234673 - 8.2763396057647016E-008 44215195978.420380 - 8.4418663978799952E-008 42071388283.439857 - 8.6107037258375946E-008 40031524749.089111 - 8.7829178003543465E-008 38090565563.003265 - 8.9585761563614332E-008 36243715271.986107 - 9.1377476794886626E-008 34486410934.068230 - 9.3205026330784360E-008 32814310845.021935 - 9.5069126857400045E-008 31223283811.479561 - 9.6970509394548047E-008 29709398944.152950 - 9.8909919582439006E-008 28268915945.936539 - 1.0088811797408779E-007 26898275870.899109 - 1.0290588033356955E-007 25594092331.333065 - 1.0496399794024094E-007 24353143131.136528 - 1.0706327789904577E-007 23172362304.857399 - 1.0920454345702669E-007 22048832542.730473 - 1.1138863432616722E-007 20979777982.992405 - 1.1361640701269056E-007 19962557353.666836 - 1.1588873515294438E-007 18994657446.875336 - 1.1820650985600326E-007 18073686909.551361 - 1.2057064005312333E-007 17197370335.216248 - 1.2298205285418581E-007 16363542642.219925 - 1.2544169391126953E-007 15570143724.556992 - 1.2795052778949494E-007 14815213362.042048 - 1.3050953834528484E-007 14096886377.269091 - 1.3311972911219053E-007 13413388027.389442 - 1.3578212369443434E-007 12763029619.322866 - 1.3849776616832302E-007 12144204337.568542 - 1.4126772149168948E-007 11555383274.307804 - 1.4409307592152327E-007 10995111651.990427 - 1.4697493743995374E-007 10462005229.071678 - 1.4991443618875282E-007 9954746880.0199909 - 1.5291272491252788E-007 9472083341.1455727 - 1.5597097941077844E-007 9012822114.2100315 - 1.5909039899899401E-007 8575828520.1668367 - 1.6227220697897388E-007 8160022895.7534552 - 1.6551765111855337E-007 7764377926.0088577 - 1.6882800414092444E-007 7387916106.1259680 - 1.7220456422374294E-007 7029707326.3681335 - 1.7564865550821779E-007 6688866574.0827847 - 1.7916162861838215E-007 6364551747.1347075 - 1.8274486119074979E-007 6055961573.3567066 - 1.8639975841456479E-007 5762333630.8772726 - 1.9012775358285610E-007 5482942464.4342022 - 1.9393030865451323E-007 5217097793.0201845 - 1.9780891482760349E-007 4964142804.4320698 - 2.0176509312415558E-007 4723452532.5102243 - 2.0580039498663870E-007 4494432313.0586834 - 2.0991640288637147E-007 4276516314.6311998 - 2.1411473094409891E-007 4069166140.5532498 - 2.1839702556298090E-007 3871869498.7260852 - 2.2276496607424054E-007 3684138935.9263511 - 2.2722026539572535E-007 3505510633.4741569 - 2.3176467070363986E-007 3335543261.2941089 - 2.3639996411771265E-007 3173816887.5380650 - 2.4112796340006691E-007 3019931941.0756755 - 2.4595052266806827E-007 2873508224.2893629 - 2.5086953312142966E-007 2734183973.7346907 - 2.5588692378385827E-007 2601614966.3453379 - 2.6100466225953544E-007 2475473668.9744129 - 2.6622475550472613E-007 2355448429.1709051 - 2.7154925061482066E-007 2241242705.1919613 - 2.7698023562711708E-007 2132574333.3486128 - 2.8251984033965944E-007 2029174830.8748014 - 2.8817023714645261E-007 1930788732.5973372 - 2.9393364188938164E-007 1837172959.7679226 - 2.9981231472716927E-007 1748096219.4978385 - 3.0580856102171266E-007 1663338433.3115039 - 3.1192473224214694E-007 1582690193.4070506 - 3.1816322688698986E-007 1505952245.2805238 - 3.2452649142472967E-007 1432934995.4354413 - 3.3101702125322426E-007 1363458042.9614398 - 3.3763736167828874E-007 1297349733.8246803 - 3.4439010891185452E-007 1234446736.7688329 - 3.5127791109009164E-007 1174593639.7788243 - 3.5830346931189348E-007 1117642566.1103504 - 3.6546953869813135E-007 1063452808.9364921 - 3.7277892947209398E-007 1011890483.7087717 - 3.8023450806153589E-007 962828197.37374818 - 3.8783919822276661E-007 916144733.62790191 - 3.9559598218722192E-007 871724753.43317568 - 4.0350790183096637E-007 829458510.05324948 - 4.1157805986758571E-007 789241577.90650284 - 4.1980962106493741E-007 750974594.56574547 - 4.2820581348623619E-007 714563015.26729167 - 4.3676992975596094E-007 679916879.32284939 - 4.4550532835108014E-007 646950587.85710824 - 4.5441543491810173E-007 615582692.32189119 - 4.6350374361646376E-007 585735693.26435924 - 4.7277381848879306E-007 557335848.85209548 - 4.8222929485856898E-007 530312992.68199563 - 4.9187388075574039E-007 504600360.42283553 - 5.0171135837085518E-007 480134424.86320609 - 5.1174558553827227E-007 456854738.95727557 - 5.2198049724903777E-007 434703786.48059893 - 5.3242010719401858E-007 413626839.92699516 - 5.4306850933789896E-007 393571825.29540217 - 5.5392987952465694E-007 374489193.43264592 - 5.6500847711515014E-007 356331797.61425376 - 5.7630864665745312E-007 339054777.06085598 - 5.8783481959060219E-007 322615446.10238355 - 5.9959151598241420E-007 306973188.71622574 - 6.1158334630206247E-007 292089358.17878467 - 6.2381501322810375E-007 277927181.58250278 - 6.3629131349266580E-007 264451668.98245427 - 6.4901713976251915E-007 251629526.94803408 - 6.6199748255776955E-007 239429076.30616000 - 6.7523743220892497E-007 227820173.87275812 - 6.8874218085310351E-007 216774137.97915739 - 7.0251702447016562E-007 206263677.60939443 - 7.1656736495956893E-007 196262824.97335008 - 7.3089871225876036E-007 186746871.34912923 - 7.4551668650393555E-007 177692306.03617224 - 7.6042702023401427E-007 169076758.26827133 - 7.7563556063869457E-007 160878941.94297925 - 7.9114827185146845E-007 153078603.03085473 - 8.0697123728849785E-007 145656469.53461096 - 8.2311066203426781E-007 138594203.87453344 - 8.3957287527495319E-007 131874357.58252704 - 8.5636433278045231E-007 125480328.19285709 - 8.7349161943606142E-007 119396318.22307611 - 8.9096145182478272E-007 113607296.14379142 - 9.0878068086127834E-007 108098959.24084386 - 9.2695629447850388E-007 102857698.27814199 - 9.4549542036807393E-007 97870563.873846099 - 9.6440532877543546E-007 93125234.506828547 - 9.8369343535094418E-007 88609986.074365586 - 1.0033673040579631E-006 84313662.925847709 - 1.0234346501391223E-006 80225650.300942808 - 1.0439033431419047E-006 76335848.104116216 - 1.0647814100047428E-006 72634645.950713128 - 1.0860770382048378E-006 69112899.422950968 - 1.1077985789689345E-006 65761907.477158166 - 1.1299545505483131E-006 62573390.946440175 - 1.1525536415592794E-006 59539472.085660413 - 1.1756047143904650E-006 56652655.108198322 - 1.1991168086782744E-006 53905807.666397773 - 1.2230991448518399E-006 51292143.229950048 - 1.2475611277488767E-006 48805204.318674445 - 1.2725123503038542E-006 46438846.548270442 - 1.2979625973099313E-006 44187223.449623734 - 1.3239218492561299E-006 42044772.024159953 - 1.3504002862412526E-006 40006198.999558009 - 1.3774082919660775E-006 38066467.751865849 - 1.4049564578053992E-006 36220785.861707374 - 1.4330555869615073E-006 34464593.273836270 - 1.4617166987007374E-006 32793551.030782890 - 1.4909510326747522E-006 31203530.552758973 - 1.5207700533282473E-006 29690603.437334377 - 1.5511854543948123E-006 28251031.753684301 - 1.5822091634827086E-006 26881258.807427388 - 1.6138533467523627E-006 25577900.353237748 - 1.6461304136874099E-006 24337736.233520210 - 1.6790530219611580E-006 23157702.422490820 - 1.7126340824003811E-006 22034883.456006199 - 1.7468867640483889E-006 20966505.228438448 - 1.7818244993293568E-006 19949928.138799101 - 1.8174609893159439E-006 18982640.569178473 - 1.8538102091022629E-006 18062252.679387912 - 1.8908864132843082E-006 17186490.502473596 - 1.9287041415499945E-006 16353190.326513842 - 1.9672782243809946E-006 15560293.348819295 - 2.0066237888686144E-006 14805840.589328332 - 2.0467562646459865E-006 14087968.050630359 - 2.0876913899389063E-006 13404902.112659134 - 2.1294452177376843E-006 12754955.150677901 - 2.1720341220924380E-006 12136521.365729839 - 2.2154748045342867E-006 11548072.817252394 - 2.2597843006249724E-006 10988155.648053283 - 2.3049799866374719E-006 10455386.492321452 - 2.3510795863702213E-006 9948449.0577984061 - 2.3981011780976258E-006 9466090.8736655321 - 2.4460632016595782E-006 9007120.1961126514 - 2.4949844656927697E-006 8570403.0639424119 - 2.5448841550066253E-006 8154860.4969359981 - 2.5957818381067577E-006 7759465.8300581994 - 2.6476974748688928E-006 7383242.1769156018 - 2.7006514243662708E-006 7025260.0162009541 - 2.7546644528535965E-006 6684634.8951606397 - 2.8097577419106685E-006 6360525.2444112711 - 2.8659528967488821E-006 6052130.2987065883 - 2.9232719546838598E-006 5758688.1185175795 - 2.9817373937775371E-006 5479473.7075377824 - 3.0413721416530877E-006 5213797.2214628104 - 3.1021995844861494E-006 4961002.2636185596 - 3.1642435761758722E-006 4720464.2632272020 - 3.2275284476993896E-006 4491588.9323041840 - 3.2920790166533774E-006 4273810.7973737707 - 3.3579205969864451E-006 4066591.8023754796 - 3.4250790089261739E-006 3869419.9793096688 - 3.4935805891046976E-006 3681808.1833378929 - 3.5634522008867915E-006 3503292.8892128975 - 3.6347212449045275E-006 3333433.0460646111 - 3.7074156698026182E-006 3171808.9877127390 - 3.7815639831986706E-006 3018021.3958136635 - 3.8571952628626438E-006 2871690.3132799803 - 3.9343391681198970E-006 2732454.2055351376 - 4.0130259514822948E-006 2599969.0672838655 - 4.0932864705119405E-006 2473907.5725915236 - 4.1751521999221794E-006 2353958.2661725096 - 4.2586552439206231E-006 2239824.7938896632 - 4.3438283487990356E-006 2131225.1705635027 - 4.4307049157750164E-006 2027891.0832822849 - 4.5193190140905171E-006 1929567.2284916206 - 4.6097053943723277E-006 1836010.6812258004 - 4.7018995022597739E-006 1746990.2949224280 - 4.7959374923049693E-006 1662286.1303374993 - 4.8918562421510692E-006 1581688.9121499737 - 4.9896933669940903E-006 1504999.5119132900 - 5.0894872343339726E-006 1432028.4560763703 - 5.1912769790206526E-006 1362595.4578586093 - 5.2951025186010660E-006 1296528.9718222588 - 5.4010045689730876E-006 1233665.7700417142 - 5.5090246603525497E-006 1173850.5388225582 - 5.6192051535596007E-006 1116935.4949739899 - 5.7315892566307925E-006 1062780.0206865806 - 5.8462210417634084E-006 1011250.3161132602 - 5.9631454625986766E-006 962219.06879518495 - 6.0824083718506502E-006 915565.13911573973 - 6.2040565392876630E-006 871173.26100554888 - 6.3281376700734167E-006 828933.75715903216 - 6.4547004234748854E-006 788742.26805890526 - 6.5837944319443835E-006 750499.49413913465 - 6.7154703205832714E-006 714110.95044931991 - 6.8497797269949372E-006 679486.73321436078 - 6.9867753215348364E-006 646541.29771265958 - 7.1265108279655336E-006 615193.24692406692 - 7.2690410445248441E-006 585365.13042539649 - 7.4144218654153415E-006 556983.25303664256 - 7.5627103027236481E-006 529977.49274513533 - 7.7139645087781215E-006 504281.12745777966 - 7.8682437989536847E-006 479830.67015334789 - 8.0256086749327592E-006 456565.71202753828 - 8.1861208484314147E-006 434428.77324326581 - 8.3498432654000424E-006 413365.16091743996 - 8.5168401307080433E-006 393322.83399336215 - 8.6871769333222042E-006 374252.27466488932 - 8.8609204719886488E-006 356106.36603469489 - 9.0381388814284223E-006 338840.27570436301 - 9.2189016590569902E-006 322411.34500870662 - 9.4032796922381296E-006 306778.98362064385 - 9.5913452860828916E-006 291904.56926623901 - 9.7831721918045494E-006 277751.35230213555 - 9.9788356356406414E-006 264284.36491962610 - 1.0178412348353455E-005 251470.33475103296 - 1.0381980595320524E-005 239277.60266494864 - 1.0589620207226935E-005 227676.04454723795 - 1.0801412611371474E-005 216636.99687454832 - 1.1017440863598903E-005 206133.18589644483 - 1.1237789680870881E-005 196138.66025120451 - 1.1462545474488300E-005 186628.72684878498 - 1.1691796383978066E-005 177579.88986255712 - 1.1925632311657627E-005 168969.79267906962 - 1.2164144957890779E-005 160777.16266242450 - 1.2407427857048595E-005 152981.75859679369 - 1.2655576414189567E-005 145564.32067722580 - 1.2908687942473359E-005 138506.52292518702 - 1.3166861701322825E-005 131790.92791127073 - 1.3430198935349281E-005 125400.94367321151 - 1.3698802914056268E-005 119320.78272276229 - 1.3972778972337393E-005 113535.42304015445 - 1.4252234551784142E-005 108030.57095977136 - 1.4537279242819824E-005 102792.62585533872 - 1.4828024827676222E-005 97808.646537380177 - 1.5124585324229746E-005 93066.319279918651 - 1.5427077030714340E-005 88553.927397426960 - 1.5735618571328627E-005 84260.322296863684 - 1.6050330942755199E-005 80174.895933273277 - 1.6371337561610303E-005 76287.554600897376 - 1.6698764312842510E-005 72588.693995044319 - 1.7032739599099360E-005 69069.175483103041 - 1.7373394391081348E-005 65720.303526074858 - 1.7720862278902977E-005 62533.804194839977 - 1.8075279524481038E-005 59501.804728078961 - 1.8436785114970660E-005 56616.814081344259 - 1.8805520817270072E-005 53871.704419224799 - 1.9181631233615476E-005 51259.693504877214 - 1.9565263858287785E-005 48774.327943414311 - 1.9956569135453541E-005 46409.467237750403 - 2.0355700518162613E-005 44159.268617511458 - 2.0762814528525864E-005 42018.172603527106 - 2.1178070819096382E-005 39980.889272239248 - 2.1601632235478311E-005 38042.385186091509 - 2.2033664880187877E-005 36197.870957608611 - 2.2474338177791636E-005 34442.789416441010 - 2.2923824941347469E-005 32772.804350139420 - 2.3382301440174418E-005 31183.789790841514 - 2.3849947468977906E-005 29671.819821401845 - 2.4326946418357465E-005 28233.158875779376 - 2.4813485346724613E-005 26864.252509718168 - 2.5309755053659107E-005 25561.718618918680 - 2.5815950154732291E-005 24322.339083002782 - 2.6332269157826938E-005 23143.051814627543 - 2.6858914540983477E-005 22020.943194103816 - 2.7396092831803147E-005 20953.240870828140 - 2.7944014688439212E-005 19937.306913742763 - 2.8502894982207996E-005 18970.631293900875 - 2.9072952881852157E-005 18050.825683034593 - 2.9654411939489201E-005 17175.617552804248 - 3.0247500178278986E-005 16342.844560149970 - 3.0852450181844570E-005 15550.449204873925 - 3.1469499185481464E-005 14796.473746253700 - 3.2098889169191093E-005 14079.055366127610 - 3.2740866952574917E-005 13396.421566501518 - 3.3395684291626416E-005 12746.885790306253 - 3.4063597977458947E-005 12128.843254485904 - 3.4744869937008130E-005 11540.766985122085 - 3.5439767335748291E-005 10981.204044798194 - 3.6148562682463259E-005 10448.771942882840 - 3.6871533936112527E-005 9942.1552198634163 - 3.7608964614834776E-005 9460.1021972908929 - 3.8361143907131472E-005 9001.4218853060138 - 3.9128366785274105E-005 8564.9810401064715 - 3.9910934120979585E-005 8149.7013640850391 - 4.0709152803399178E-005 7754.5568417211471 - 4.1523335859467166E-005 7378.5712046438084 - 4.2353802576656507E-005 7020.8155196029165 - 4.3200878628189641E-005 6680.4058933895794 - 4.4064896200753437E-005 6356.5012890351936 - 4.4946194124768506E-005 6048.3014478937430 - 4.5845118007263879E-005 5755.0449124735469 - 4.6762020367409159E-005 5476.0071451335380 - 4.7697260774757346E-005 5210.4987379959730 - 4.8651205990252496E-005 4957.8637096529146 - 4.9624230110057546E-005 4717.4778844581997 - 5.0616714712258700E-005 4488.7473504006803 - 5.1629049006503875E-005 4271.1069917486684 - 5.2661629986633955E-005 4064.0190928402285 - 5.3714862586366634E-005 3866.9720095697876 - 5.4789159838093966E-005 3679.4789052887154 - 5.5884943034855848E-005 3501.0765479967490 - 5.7002641895552967E-005 3331.3241658525085 - 5.8142694733464028E-005 3169.8023581754646 - 5.9305548628133309E-005 3016.1120592488114 - 6.0491659600695976E-005 2869.8735523631485 - 6.1701492792709902E-005 2730.7255316650153 - 6.2935522648564096E-005 2598.3242094924208 - 6.4194233101535377E-005 2472.3424669918863 - 6.5478117763566082E-005 2352.4690459184803 - 6.6787680118837411E-005 2238.4077796220481 - 6.8123433721214161E-005 2129.8768613196598 - 6.9485902395638441E-005 2026.6081478464334 - 7.0875620443551206E-005 1928.3464971645308 - 7.2293132852422227E-005 1834.8491379935415 - 7.3738995509470666E-005 1745.8850700048179 - 7.5213775419660081E-005 1661.2344930978495 - 7.6718050928053285E-005 1580.6882643486113 - 7.8252411946614348E-005 1504.0473812881846 - 7.9817460185546636E-005 1431.1224902350134 - 8.1413809389257577E-005 1361.7334184660469 - 8.3042085577042735E-005 1295.7087290709246 - 8.4702927288583596E-005 1232.8852973893959 - 8.6396985834355275E-005 1173.1079079854967 - 8.8124925551042382E-005 1116.2288711627436 - 8.9887424062063231E-005 1062.1076580728811 - 9.1685172543304501E-005 1010.6105535166629 - 9.3518875994170588E-005 961.61032557885267 - 9.5389253514054006E-005 914.98591128122496 - 9.7297038584335082E-005 870.62211747692265 - 9.9242979356021786E-005 828.40933624717968 - 1.0122783894314222E-004 788.24327409725322 - 1.0325239572200507E-004 750.02469428249719 - 1.0531744363644517E-004 713.65917162795563 - 1.0742379250917408E-004 679.05685923571514 - 1.0957226835935756E-004 646.13226650362958 - 1.1176371372654471E-004 614.80404790697924 - 1.1399898800107561E-004 584.99480202121117 - 1.1627896776109712E-004 556.63088028921743 - 1.1860454711631906E-004 529.64220506067795 - 1.2097663805864544E-004 503.96209645390616 - 1.2339617081981837E-004 479.52710761242940 - 1.2586409423621475E-004 456.27686794928240 - 1.2838137612093906E-004 434.15393399171961 - 1.3094900364335783E-004 413.10364745783727 - 1.3356798371622498E-004 393.07400021445818 - 1.3623934339054947E-004 374.01550578263880 - 1.3896413025836046E-004 355.88107707332830 - 1.4174341286352768E-004 338.62591005110988 - 1.4457828112079824E-004 322.20737303859369 - 1.4746984674321421E-004 306.58490138797094 - 1.5041924367807850E-004 291.71989725949982 - 1.5342762855164008E-004 277.57563425930698 - 1.5649618112267288E-004 264.11716670089942 - 1.5962610474512634E-004 251.31124326620085 - 1.6281862684002887E-004 239.12622485279942 - 1.6607499937682944E-004 227.53200640443447 - 1.6939649936436604E-004 216.49994253159190 - 1.7278442935165337E-004 206.00277673844252 - 1.7624011793868644E-004 196.01457408126620 - 1.7976492029746018E-004 186.51065709198406 - 1.8336021870340939E-004 177.46754480848728 - 1.8702742307747758E-004 168.86289476112751 - 1.9076797153902712E-004 160.67544777203642 - 1.9458333096980768E-004 152.88497543089264 - 1.9847499758920384E-004 145.47223011736693 - 2.0244449754098793E-004 138.41889744676655 - 2.0649338749180769E-004 131.70755102138992 - 2.1062325524164385E-004 125.32160937579590 - 2.1483572034647672E-004 119.24529500961511 - 2.1913243475340626E-004 113.46359540668668 - 2.2351508344847440E-004 107.96222594421205 - 2.2798538511744390E-004 102.72759460028699 - 2.3254509281979278E-004 97.746768372615861 - 2.3719599467618863E-004 93.007441325440354 - 2.4193991456971240E-004 88.497904185737468 - 2.4677871286110664E-004 84.207015413568982 - 2.5171428711832878E-004 80.124173675107400 - 2.5674857286069535E-004 76.239291650328283 - 2.6188354431790924E-004 72.542771110656645 - 2.6712121520426743E-004 69.025479204992834 - 2.7246363950835276E-004 65.678725895528757 - 2.7791291229851983E-004 62.494242487605575 - 2.8347117054449024E-004 59.464161200568050 - 2.8914059395538006E-004 56.580995729141478 - 2.9492340583448765E-004 53.837622747305225 - 3.0082187395117743E-004 51.227264308965097 - 3.0683831143020100E-004 48.743471101942781 - 3.1297507765880501E-004 46.380106513908245 - 3.1923457921198111E-004 44.131331470887723 - 3.2561927079622076E-004 41.991590010888302 - 3.3213165621214516E-004 39.955595556996350 - 3.3877428933638809E-004 38.018317856035246 - 3.4554977512311587E-004 36.174970550512441 - 3.5246077062557819E-004 34.420999353150052 - 3.5950998603808976E-004 32.752070794782526 - 3.6670018575885157E-004 31.164061517821036 - 3.7403418947402862E-004 29.653048088832538 - 3.8151487326350920E-004 28.215297305063693 - 3.8914517072877940E-004 26.847256970960444 - 3.9692807414335498E-004 25.545547121895090 - 4.0486663562622210E-004 24.306951673417721 - 4.1296396833874656E-004 23.128410475400067 - 4.2122324770552149E-004 22.007011751440317 - 4.2964771265963195E-004 20.939984904849140 - 4.3824066691282461E-004 19.924693673443056 - 4.4700548025108114E-004 18.958629616232848 - 4.5594558985610279E-004 18.039405915914923 - 4.6506450165322488E-004 17.164751481853603 - 4.7436579168628936E-004 16.332505338984852 - 4.8385310752001515E-004 15.540611288778335 - 4.9353016967041547E-004 14.787112829066780 - 5.0340077306382377E-004 14.070148320191361 - 5.1346878852510025E-004 13.387946385520184 - 5.2373816429560223E-004 12.738821534976205 - 5.3421292758151426E-004 12.121170000761721 - 5.4489718613314451E-004 11.533465774990958 - 5.5579512985580741E-004 10.974256839441114 - 5.6691103245292362E-004 10.442161578106774 - 5.7824925310198205E-004 9.9358653636944059 - 5.8981423816402174E-004 9.4541173096232551 - 6.0161052292730219E-004 8.9957271795080143 - 6.1364273338584822E-004 8.5595624464875613 - 6.2591558805356515E-004 8.1445454951344054 - 6.3843389981463642E-004 7.7496509590317100 - 6.5120257781092913E-004 7.3739031874399279 - 6.6422662936714777E-004 7.0163738347940514 - 6.7751116195449072E-004 6.6761795670759394 - 6.9106138519358057E-004 6.3524798793949326 - 7.0488261289745218E-004 6.0444750193847572 - 7.1898026515540125E-004 5.7514040112861169 - 7.3335987045850925E-004 5.4725427758331575 - 7.4802706786767943E-004 5.2072023412986779 - 7.6298760922503307E-004 4.9547271412781901 - 7.7824736140953373E-004 4.7144933950072199 - 7.9381230863772440E-004 4.4859075662101677 - 8.0968855481047895E-004 4.2684048966730614 - 8.2588232590668858E-004 4.0614480109171698 - 8.4239997242482238E-004 3.8645255885260732 - 8.5924797187331885E-004 3.6771511008459821 - 8.7643293131078523E-004 3.4988616089381059 - 8.9396158993700092E-004 3.3292166198132285 - 9.1184082173574100E-004 3.1677969981226215 - 9.3007763817045579E-004 3.0142039306164645 - 9.4867919093386487E-004 2.8680579408112874 - 9.6765277475254223E-004 2.7289979514320226 - 9.8700583024759312E-004 2.5966803923122703 - 1.0067459468525450E-003 2.4707783515487050 - 1.0268808657895960E-003 2.3509807678124113 - 1.0474184831053880E-003 2.2369916618216266 - 1.0683668527674958E-003 2.1285294050771113 - 1.0897341898228458E-003 2.0253260240534527 - 1.1115288736193026E-003 1.9271265381271845 - 1.1337594510916888E-003 1.8336883296059643 - 1.1564346401135225E-003 1.7447805443023809 - 1.1795633329157930E-003 1.6601835211713891 - 1.2031545995741090E-003 1.5796882496022173 - 1.2272176915655913E-003 1.5030958530238914 - 1.2517620453969033E-003 1.4302170975485422 - 1.2767972863048413E-003 1.3608719244385163 - 1.3023332320309380E-003 1.2948890052421813 - 1.3283798966715569E-003 1.2321053184993083 - 1.3549474946049881E-003 1.1723657469702256 - 1.3820464444970878E-003 1.1155226943936178 - 1.4096873733870296E-003 1.0614357208261225 - 1.4378811208547702E-003 1.0099711956627639 - 1.4666387432718656E-003 0.96100196748095845 - 1.4959715181373030E-003 0.91440704989238519 - 1.5258909485000491E-003 0.87007132262657172 - 1.5564087674700502E-003 0.82788524710766886 - 1.5875369428194513E-003 0.78774459582170608 - 1.6192876816758404E-003 0.74955019480568141 - 1.6516734353093573E-003 0.71320767862226708 - 1.6847069040155445E-003 0.67862725721475259 - 1.7184010420958555E-003 0.64572349406620588 - 1.7527690629377726E-003 0.61441509511475800 - 1.7878244441965280E-003 0.58462470790349064 - 1.8235809330804586E-003 0.55627873046869780 - 1.8600525517420679E-003 0.52930712949434433 - 1.8972536027769093E-003 0.50364326728344633 - 1.9351986748324475E-003 0.47922373711887684 - 1.9739026483290966E-003 0.45598820660682859 - 2.0133807012956786E-003 0.43387926861589010 - 2.0536483153215921E-003 0.41284229944345363 - 2.0947212816280242E-003 0.39282532385903474 - 2.1366157072605849E-003 0.37377888669107029 - 2.1793480214057966E-003 0.35565593063992762 - 2.2229349818339125E-003 0.33841168001524508 - 2.2673936814705908E-003 0.32200353011035604 - 2.3127415551000025E-003 0.30639094194047911 - 2.3589963862020026E-003 0.29153534208460807 - 2.4061763139260426E-003 0.27740002738364422 - 2.4542998402045635E-003 0.26395007425931316 - 2.5033858370086550E-003 0.25115225242982336 - 2.5534535537488283E-003 0.23897494280908727 - 2.6045226248238048E-003 0.22738805938666182 - 2.6566130773202812E-003 0.21636297489539924 - 2.7097453388666868E-003 0.20587245008316013 - 2.7639402456440206E-003 0.19589056641384023 - 2.8192190505569011E-003 0.18639266203144086 - 2.8756034315680391E-003 0.17735527082896985 - 2.9331155001994002E-003 0.16875606447163355 - 2.9917778102033880E-003 0.16057379723107928 - 3.0516133664074559E-003 0.15278825349439110 - 3.1126456337356050E-003 0.14538019781815312 - 3.1748985464103174E-003 0.13833132740417914 - 3.2383965173385237E-003 0.13162422687949332 - 3.3031644476852941E-003 0.12524232526883802 - 3.3692277366390000E-003 0.11916985505340279 - 3.4366122913717799E-003 0.11339181321462215 - 3.5053445371992157E-003 0.10789392416679469 - 3.5754514279432003E-003 0.10266260448694277 - 3.6469604565020643E-003 9.7684929354771757E-002 - 3.7198996656321055E-003 9.2948600619813831E-002 - 3.7942976589447476E-003 8.8441916416860597E-002 - 3.8701836121236427E-003 8.4153742254614944E-002 - 3.9475872843661155E-003 8.0073483506131693E-002 - 4.0265390300534380E-003 7.6191059233080324E-002 - 4.1070698106545067E-003 7.2496877279158572E-002 - 4.1892112068675968E-003 6.8981810571120614E-002 - 4.2729954310049487E-003 6.5637174568868514E-002 - 4.3584553396250475E-003 6.2454705808892938E-002 - 4.4456244464175483E-003 5.9426541488051841E-002 - 4.5345369353458993E-003 5.6545200037245127E-002 - 4.6252276740528170E-003 5.3803562636989738E-002 - 4.7177322275338733E-003 5.1194855629226155E-002 - 4.8120868720845505E-003 4.8712633781902055E-002 - 4.9083286095262420E-003 4.6350764364985329E-002 - 5.0064951817167672E-003 4.4103411998564018E-002 - 5.1066250853511030E-003 4.1965024235597552E-002 - 5.2087575870581248E-003 3.9930317843699471E-002 - 5.3129327387992876E-003 3.7994265752058380E-002 - 5.4191913935752734E-003 3.6152084631247534E-002 - 5.5275752214467792E-003 3.4399223075236740E-002 - 5.6381267258757148E-003 3.2731350356408666E-002 - 5.7508892603932290E-003 3.1144345725796614E-002 - 5.8659070456010933E-003 2.9634288232108629E-002 - 5.9832251865131149E-003 2.8197447034383944E-002 - 6.1028896902433774E-003 2.6830272184347741E-002 - 6.2249474840482448E-003 2.5529385855690524E-002 - 6.3494464337292096E-003 2.4291573998602572E-002 - 6.4764353624037936E-003 2.3113778398944722E-002 - 6.6059640696518700E-003 2.1993089122436332E-002 - 6.7380833510449073E-003 2.0926737325192624E-002 - 6.8728450180658056E-003 1.9912088412848552E-002 - 7.0103019184271217E-003 1.8946635531367908E-002 - 7.1505079567956639E-003 1.8027993373455457E-002 - 7.2935181159315774E-003 1.7153892285269971E-002 - 7.4393884782502093E-003 1.6322172658877789E-002 - 7.5881762478152140E-003 1.5530779596592572E-002 - 7.7399397727715182E-003 1.4777757834018647E-002 - 7.8947385682269482E-003 1.4061246909254456E-002 - 8.0526333395914869E-003 1.3379476566320927E-002 - 8.2136860063833170E-003 1.2730762381458115E-002 - 8.3779597265109841E-003 1.2113501601484214E-002 - 8.5455189210412036E-003 1.1526169183934936E-002 - 8.7164292994620276E-003 1.0967314029199740E-002 - 8.8907578854512687E-003 1.0435555395345861E-002 - 9.0685730431602947E-003 9.9295794867723282E-003 - 9.2499445040235013E-003 9.4481362082657078E-003 - 9.4349433941039711E-003 8.9900360764379600E-003 - 9.6236422619860509E-003 8.5541472809155649E-003 - 9.8161151072257719E-003 8.1393928880192003E-003 - 1.0012437409370287E-002 7.7447481800251078E-003 - 1.0212686157557693E-002 7.3692381234344365E-003 - 1.0416939880708846E-002 7.0119349599954894E-003 - 1.0625278678323023E-002 6.6719559145270975E-003 - 1.0837784251889483E-002 6.3484610138799325E-003 - 1.1054539936927272E-002 6.0406510116471695E-003 - 1.1275630735665818E-002 5.7477654134971239E-003 - 1.1501143350379136E-002 5.4690805982491710E-003 - 1.1731166217386719E-002 5.2039080300507251E-003 - 1.1965789541734453E-002 4.9515925572381986E-003 - 1.2205105332569143E-002 4.7115107936789805E-003 - 1.2449207439220527E-002 4.4830695785953133E-003 - 1.2698191588004937E-002 4.2657045110647655E-003 - 1.2952155419765037E-002 4.0588785555765883E-003 - 1.3211198528160337E-002 3.8620807151987383E-003 - 1.3475422498723544E-002 3.6748247690774121E-003 - 1.3744930948698015E-002 3.4966480711498904E-003 - 1.4019829567671975E-002 3.3271104071027039E-003 - 1.4300226159025414E-002 3.1657929067510663E-003 - 1.4586230682205922E-002 3.0122970091524194E-003 - 1.4877955295850041E-002 2.8662434778972470E-003 - 1.5175514401767043E-002 2.7272714641442641E-003 - 1.5479024689802383E-002 2.5950376150850668E-003 - 1.5788605183598432E-002 2.4692152256355548E-003 - 1.6104377287270401E-002 2.3494934312582516E-003 - 1.6426464833015811E-002 2.2355764399212474E-003 - 1.6754994129676126E-002 2.1271828012962052E-003 - 1.7090094012269651E-002 2.0240447113898581E-003 - 1.7431895892515044E-002 1.9259073508909931E-003 - 1.7780533810365345E-002 1.8325282555981719E-003 - 1.8136144486572654E-002 1.7436767173727617E-003 - 1.8498867376304108E-002 1.6591332141372101E-003 - 1.8868844723830189E-002 1.5786888675102932E-003 - 1.9246221618306792E-002 1.5021449267393319E-003 - 1.9631146050672930E-002 1.4293122776543555E-003 - 2.0023768971686388E-002 1.3600109754309966E-003 - 2.0424244351120117E-002 1.2940698000077342E-003 - 2.0832729238142521E-002 1.2313258330590748E-003 - 2.1249383822905372E-002 1.1716240554795138E-003 - 2.1674371499363479E-002 1.1148169643837931E-003 - 2.2107858929350750E-002 1.0607642086771973E-003 - 2.2550016107937765E-002 1.0093322422955037E-003 - 2.3001016430096520E-002 9.6039399425785826E-004 - 2.3461036758698452E-002 9.1382855471738996E-004 - 2.3930257493872422E-002 8.6952087623390622E-004 - 2.4408862643749869E-002 8.2736148953060538E-004 - 2.4897039896624867E-002 7.8724623303254673E-004 - 2.5394980694557364E-002 7.4907599551865436E-004 - 2.5902880308448513E-002 7.1275647125143506E-004 - 2.6420937914617484E-002 6.7819792697942157E-004 - 2.6949356672909836E-002 6.4531498023667874E-004 - 2.7488343806368033E-002 6.1402638839163086E-004 - 2.8038110682495395E-002 5.8425484792401559E-004 - 2.8598872896145305E-002 5.5592680343405116E-004 - 2.9170850354068210E-002 5.2897226591193966E-004 - 2.9754267361149576E-002 5.0332463981871221E-004 - 3.0349352708372569E-002 4.7892055855119296E-004 - 3.0956339762540020E-002 4.5569972788457065E-004 - 3.1575466557790824E-002 4.3360477700577594E-004 - 3.2206975888946644E-002 4.1258111676962123E-004 - 3.2851115406725577E-002 3.9257680482749941E-004 - 3.3508137714860088E-002 3.7354241729542069E-004 - 3.4178300469157291E-002 3.5543092664432437E-004 - 3.4861866478540435E-002 3.3819758551097178E-004 - 3.5559103808111246E-002 3.2179981614235655E-004 - 3.6270285884273473E-002 3.0619710520048935E-004 - 3.6995691601958945E-002 2.9135090366765097E-004 - 3.7735605433998128E-002 2.7722453160481801E-004 - 3.8490317542678093E-002 2.6378308752794802E-004 - 3.9260123893531652E-002 2.5099336217822591E-004 - 4.0045326371402283E-002 2.3882375647322511E-004 - 4.0846232898830333E-002 2.2724420343627052E-004 - 4.1663157556806940E-002 2.1622609391111624E-004 - 4.2496420707943079E-002 2.0574220587840300E-004 - 4.3346349122101939E-002 1.9576663719926253E-004 - 4.4213276104543980E-002 1.8627474161989944E-004 - 4.5097541626634860E-002 1.7724306787904009E-004 - 4.5999492459167561E-002 1.6864930176780325E-004 - 4.6919482308350913E-002 1.6047221099884301E-004 - 4.7857871954517933E-002 1.5269159274855273E-004 - 4.8815029393608295E-002 1.4528822374272623E-004 - 4.9791329981480462E-002 1.3824381276235367E-004 - 5.0787156581110070E-002 1.3154095545221022E-004 - 5.1802899712732275E-002 1.2516309132058518E-004 - 5.2838957706986919E-002 1.1909446282391223E-004 - 5.3895736861126656E-002 1.1332007643521264E-004 - 5.4973651598349188E-002 1.0782566560016496E-004 - 5.6073124630316176E-002 1.0259765548927796E-004 - 5.7194587122922504E-002 9.7623129459081825E-005 - 5.8338478865380954E-002 9.2889797139473798E-005 - 5.9505248442688577E-002 8.8385964068373623E-005 - 6.0695353411542349E-002 8.4100502798666022E-005 - 6.1909260479773194E-002 8.0022825406045041E-005 - 6.3147445689368656E-002 7.6142857329836793E-005 - 6.4410394603156035E-002 7.2451012482169989E-005 - 6.5698602495219152E-002 6.8938169563997429E-005 - 6.7012574545123535E-002 6.5595649529453197E-005 - 6.8352826036026007E-002 6.2415194142867979E-005 - 6.9719882556746535E-002 5.9388945575463925E-005 - 7.1114280207881464E-002 5.6509426991319280E-005 - 7.2536565812039100E-002 5.3769524074637480E-005 - 7.3987297128279880E-002 5.1162467452680916E-005 - 7.5467043070845480E-002 4.8681815970941921E-005 - 7.6976383932262388E-002 4.6321440779230300E-005 - 7.8515911610907638E-002 4.4075510189358778E-005 - 8.0086229843125786E-002 4.1938475267015417E-005 - 8.1687954439988303E-002 3.9905056122225050E-005 - 8.3321713528788074E-002 3.7970228864528197E-005 - 8.4988147799363839E-002 3.6129213190648206E-005 - 8.6687910755351122E-002 3.4377460573979813E-005 - 8.8421668970458139E-002 3.2710643026719440E-005 - 9.0190102349867310E-002 3.1124642406872180E-005 - 9.1993904396864654E-002 2.9615540243716882E-005 - 9.3833782484801953E-002 2.8179608056591151E-005 - 9.5710458134497994E-002 2.6813298143077709E-005 - 9.7624667297187953E-002 2.5513234813832445E-005 - 9.9577160643131712E-002 2.4276206052398623E-005 - 0.10156870385599436 2.3099155579401389E-005 - 0.10360007793311424 2.1979175301515892E-005 - 0.10567207949177652 2.0913498126552950E-005 - 0.10778552108161206 1.9899491126910859E-005 - 0.10994123150324431 1.8934649034502421E-005 - 0.11214005613330920 1.8016588051085465E-005 - 0.11438285725597538 1.7143039958704238E-005 - 0.11667051440109490 1.6311846515690532E-005 - 0.11900392468911680 1.5520954124379050E-005 - 0.12138400318289914 1.4768408757362624E-005 - 0.12381168324655713 1.4052351129751880E-005 - 0.12628791691148827 1.3371012105511585E-005 - 0.12881367524971804 1.2722708326524294E-005 - 0.13138994875471241 1.2105838053582214E-005 - 0.13401774772980665 1.1518877209031759E-005 - 0.13669810268440280 1.0960375611293496E-005 - 0.13943206473809086 1.0428953391954338E-005 - 0.14222070603285267 9.9232975865797168E-006 - 0.14506512015350972 9.4421588908228524E-006 - 0.14796642255657994 8.9843485738165826E-006 - 0.15092575100771152 8.5487355412217347E-006 - 0.15394426602786576 8.1342435406758297E-006 - 0.15702315134842307 7.7398485027378012E-006 - 0.16016361437539153 7.3645760107590014E-006 - 0.16336688666289936 7.0074988934294816E-006 - 0.16663422439615735 6.6677349340514966E-006 - 0.16996690888408050 6.3444446908806524E-006 - 0.17336624706176212 6.0368294231494726E-006 - 0.17683357200299737 5.7441291176493213E-006 - 0.18037024344305733 5.4656206109949925E-006 - 0.18397764831191848 5.2006158029327605E-006 - 0.18765720127815685 4.9484599562775517E-006 - 0.19141034530372000 4.7085300792789646E-006 - 0.19523855220979441 4.4802333864195207E-006 - 0.19914332325399031 4.2630058338422904E-006 - 0.20312618971907012 4.0563107257894299E-006 - 0.20718871351345153 3.8596373886086211E-006 - 0.21133248778372057 3.6724999090513192E-006 - 0.21555913753939498 3.4944359337455882E-006 - 0.21987032029018289 3.3250055268774040E-006 - 0.22426772669598655 3.1637900832581666E-006 - 0.22875308122990629 3.0103912940929610E-006 - 0.23332814285450443 2.8644301628943414E-006 - 0.23799470571159453 2.7255460691102881E-006 - 0.24275459982582642 2.5933958771528829E-006 - 0.24760969182234296 2.4676530886264082E-006 - 0.25256188565878984 2.3480070356603261E-006 - 0.25761312337196562 2.2341621133541185E-006 - 0.26276538583940495 2.1258370494376285E-006 - 0.26802069355619307 2.0227642093424863E-006 - 0.27338110742731692 1.9246889349676753E-006 - 0.27884872957586326 1.8313689155055566E-006 - 0.28442570416738056 1.7425735887738793E-006 - 0.29011421825072820 1.6580835715746670E-006 - 0.29591650261574276 1.5776901176725869E-006 - 0.30183483266805761 1.5011946020536591E-006 - 0.30787152932141876 1.4284080301900724E-006 - 0.31402895990784713 1.3591505710986776E-006 - 0.32030953910600407 1.2932511130394933E-006 - 0.32671572988812414 1.2305468407565133E-006 - 0.33325004448588663 1.1708828332163157E-006 - 0.33991504537560435 1.1141116808506259E-006 - 0.34671334628311645 1.0600931213571666E-006 - 0.35364761320877880 1.0086936931589833E-006 - 0.36072056547295439 9.5978640566605973E-007 - 0.36793497678241349 9.1325042552455295E-007 - 0.37529367631806176 8.6897077807847310E-007 - 0.38279954984442299 8.2683806330622494E-007 - 0.39045554084131145 7.8674818553018143E-007 - 0.39826465165813768 7.4860209623149897E-007 - 0.40622994469130042 7.1230554933475097E-007 - 0.41435454358512641 6.7776886835777521E-007 - 0.42264163445682895 6.4490672485143879E-007 - 0.43109446714596555 6.1363792758192125E-007 - 0.43971635648888485 5.8388522193465744E-007 - 0.44851068361866253 5.5557509904433149E-007 - 0.45748089729103580 5.2863761417935190E-007 - 0.46663051523685650 5.0300621393209398E-007 - 0.47596312554159365 4.7861757178795543E-007 - 0.48548238805242555 4.5541143166697315E-007 - 0.49519203581347410 4.3333045905144391E-007 - 0.50509587652974364 4.1232009933173735E-007 - 0.51519779406033850 3.9232844302032073E-007 - 0.52550174994154530 3.7330609750098407E-007 - 0.53601178494037627 3.5520606499640454E-007 - 0.54673202063918380 3.3798362645254507E-007 - 0.55766666105196749 3.2159623105300812E-007 - 0.56881999427300689 3.0600339109037024E-007 - 0.58019639415846702 2.9116658193476133E-007 - 0.59180032204163635 2.7704914685254283E-007 - 0.60363632848246906 2.6361620643992655E-007 - 0.61570905505211848 2.5083457244777342E-007 - 0.62802323615316091 2.3867266578466288E-007 - 0.64058370087622418 2.2710043849564661E-007 - 0.65339537489374866 2.1608929952392219E-007 - 0.66646328239162367 2.0561204407200850E-007 - 0.67979254803945610 1.9564278638789963E-007 - 0.69338839900024518 1.8615689581013286E-007 - 0.70725616698025007 1.7713093591376088E-007 - 0.72140129031985512 1.6854260660687828E-007 - 0.73582931612625224 1.6037068903464252E-007 - 0.75054590244877728 1.5259499315466514E-007 - 0.76555682049775287 1.4519630785425094E-007 - 0.78086795690770794 1.3815635348624079E-007 - 0.79648531604586215 1.3145773670619062E-007 - 0.81241502236677943 1.2508390749930434E-007 - 0.82866332281411503 1.1901911829094898E-007 - 0.84523658927039735 1.1324838503972774E-007 - 0.86214132105580532 1.0775745021698538E-007 - 0.87938414747692140 1.0253274758128065E-007 - 0.89697183042645989 9.7561368660795331E-008 - 0.91491126703498915 9.2831030860869610E-008 - 0.93320949237568895 8.8330047117867847E-008 - 0.95187368222320279 8.4047297024400032E-008 - 0.97091115586766685 7.9972199354559049E-008 - 0.99032937898502016 7.6094685921292911E-008 - 1.0101359665647205 7.2405176701322206E-008 - 1.0303386858960148 6.8894556166145182E-008 - 1.0509454596139352 6.5554150760652124E-008 - 1.0719643688062139 6.2375707473706403E-008 - 1.0934036561823381 5.9351373447747323E-008 - 1.1152717293059848 5.6473676577037016E-008 - 1.1375771638921046 5.3735507046616244E-008 - 1.1603287071699466 5.1130099766358125E-008 - 1.1835352813133455 4.8651017656720121E-008 - 1.2072059869396123 4.6292135744899265E-008 - 1.2313501066784045 4.4047626032097511E-008 - 1.2559771088119727 4.1911943094509207E-008 - 1.2810966509882122 3.9879810382455906E-008 - 1.3067185840079765 3.7946207183818059E-008 - 1.3328529556881361 3.6106356219554593E-008 - 1.3595100148018988 3.4355711840663515E-008 - 1.3867002150979368 3.2689948797421672E-008 - 1.4144342193998956 3.1104951553156700E-008 - 1.4427229037878935 2.9596804116148861E-008 - 1.4715773618636514 2.8161780364540958E-008 - 1.5010089091009244 2.6796334840352393E-008 - 1.5310290872829428 2.5497093989852506E-008 - 1.5616496690286017 2.4260847828651157E-008 - 1.5928826624091739 2.3084542010913779E-008 - 1.6247403156573574 2.1965270283106630E-008 - 1.6572351219705046 2.0900267303627957E-008 - 1.6903798244099146 1.9886901810584897E-008 - 1.7241874208981129 1.8922670120835931E-008 - 1.7586711693160753 1.8005189944237253E-008 - 1.7938445927023967 1.7132194497810177E-008 - 1.8297214845564447 1.6301526905287596E-008 - 1.8663159142475736 1.5511134868202788E-008 - 1.9036422325325251 1.4759065595354530E-008 - 1.9417150771831757 1.4043460978120989E-008 - 1.9805493787268393 1.3362552999702250E-008 - 2.0201603663013761 1.2714659366949200E-008 - 2.0605635736274035 1.2098179353986567E-008 - 2.1017748450999516 1.1511589847361080E-008 - 2.1438103420019505 1.0953441582943637E-008 - 2.1866865488419895 1.0422355565288196E-008 - 2.2304202798188295 9.9170196606007423E-009 - 2.2750286854152062 9.4361853549008380E-009 - 2.3205292591235103 8.9786646693661150E-009 - 2.3669398443059806 8.5433272252387306E-009 - 2.4142786411921002 8.1290974510420408E-009 - 2.4625642140159423 7.7349519252075291E-009 - 2.5118154982962611 7.3599168475465039E-009 - 2.5620518082621864 7.0030656333194374E-009 - 2.6132928444274302 6.6635166239586908E-009 - 2.6655587013159789 6.3404309087886071E-009 - 2.7188698753422984 6.0330102523611797E-009 - 2.7732472728491446 5.7404951222864256E-009 - 2.8287122183061277 5.4621628126849447E-009 - 2.8852864626722505 5.1973256586262900E-009 - 2.9429921919256956 4.9453293371416864E-009 - 3.0018520357642098 4.7055512506134331E-009 - 3.0618890764794942 4.4773989885469308E-009 - 3.1231268580090843 4.2603088639248509E-009 - 3.1855893951692660 4.0537445205273131E-009 - 3.2493011830726513 3.8571956077772023E-009 - 3.3142872067341043 3.6701765198366294E-009 - 3.3805729508687863 3.4922251958392709E-009 - 3.4481844098861623 3.3229019782943555E-009 - 3.5171480980838856 3.1617885268418227E-009 - 3.5874910600455636 3.0084867846748790E-009 - 3.6592408812464750 2.8626179950763658E-009 - 3.7324256988714044 2.7238217656391018E-009 - 3.8070742128488324 2.5917551778582290E-009 - 3.8832156971058089 2.4660919398956550E-009 - 3.9608800110479252 2.3465215804233584E-009 - 4.0400976112688838 2.2327486815538237E-009 - 4.1208995634942616 2.1244921489624304E-009 - 4.2033175547641468 2.0214845173985164E-009 - 4.2873839058594294 1.9234712898692752E-009 - 4.3731315839766181 1.8302103088638215E-009 - 4.4605942156561502 1.7414711580639494E-009 - 4.5498060999692731 1.6570345930633951E-009 - 4.6408022219686584 1.5766919996891175E-009 - 4.7336182664080315 1.5002448785862853E-009 - 4.8282906317361922 1.4275043547935574E-009 - 4.9248564443709162 1.3582907110969818E-009 - 5.0233535732583343 1.2924329440095882E-009 - 5.1238206447235015 1.2297683412796495E-009 - 5.2262970576179715 1.1701420798837830E-009 - 5.3308229987703308 1.1134068435116613E-009 - 5.4374394587457378 1.0594224585972701E-009 - 5.5461882479206528 1.0080555479974730E-009 - 5.6571120128790655 9.5917920146223399E-010 - 5.7702542531366472 9.1267266208234269E-010 - 5.8856593381993800 8.6842102793996730E-010 - 6.0033725249633676 8.2631496822490383E-010 - 6.1234399754626354 7.8625045311515018E-010 - 6.2459087749718885 7.4812849675442640E-010 - 6.3708269504713266 7.1185491269162744E-010 - 6.4982434894807533 6.7734008117798192E-010 - 6.6282083592703680 6.4449872774698513E-010 - 6.7607725264557752 6.1324971253005637E-010 - 6.8959879769848911 5.8351582978738615E-010 - 7.0339077365245890 5.5522361715868543E-010 - 7.1745858912550808 5.2830317416255687E-010 - 7.3180776090801825 5.0268798949606595E-010 - 7.4644391612617866 4.7831477670782175E-010 - 7.6137279444870227 4.5512331783857725E-010 - 7.7660025033767637 4.3305631464303308E-010 - 7.9213225534442993 4.1205924702526758E-010 - 8.0797490045131859 3.9208023833803268E-010 - 8.2413439846034500 3.7306992721311745E-010 - 8.4061708642955200 3.5498134560611390E-010 - 8.5742942815814303 3.3776980275427750E-010 - 8.7457801672130593 3.2139277476077747E-010 - 8.9206957705573213 3.0580979953254203E-010 - 9.0991096859684681 2.9098237681212059E-010 - 9.2810918796878372 2.7687387305657916E-010 - 9.4667137172815945 2.6344943092841459E-010 - 9.6560479916272257 2.5067588317487254E-010 - 9.8491689514597702 2.3852167068289091E-010 - 10.046152330488965 2.2695676450721418E-010 - 10.247075377098744 2.1595259167903281E-010 - 10.452016884640718 2.0548196461184872E-010 - 10.661057222333532 1.9551901393015111E-010 - 10.874278366780203 1.8603912455494547E-010 - 11.091763934115807 1.7701887488822484E-010 - 11.313599212798124 1.6843597894612865E-010 - 11.539871197054087 1.6026923129781961E-010 - 11.770668620995169 1.5249845467404142E-010 - 12.006081993415073 1.4510445011591596E-010 - 12.246203633283374 1.3806894954081410E-010 - 12.491127705949042 1.3137457060810648E-010 - 12.740950260068024 1.2500477377328345E-010 - 12.995769265269384 1.1894382142433857E-010 - 13.255684650574771 1.1317673899945601E-010 - 13.520798343586266 1.0768927798993673E-010 - 13.791214310457992 1.0246788073695611E-010 - 14.067038596667151 9.7499646935177974E-011 - 14.348379368600495 9.2772301760466218E-011 - 14.635346955972505 8.8274165542949272E-011 - 14.928053895091955 8.3994124910508760E-011 - 15.226614972993794 7.9921605331398729E-011 - 15.531147272453669 7.6046544988156752E-011 - 15.841770217902743 7.2359369918258575E-011 - 16.158605622260797 6.8850970360097290E-011 - 16.481777734706014 6.5512678245845610E-011 - 16.811413289400136 6.2336245785594300E-011 - 17.147641555188137 5.9313825089854838E-011 - 17.490594386291900 5.6437948780080702E-011 - 17.840406274017738 5.3701511539302552E-011 - 18.197214399498094 5.1097752557294854E-011 - 18.561158687488057 4.8620238826902167E-011 - 18.932381861237818 4.6262849250255817E-011 - 19.311029498462574 4.4019759515612834E-011 - 19.697250088431826 4.1885427707453011E-011 - 20.091195090200461 3.9854580614281394E-011 - 20.493018992004473 3.7922200700307508E-011 - 20.902879371844563 3.6083513708812694E-011 - 21.320936959281454 3.4333976866577681E-011 - 21.747355698467082 3.2669267660227530E-011 - 22.182302812436426 3.1085273156764140E-011 - 22.625948868685153 2.9578079841900917E-011 - 23.078467846058857 2.8143963951093528E-011 - 23.540037202980034 2.6779382269378125E-011 - 24.010837947039636 2.5480963377286424E-011 - 24.491054705980428 2.4245499321209315E-011 - 24.980875800100037 2.3069937687629269E-011 - 25.480493316102038 2.1951374061639710E-011 - 25.990103182424079 2.0887044851118807E-011 - 26.509905246072559 1.9874320458828744E-011 - 27.040103350994013 1.8910698785570964E-011 - 27.580905418013895 1.7993799048345950E-011 - 28.132523526374172 1.7121355898244247E-011 - 28.695173996901655 1.6291213823536034E-011 - 29.269077476839687 1.5501321824131229E-011 - 29.854459026376482 1.4749728344252475E-011 - 30.451548206904011 1.4034576450801327E-011 - 31.060579171042093 1.3354099245505101E-011 - 31.681790754462934 1.2706615499509270E-011 - 32.315426569552194 1.2090525499630000E-011 - 32.961735100943237 1.1504307096004347E-011 - 33.620969802962101 1.0946511941373116E-011 - 34.293389199021341 1.0415761912705025E-011 - 34.979256983001768 9.9107457063211352E-012 - 35.678842122661806 9.4302155981072945E-012 - 36.392418965115041 8.9729843608101743E-012 - 37.120267344417343 8.5379223308005545E-012 - 37.862672691305690 8.1239546170568538E-012 - 38.619926145131807 7.7300584454732365E-012 - 39.392324668034441 7.3552606319309733E-012 - 40.180171161395130 6.9986351778898595E-012 - 40.983774584623035 6.6593009825592666E-012 - 41.803450076315499 6.3364196659962986E-012 - 42.639519077841811 6.0291934977527236E-012 - 43.492309459398648 5.7368634259530371E-012 - 44.362155648586622 5.4587072019341953E-012 - 45.249398761558353 5.1940375958136298E-012 - 46.154386736789519 4.9422006985768076E-012 - 47.077474471525314 4.7025743064893865E-012 - 48.019023960955820 4.4745663838423850E-012 - 48.979404440174939 4.2576136002323276E-012 - 49.958992528978442 4.0511799387624881E-012 - 50.958172379558015 3.8547553717265638E-012 - 51.977335827149176 3.6678546005028380E-012 - 53.016882543692162 3.4900158565455470E-012 - 54.077220194566003 3.3207997605110975E-012 - 55.158764598457324 3.1597882367004205E-012 - 56.261939890426468 3.0065834801354287E-012 - 57.387178688234997 2.8608069737175567E-012 - 58.534922261999697 2.7220985530401293E-012 - 59.705620707239689 2.5901155165440130E-012 - 60.899733121384486 2.4645317788180609E-012 - 62.117727783812178 2.3450370649524279E-012 - 63.360082339488422 2.2313361439542898E-012 - 64.627283986278186 2.1231480993319834E-012 - 65.919829666003750 2.0202056350454371E-012 - 67.238226259323824 1.9222544151081295E-012 - 68.582990784510301 1.8290524352089480E-012 - 69.954650600200509 1.7403694248014501E-012 - 71.353743612204525 1.6559862781832791E-012 - 72.780818484448616 1.5756945131601377E-012 - 74.236434854137585 1.4992957559568463E-012 - 75.721163551220343 1.4266012511028892E-012 - 77.235586822244755 1.3574313950815364E-012 - 78.780298558689651 1.2916152925903425E-012 - 80.355904529863452 1.2289903343166950E-012 - 81.963022620460720 1.1694017951852453E-012 - 83.602283072869938 1.1127024520846126E-012 - 85.274328734327341 1.0587522201289082E-012 - 86.979815309013887 1.0074178065553974E-012 - 88.719411615194161 9.5857238140319581E-013 - 90.493799847498053 9.1209526415936512E-013 - 92.303675844448023 8.6787162559821339E-013 - 94.149749361336987 8.2579220407714246E-013 - 96.032744348563725 7.8575303558811135E-013 - 97.953399235535002 7.4765519689776061E-013 - 99.912467220245702 7.1140456114158595E-013 - 101.91071656465061 6.7691156526831369E-013 - 103.94893089594363 6.4409098875991633E-013 - 106.02790951386251 6.1286174308055660E-013 - 108.14846770413976 5.8314667133426116E-013 - 110.31143705822255 5.5487235763634570E-013 - 112.51766579938700 5.2796894572761307E-013 - 114.76801911537474 5.0236996638318069E-013 - 117.06337949768223 4.7801217318952383E-013 - 119.40464708763588 4.5483538628399449E-013 - 121.79274002938860 4.3278234367074989E-013 - 124.22859482997637 4.1179855974574175E-013 - 126.71316672657591 3.9183219068123082E-013 - 129.24743006110742 3.7283390633723572E-013 - 131.83237866232957 3.5475676838345362E-013 - 134.46902623557617 3.3755611433053354E-013 - 137.15840676028770 3.2118944718418153E-013 - 139.90157489549347 3.0561633044947215E-013 - 142.69960639340334 2.9079828822595565E-013 - 145.55359852127143 2.7669871014673067E-013 - 148.46467049169686 2.6328276092661957E-013 - 151.43396390153080 2.5051729429596887E-013 - 154.46264317956141 2.3837077110743623E-013 - 157.55189604315265 2.2681318141343210E-013 - 160.70293396401570 2.1581597032169691E-013 - 163.91699264329603 2.0535196744582696E-013 - 167.19533249616194 1.9539531977644620E-013 - 170.53923914608518 1.8592142780717006E-013 - 173.95002392900687 1.7690688475755184E-013 - 177.42902440758701 1.6832941874285024E-013 - 180.97760489573875 1.6016783774774065E-013 - 184.59715699365353 1.5240197726801816E-013 - 188.28910013352660 1.4501265049093267E-013 - 192.05488213619714 1.3798160089106860E-013 - 195.89597977892109 1.3129145712465002E-013 - 199.81389937449953 1.2492569011082964E-013 - 203.81017736198953 1.1886857219392476E-013 - 207.88638090922933 1.1310513828570332E-013 - 212.04410852741393 1.0762114889171601E-013 - 216.28499069796220 1.0240305493032521E-013 - 220.61069051192146 9.7437964257510150E-014 - 225.02290432215989 9.2713609814742602E-014 - 229.52336240860308 8.8218319321237295E-014 - 234.11382965677515 8.3940986435696744E-014 - 238.79610624991065 7.9871043316301088E-014 - 243.57202837490885 7.5998434511147796E-014 - 248.44346894240704 7.2313592114633487E-014 - 253.41233832125519 6.8807412128397599E-014 - 258.48058508768031 6.5471231968423895E-014 - 263.65019678943395 6.2296809062727263E-014 - 268.92320072522261 5.9276300486748356E-014 - 274.30166473972707 5.6402243586141372E-014 - 279.78769803452161 5.3667537539081222E-014 - 285.38345199521206 5.1065425812536086E-014 - 291.09112103511632 4.8589479469161237E-014 - 296.91294345581866 4.6233581283570789E-014 - 302.85120232493506 4.3991910628744306E-014 - 308.90822637143378 4.1858929095227484E-014 - 315.08639089886248 3.9829366807596995E-014 - 321.38811871683976 3.7898209404381985E-014 - 327.81588109117655 3.6060685649274110E-014 - 334.37219871300010 3.4312255643017480E-014 - 341.05964268726012 3.2648599606854228E-014 - 347.88083554100535 3.1065607209813337E-014 - 354.83845225182546 2.9559367413473987E-014 - 361.93522129686198 2.8126158809113388E-014 - 369.17392572279925 2.6762440423365410E-014 - 376.55740423725524 2.5464842969673917E-014 - 384.08855232200034 2.4230160523926038E-014 - 391.77032336844036 2.3055342603698834E-014 - 399.60572983580920 2.1937486631549688E-014 - 407.59784443252539 2.0873830763729903E-014 - 415.74980132117588 1.9861747066603562E-014 - 424.06479734759938 1.8898735023913013E-014 - 432.54609329455138 1.7982415358849525E-014 - 441.19701516044239 1.7110524155665610E-014 - 450.02095546365126 1.6280907266305468E-014 - 459.02137457292429 1.5491514988234260E-014 - 468.20180206438278 1.4740397000316904E-014 - 477.56583810567042 1.4025697544234651E-014 - 487.11715486778382 1.3345650839534419E-014 - 496.85949796513950 1.2698576720982942E-014 - 506.79668792444227 1.2082876487447161E-014 - 516.93262168293109 1.1497028952044835E-014 - 527.27127411658967 1.0939586683806627E-014 - 537.81669959892145 1.0409172431564089E-014 - 548.57303359089985 9.9044757212281818E-015 - 559.54449426271788 9.4242496180513488E-015 - 570.73538414797224 8.9673076458738084E-015 - 582.15009183093173 8.5325208557425476E-015 - 593.79309366755035 8.1188150366605670E-015 - 605.66895554090138 7.7251680615750945E-015 - 617.78233465171945 7.3506073620475968E-015 - 630.13798134475383 6.9942075253663543E-015 - 642.74074097164896 6.6550880081648652E-015 - 655.59555579108201 6.3324109608972296E-015 - 668.70746690690362 6.0253791577955048E-015 - 682.08161624504169 5.7332340271946666E-015 - 695.72324856994248 5.4552537773587783E-015 - 709.63771354134133 5.1907516131779119E-015 - 723.83046781216819 4.9390740393298951E-015 - 738.30707716841152 4.6995992457145559E-015 - 753.07321871177976 4.4717355711714257E-015 - 768.13468308601534 4.2549200416852681E-015 - 783.49737674773564 4.0486169794678420E-015 - 799.16732428269040 3.8523166794793929E-015 - 815.15067076834418 3.6655341501200191E-015 - 831.45368418371106 3.4878079149795836E-015 - 848.08275786738534 3.3186988726856954E-015 - 865.04441302473310 3.1577892120328470E-015 - 882.34530128522783 3.0046813797123355E-015 - 899.99220731093237 2.8589970980925997E-015 - 917.99205145715109 2.7203764306232227E-015 - 936.35189248629410 2.5884768925535498E-015 - 955.07893033601999 2.4629726047687819E-015 - 974.18050894274040 2.3435534886529886E-015 - 993.66411912159526 2.2299244999897958E-015 - 1013.5374015040272 2.1218049000079953E-015 - 1033.8081495341078 2.0189275617710557E-015 - 1054.4843125247899 1.9210383101968804E-015 - 1075.5739987752856 1.8278952940772087E-015 - 1097.0854787507915 1.7392683885451386E-015 - 1119.0271883258074 1.6549386265144722E-015 - 1141.4077320923236 1.5746976576861579E-015 - 1164.2358867341702 1.4983472337852206E-015 - 1187.5206044688537 1.4256987187563767E-015 - 1211.2710165582307 1.3565726227081875E-015 - 1235.4964368893955 1.2907981584542887E-015 - 1260.2063656271835 1.2282128195560606E-015 - 1285.4104929397272 1.1686619788242204E-015 - 1311.1187027985218 1.1119985062873733E-015 - 1337.3410768544923 1.0580824056836529E-015 - 1364.0878983915820 1.0067804685773423E-015 - 1391.3696563594137 9.5796594524591536E-016 - 1419.1970494866021 9.1151823152437469E-016 - 1447.5809904763341 8.6732257083317881E-016 - 1476.5326102858608 8.2526977065357672E-016 - 1506.0632624915779 7.8525593274985158E-016 - 1536.1845277414095 7.4718219647194695E-016 - 1566.9082182962377 7.1095449450426179E-016 - 1598.2463826621624 6.7648332045715130E-016 - 1630.2113103154056 6.4368350772693467E-016 - 1662.8155365217137 6.1247401907804242E-016 - 1696.0718472521480 5.8277774642743620E-016 - 1729.9932841971911 5.5452132033663431E-016 - 1764.5931498811349 5.2763492874066280E-016 - 1799.8850128787576 5.0205214446607089E-016 - 1835.8827131363328 4.7770976111186974E-016 - 1872.6003673990595 4.5454763688790921E-016 - 1910.0523747470406 4.3250854602486947E-016 - 1948.2534222419815 4.1153803738875502E-016 - 1987.2184906868213 3.9158429995057220E-016 - 2026.9628605005578 3.7259803477881276E-016 - 2067.5021177105691 3.5453233323848039E-016 - 2108.8521600647805 3.3734256109573106E-016 - 2151.0292032660764 3.2098624824178750E-016 - 2194.0497873313980 3.0542298376367628E-016 - 2237.9307830780258 2.9061431610253903E-016 - 2282.6893987395865 2.7652365805284500E-016 - 2328.3431867143781 2.6311619636779036E-016 - 2374.9100504486655 2.5035880574754812E-016 - 2422.4082514576389 2.3821996699786391E-016 - 2470.8564164867917 2.2666968915679595E-016 - 2520.2735448165276 2.1567943539719821E-016 - 2570.6790157128580 2.0522205252188010E-016 - 2622.0925960271152 1.9527170387724605E-016 - 2674.5344479476576 1.8580380551966978E-016 - 2728.0251369066109 1.7679496547689033E-016 - 2782.5856396447430 1.6822292595436608E-016 - 2838.2373524376380 1.6006650834379794E-016 - 2895.0020994863908 1.5230556089795654E-016 - 2952.9021414761187 1.4492090894253554E-016 - 3011.9601843056412 1.3789430750202145E-016 - 3072.1993879917541 1.3120839622253456E-016 - 3133.6433757515892 1.2484665648027021E-016 - 3196.3162432666213 1.1879337056957058E-016 - 3260.2425681319537 1.1303358286979396E-016 - 3325.4474194945929 1.0755306289503797E-016 - 3391.9563678844847 1.0233827013542563E-016 - 3459.7954952421746 9.7376320603088403E-017 - 3528.9914051470182 9.2654955000193019E-017 - 3599.5712332499588 8.8162508430365891E-017 - 3671.5626579149580 8.3887881578682402E-017 - 3744.9939110732571 7.9820513289016399E-017 - 3819.8937892947224 7.5950354470998140E-017 - 3896.2916650806169 7.2267843272113236E-017 - 3974.2174983822292 6.8763881453601387E-017 - 4053.7018483498737 6.5429811911788042E-017 - 4134.7758853168716 6.2257397289311202E-017 - 4217.4714030232089 5.9238799623399575E-017 - 4301.8208310836735 5.6366560980919368E-017 - 4387.8572477053467 5.3633585032345932E-017 - 4475.6143926594541 5.1033119519135198E-017 - 4565.1266805126434 4.8558739571178410E-017 - 4656.4292141228962 4.6204331833122586E-017 - 4749.5577984053543 4.3964079360338659E-017 - 4844.5489543734611 4.1832447247220170E-017 - 4941.4399334609307 3.9804168952304836E-017 - 5040.2687321301491 3.7874233286433237E-017 - 5141.0741067727522 3.6037872031796456E-017 - 5243.8955889082072 3.4290548161283810E-017 - 5348.7735006863713 3.2627944629024471E-017 - 5455.7489707000987 3.1045953704428327E-017 - 5564.8639501141006 2.9540666823373989E-017 - 5676.1612291163829 2.8108364931469817E-017 - 5789.6844536987110 2.6745509295529269E-017 - 5905.4781427726857 2.5448732760558960E-017 - 6023.5877056281397 2.4214831430658341E-017 - 6144.0594597407026 2.3040756753277339E-017 - 6266.9406489355169 2.1923607987274849E-017 - 6392.2794619142278 2.0860625036169183E-017 - 6520.1250511525122 1.9849181628873885E-017 - 6650.5275521755630 1.8886778831070743E-017 - 6783.5381032190744 1.7971038871188938E-017 - 6919.2088652834564 1.7099699265736271E-017 - 7057.5930425891256 1.6270607229468247E-017 - 7198.7449034409083 1.5481714356584366E-017 - 7342.7198015097265 1.4731071559810726E-017 - 7489.5741975399214 1.4016824254865062E-017 - 7639.3656814907199 1.3337207778406712E-017 - 7792.1529951205348 1.2690543028150777E-017 - 7947.9960550229453 1.2075232314374697E-017 - 8106.9559761234041 1.1489755412567717E-017 - 8269.0950956458728 1.0932665807470666E-017 - 8434.4769975587897 1.0402587119226359E-017 - 8603.1665375099656 9.8982097028108118E-018 - 8775.2298682601649 9.4182874123436768E-018 - 8950.7344656253681 8.9616345222835482E-018 - 9129.7491549378756 8.5271227979014791E-018 - 9312.3441380366330 8.1136787077948332E-018 - 9498.5910207973666 7.7202807715545490E-018 - 9688.5628412133137 7.3459570360327921E-018 - 9882.3340980375797 6.9897826739756949E-018 - 10079.980779998332 6.6508776990882348E-018 - 10281.580395598299 6.3284047918859547E-018 - 10487.212003510265 6.0215672309619181E-018 - 10696.956243580471 5.7296069245577769E-018 - 10910.895368452080 5.4518025375756282E-018 - 11129.113275821122 5.1874677094031312E-018 - 11351.695541337545 4.9359493581487536E-018 - 11578.729452164296 4.6966260670974607E-018 - 11810.304041207582 4.4689065494003366E-018 - 12046.510122031734 4.2522281872049248E-018 - 12287.440324472369 4.0460556416169296E-018 - 12533.189130961817 3.8498795300590123E-018 - 12783.852913581053 3.6632151677588499E-018 - 13039.529971852675 3.4856013702571118E-018 - 13300.320571289729 3.3165993139767586E-018 - 13566.326982715524 3.1557914520385078E-018 - 13837.653522369834 3.0027804826438265E-018 - 14114.406592817231 2.8571883674766561E-018 - 14396.694724673576 2.7186553976986911E-018 - 14684.628619167048 2.5868393052305872E-018 - 14978.321191550389 2.4614144171233843E-018 - 15277.887615381396 2.3420708509308814E-018 - 15583.445367689024 2.2285137490949935E-018 - 15895.114275042804 2.1204625504525300E-018 - 16213.016560543661 2.0176502970635179E-018 - 16537.276891754536 1.9198229746484910E-018 - 16868.022429589626 1.8267388850051808E-018 - 17205.382878181419 1.7381680488540622E-018 - 17549.490535745048 1.6538916376374007E-018 - 17900.480346459950 1.5737014328679477E-018 - 18258.489953389148 1.4973993116915374E-018 - 18623.659752456930 1.4247967573925677E-018 - 18996.132947506070 1.3557143936330068E-018 - 19376.055606456193 1.2899815412741752E-018 - 19763.576718585318 1.2274357966863611E-018 - 20158.848252957025 1.1679226305044211E-018 - 20562.025218016166 1.1112950058380217E-018 - 20973.265722376491 1.0574130149932510E-018 - 21392.731036824021 1.0061435338080615E-018 - 21820.585657560503 9.5735989274752297E-019 - 22256.997370711713 9.1094156394627645E-019 - 22702.137318125948 8.6677386342497261E-019 - 23156.180064488468 8.2474766774497674E-019 - 23619.303665778236 7.8475914440128610E-019 - 24091.689739093799 7.4670949528755365E-019 - 24573.523533875676 7.1050471259940805E-019 - 25064.994004553191 6.7605534657298699E-019 - 25566.293884644256 6.4327628448484745E-019 - 26077.619762337141 6.1208654036723312E-019 - 26599.172157583886 5.8240905491915964E-019 - 27131.155600735565 5.5417050511896402E-019 - 27673.778712750278 5.2730112306793540E-019 - 28227.254287005286 5.0173452361745156E-019 - 28791.799372745390 4.7740754035374633E-019 - 29367.635360200300 4.5426006953508015E-019 - 29954.988067404305 4.3223492159573849E-019 - 30554.087828752392 4.1127767984997081E-019 - 31165.169585327440 3.9133656604677911E-019 - 31788.472977033987 3.7236231244338459E-019 - 32424.242436574666 3.5430804008131083E-019 - 33072.727285306159 3.3712914296434465E-019 - 33734.181831012284 3.2078317785221676E-019 - 34408.865467632531 3.0522975939772148E-019 - 35097.042776985181 2.9043046036819203E-019 - 35798.983632524883 2.7634871670481568E-019 - 36514.963305175384 2.6294973718521964E-019 - 37245.262571278894 2.5020041746613689E-019 - 37990.167822704476 2.3806925829377830E-019 - 38749.971179158565 2.2652628767983820E-019 - 39524.970602741734 2.1554298685085571E-019 - 40315.470014796570 2.0509221978797815E-019 - 41121.779415092504 1.9514816618304345E-019 - 41944.215003394354 1.8568625764533771E-019 - 42783.099303462244 1.7668311700141755E-019 - 43638.761289531489 1.6811650053802678E-019 - 44511.536515322121 1.5996524304540997E-019 - 45401.767245628565 1.5220920552524261E-019 - 46309.802590541134 1.4482922543398297E-019 - 47235.998642351959 1.3780706933871248E-019 - 48180.718615198995 1.3112538786849502E-019 - 49144.332987502974 1.2476767284995292E-019 - 50127.219647253034 1.1871821652115845E-019 - 51129.764040198097 1.1296207272307058E-019 - 52152.359321002063 1.0748501997263470E-019 - 53195.406507422107 1.0227352632631155E-019 - 54259.314637570547 9.7314715947224923E-020 - 55344.500930321956 9.2596337293326731E-020 - 56451.390948928398 8.8106732847983313E-020 - 57580.418767906966 8.3834810318197698E-020 - 58732.027143265106 7.9770015229307849E-020 - 59906.667686130408 7.5902304848452191E-020 - 61104.801039853017 7.2222123372375814E-020 - 62326.897060650081 6.8720378318274981E-020 - 63573.435001863087 6.5388418059349652E-020 - 64844.903701900352 6.2218010449561969E-020 - 66141.801775938366 5.9201322484789639E-020 - 67464.637811457127 5.6330900950124107E-020 - 68813.930567686271 5.3599654005498965E-020 - 70190.209179040001 5.1000833664153777E-020 - 71594.013362620797 4.8528019120642613E-020 - 73025.893629873215 4.6175100887197013E-020 - 74486.411502470684 4.3936265699249664E-020 - 75976.139732520096 4.1805982152825240E-020 - 77495.662527170498 3.9778987038313319E-020 - 79045.575777713908 3.7850272336858918E-020 - 80626.487293268190 3.6015072847242960E-020 - 82239.017039133556 3.4268854412682893E-020 - 83883.797379916228 3.2607302718465982E-020 - 85561.473327514555 3.1026312632737900E-020 - 87272.702794064855 2.9521978064111353E-020 - 89018.156849946157 2.8090582311036379E-020 - 90798.519986945088 2.6728588879088793E-020 - 92614.490386683989 2.5432632743489444E-020 - 94466.780194417675 2.4199512035266942E-020 - 96356.115798306026 2.3026180130523172E-020 - 98283.238114272142 2.1909738123256812E-020 diff --git a/tests/mare-with-rays-model2/params.plt b/tests/mare-with-rays-model2/params.plt deleted file mode 100644 index 1a83d9f7..00000000 --- a/tests/mare-with-rays-model2/params.plt +++ /dev/null @@ -1,23 +0,0 @@ -#gnuplot 5.0 script -#parameters for the particular run - -pix = 1.0 -gridsize = 1000 - -fe = 10.0 -Kd1 = 0.00312669649143281 -psi = 2.0 - -eta = 3.2 -gamma = 2.0 -Kv1 = 0.17 -neq1 = 0.0084 - -fetext = "{/Times-Roman ".(fe < 10 ? gprintf("%.1f",fe) : gprintf("%.0f",fe))."}" -psitext = "{/Times-Roman ".gprintf("%.1f",psi)."}" -etatext = "{/Times-Roman ".gprintf("%.1f",eta)."}" -Kd1text = "{/Times-Roman ".(Kd1 > 0.1 ? gprintf("%.3f",Kd1) : gprintf("%4.3t",Kd1)."{/Symbol \264}10^{".gprintf("%T",Kd1)."}" )."}" - -set output sprintf("frames/ray-fe%02.0f-narrow-equilmovie-%06d.".ftype,fe,ii) - -titletext = "Crater size-dependent degradation (Ray model 2): {/Times-Italic K_{d,1} }{/Times-Roman = }".Kd1text."; {/Times-Italic f_e }{/Times-Roman = }".fetext."; {/Symbol-Oblique y }{/Times-Roman = }".psitext." diff --git a/tests/mare-with-rays-model2/runjob b/tests/mare-with-rays-model2/runjob deleted file mode 100644 index e3bdad0c..00000000 --- a/tests/mare-with-rays-model2/runjob +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -l -#PBS -q daminton -#PBS -l walltime=170:00:00 -#PBS -l nodes=1:ppn=6,naccesspolicy=shared -#PBS -N ray-fe10-narrow -#PBS -j oe -source /etc/profile -module load intel -module load idl -cd $PBS_O_WORKDIR -export OMP_NUM_THREADS=6 -date > time.out -idl < start.in > term.out -date >> time.out diff --git a/tests/morphology_test_cases/complex/CTEM b/tests/morphology_test_cases/complex/CTEM deleted file mode 120000 index 4ab9f634..00000000 --- a/tests/morphology_test_cases/complex/CTEM +++ /dev/null @@ -1 +0,0 @@ -/Users/daminton/work/Git/CTEM/build/src/CTEM \ No newline at end of file diff --git a/tests/morphology_test_cases/simple/CTEM b/tests/morphology_test_cases/simple/CTEM deleted file mode 120000 index 4ab9f634..00000000 --- a/tests/morphology_test_cases/simple/CTEM +++ /dev/null @@ -1 +0,0 @@ -/Users/daminton/work/Git/CTEM/build/src/CTEM \ No newline at end of file diff --git a/tests/morphology_test_cases/simple/FassettCounts.txt b/tests/morphology_test_cases/simple/FassettCounts.txt deleted file mode 100755 index 44ce2d5c..00000000 --- a/tests/morphology_test_cases/simple/FassettCounts.txt +++ /dev/null @@ -1,1859 +0,0 @@ -0.262536589 -0.176770321 -0.175995859 -0.156565826 -0.130153339 -0.126776836 -0.126553629 -0.118358564 -0.116568588 -0.106986374 -0.105429213 -0.098078171 -0.092612749 -0.090501684 -0.09047876 -0.08781776 -0.085820858 -0.085754002 -0.083454996 -0.076337128 -0.075205063 -0.07340358 -0.073309078 -0.072861195 -0.068587427 -0.068080952 -0.066606033 -0.065360443 -0.065199574 -0.064515709 -0.064202063 -0.062984385 -0.061691271 -0.061284111 -0.060228058 -0.059947254 -0.055627617 -0.055591274 -0.053209719 -0.05240097 -0.051933239 -0.051539026 -0.050585707 -0.050556021 -0.048518661 -0.0469625 -0.04669845 -0.046388145 -0.04604167 -0.046022951 -0.045856228 -0.045741301 -0.045294882 -0.044407434 -0.044282604 -0.044105377 -0.043816229 -0.043681845 -0.043550516 -0.043486217 -0.042997763 -0.042848343 -0.042555172 -0.040751772 -0.039898363 -0.039055811 -0.038536098 -0.038294147 -0.037820879 -0.037679493 -0.036935659 -0.03689386 -0.035973907 -0.035657555 -0.035625893 -0.035545273 -0.035306149 -0.035302029 -0.035045565 -0.035043678 -0.034913473 -0.034847137 -0.034552809 -0.034384033 -0.033993189 -0.033745352 -0.033523645 -0.033318762 -0.033016794 -0.032899143 -0.032609478 -0.032314951 -0.032142475 -0.03200486 -0.031917757 -0.031890144 -0.031857988 -0.031460625 -0.030767677 -0.030767113 -0.030460476 -0.030331865 -0.030289734 -0.029726887 -0.029615973 -0.029550011 -0.02938451 -0.029173721 -0.029095247 -0.029082436 -0.029073275 -0.028761459 -0.028689842 -0.028631931 -0.028592638 -0.028579586 -0.028563473 -0.028557178 -0.028480917 -0.028459938 -0.028346771 -0.028335405 -0.028153231 -0.028084768 -0.028073935 -0.028040752 -0.02793849 -0.027823267 -0.027690029 -0.027462877 -0.02729034 -0.027278883 -0.026917295 -0.026840796 -0.026818367 -0.026721016 -0.026655212 -0.02663151 -0.026473448 -0.026417494 -0.026259781 -0.026256214 -0.026160954 -0.026140079 -0.026019669 -0.025973564 -0.025891783 -0.025720058 -0.025710346 -0.025668613 -0.025640926 -0.025276188 -0.025203102 -0.025177795 -0.025167692 -0.025158926 -0.025071365 -0.025056839 -0.025004429 -0.024973148 -0.024682114 -0.024676453 -0.024466703 -0.024330297 -0.024309729 -0.02425374 -0.024244202 -0.024087336 -0.023678082 -0.023496538 -0.02347315 -0.023157385 -0.022928219 -0.022852436 -0.02281638 -0.02279372 -0.022724525 -0.02266025 -0.022654459 -0.022652817 -0.022649279 -0.022620216 -0.022600542 -0.022588608 -0.022569284 -0.022550669 -0.022410641 -0.022315672 -0.022302658 -0.022299139 -0.022288818 -0.022202471 -0.022167955 -0.022162033 -0.02209297 -0.022073755 -0.021955069 -0.021751413 -0.021708652 -0.021423197 -0.021378506 -0.021259531 -0.021227345 -0.021089561 -0.020936649 -0.020861197 -0.020860371 -0.020838644 -0.020606852 -0.020473328 -0.020472935 -0.020471384 -0.020430973 -0.020380817 -0.020325941 -0.020262781 -0.020239618 -0.020236551 -0.02021805 -0.020058912 -0.020020618 -0.02001145 -0.019993168 -0.019958797 -0.019916817 -0.019894848 -0.019819748 -0.01980736 -0.019772074 -0.019747128 -0.019706919 -0.019619061 -0.019556425 -0.01953952 -0.019537689 -0.01937623 -0.019359455 -0.019353893 -0.019328989 -0.019320642 -0.019315897 -0.01931078 -0.019274996 -0.019219761 -0.019188459 -0.019170271 -0.019121384 -0.019117035 -0.019082581 -0.01900869 -0.018900898 -0.01887785 -0.018834726 -0.018802755 -0.018799969 -0.018734516 -0.018716284 -0.018657557 -0.018486683 -0.018470064 -0.01843469 -0.018428869 -0.018424885 -0.018359276 -0.018357563 -0.018275291 -0.018178654 -0.018173914 -0.018167345 -0.018141184 -0.018096386 -0.018080029 -0.018067968 -0.018058834 -0.018057837 -0.018043201 -0.018038431 -0.017957052 -0.017945669 -0.017872269 -0.017806503 -0.017760859 -0.017738289 -0.017689602 -0.017683031 -0.017664824 -0.017629597 -0.017627619 -0.017572273 -0.01746537 -0.017459494 -0.017347958 -0.017296581 -0.017276457 -0.017257166 -0.017207304 -0.017165371 -0.017153646 -0.017105444 -0.017037437 -0.017032539 -0.017010843 -0.016990288 -0.016960238 -0.016940037 -0.016935999 -0.016928764 -0.016826895 -0.016826365 -0.016784529 -0.016782661 -0.016767546 -0.016752989 -0.016724216 -0.016719021 -0.016698797 -0.016666059 -0.016629961 -0.016604898 -0.016601042 -0.016569962 -0.016551758 -0.016543955 -0.016517651 -0.016488834 -0.016479387 -0.01644212 -0.016438778 -0.016426662 -0.016424648 -0.016361364 -0.016360878 -0.016351889 -0.01633313 -0.016324522 -0.01630615 -0.016235176 -0.016225349 -0.016223791 -0.016197784 -0.016143642 -0.016067232 -0.016022793 -0.016020367 -0.016010267 -0.016004301 -0.015972395 -0.015945494 -0.015922928 -0.015917259 -0.015873688 -0.015823755 -0.015801109 -0.015800224 -0.01578319 -0.015766155 -0.015756973 -0.015749697 -0.01574148 -0.015733179 -0.015717846 -0.015688328 -0.015679689 -0.015651791 -0.015578312 -0.015568274 -0.015530949 -0.015530323 -0.015514252 -0.015489029 -0.015470831 -0.015454618 -0.015418854 -0.015399651 -0.015362696 -0.015293245 -0.015278149 -0.015268711 -0.015223194 -0.015179592 -0.015173313 -0.015159817 -0.015134972 -0.015124113 -0.015116041 -0.015099134 -0.015076462 -0.015045692 -0.015029678 -0.015027952 -0.015027258 -0.014935503 -0.01493124 -0.014926783 -0.01491824 -0.0149004 -0.014860443 -0.014859562 -0.014846706 -0.014798023 -0.014779491 -0.014776089 -0.014741917 -0.014723202 -0.014678886 -0.014669807 -0.014668699 -0.014668066 -0.014646431 -0.014642235 -0.014635643 -0.014628716 -0.014619865 -0.014581942 -0.014542461 -0.014536594 -0.014529648 -0.014468794 -0.014467144 -0.014455965 -0.014454327 -0.014449732 -0.014434872 -0.014409092 -0.014391941 -0.014377277 -0.014373404 -0.014367949 -0.014364553 -0.014335861 -0.014331312 -0.014315964 -0.01426531 -0.014250792 -0.014210838 -0.014205109 -0.014191071 -0.014177277 -0.014177231 -0.014173882 -0.014140757 -0.014134668 -0.014126049 -0.014125811 -0.014054796 -0.014049654 -0.014025244 -0.014011656 -0.014005735 -0.014000278 -0.013994108 -0.013980742 -0.013960318 -0.013959234 -0.013957403 -0.013863153 -0.013853767 -0.013846024 -0.013827398 -0.0138141 -0.013794388 -0.013780336 -0.013725868 -0.01370705 -0.013689266 -0.013676516 -0.013659449 -0.013632868 -0.013612614 -0.013608204 -0.013590315 -0.013580334 -0.013579395 -0.013574163 -0.013561247 -0.013552969 -0.013543577 -0.013521376 -0.013520414 -0.013518848 -0.013515829 -0.013506664 -0.013487404 -0.013485006 -0.013484594 -0.013480972 -0.013479225 -0.01347628 -0.013475264 -0.01346327 -0.013460785 -0.013449255 -0.013442308 -0.013407326 -0.013399773 -0.013395823 -0.013386217 -0.013368906 -0.013360865 -0.013346773 -0.013335306 -0.013333345 -0.013333048 -0.013321527 -0.013315958 -0.013315645 -0.01330739 -0.01330707 -0.013300503 -0.013275019 -0.013258389 -0.013248606 -0.013243155 -0.013229275 -0.013220968 -0.013217663 -0.013214537 -0.013209286 -0.013207514 -0.013207174 -0.013193296 -0.013181753 -0.013153952 -0.013148331 -0.013147619 -0.01313567 -0.013118118 -0.013115601 -0.01311112 -0.013109673 -0.013098419 -0.013078987 -0.013071623 -0.013053558 -0.013045286 -0.013034384 -0.013032793 -0.012990602 -0.012989401 -0.012988441 -0.012980288 -0.012979965 -0.012975786 -0.012964212 -0.012956188 -0.012955414 -0.012893169 -0.012893152 -0.0128902 -0.012886431 -0.012879498 -0.012878588 -0.012859074 -0.012858637 -0.012857098 -0.012831366 -0.012811628 -0.012811588 -0.01280357 -0.012792517 -0.012785456 -0.012731108 -0.012724525 -0.012707968 -0.012705519 -0.012686659 -0.012677549 -0.012675512 -0.012669334 -0.012662849 -0.012638254 -0.012635168 -0.012623556 -0.012621117 -0.012598213 -0.012597338 -0.012591715 -0.012580093 -0.012575912 -0.012569979 -0.01256566 -0.012554483 -0.012516331 -0.012513477 -0.012508524 -0.012498989 -0.012497349 -0.012469387 -0.012460047 -0.012458017 -0.012454325 -0.012438656 -0.012437292 -0.012430819 -0.012428659 -0.012428358 -0.012392172 -0.012384192 -0.012363575 -0.0123627 -0.012350508 -0.012346867 -0.01234458 -0.012331961 -0.012319809 -0.012309959 -0.012292959 -0.012284637 -0.012281668 -0.012281235 -0.012280586 -0.012274038 -0.012268166 -0.012258696 -0.012257057 -0.012251684 -0.012246971 -0.012233299 -0.012228237 -0.012225534 -0.01220252 -0.012199188 -0.012192537 -0.012169985 -0.012165277 -0.01216407 -0.012150248 -0.012142494 -0.012138397 -0.012134502 -0.01213015 -0.012127392 -0.012120623 -0.012117563 -0.012116022 -0.012113462 -0.012105881 -0.012105434 -0.012104166 -0.012102961 -0.01209749 -0.012092037 -0.012088411 -0.012075352 -0.012067623 -0.012067242 -0.012063 -0.012036968 -0.012029539 -0.012010164 -0.011975971 -0.01196966 -0.011960005 -0.011939915 -0.011938236 -0.011930258 -0.011906082 -0.011903753 -0.011892712 -0.011889427 -0.011856606 -0.011820641 -0.011805254 -0.011789558 -0.011789398 -0.01178734 -0.011783859 -0.011779053 -0.011778351 -0.011777405 -0.011772186 -0.011769785 -0.011769045 -0.011750731 -0.011747965 -0.011736797 -0.011734623 -0.011733103 -0.011727646 -0.01172629 -0.011725962 -0.011709002 -0.011707088 -0.011696634 -0.011681881 -0.011675974 -0.011667149 -0.011655512 -0.011647635 -0.011647419 -0.01163505 -0.011605785 -0.011605425 -0.011600323 -0.011598598 -0.011597515 -0.011596882 -0.011592381 -0.011589779 -0.011586567 -0.011561277 -0.011549034 -0.011542812 -0.011533627 -0.011532291 -0.011521511 -0.011510878 -0.011508146 -0.011506927 -0.011503363 -0.011489201 -0.011487507 -0.011483534 -0.011479553 -0.011467575 -0.011454956 -0.011446638 -0.011445547 -0.011441696 -0.011437248 -0.011431505 -0.011427803 -0.011426689 -0.011415283 -0.011396639 -0.01138549 -0.011352455 -0.011314417 -0.011306023 -0.011303225 -0.011302319 -0.011300928 -0.011289301 -0.011285217 -0.011281603 -0.011278131 -0.01127788 -0.011263325 -0.011262651 -0.011262035 -0.011246296 -0.011234552 -0.011231739 -0.011231646 -0.011219385 -0.01121571 -0.01120808 -0.011197796 -0.011194654 -0.011191275 -0.01118327 -0.011173223 -0.011152914 -0.011149899 -0.011143148 -0.011132282 -0.011125904 -0.011119093 -0.011117306 -0.011116018 -0.011109745 -0.011104404 -0.011101629 -0.011097563 -0.011075924 -0.011064947 -0.01105262 -0.01104351 -0.011031324 -0.011030983 -0.011029053 -0.011020464 -0.011018896 -0.011011696 -0.011001032 -0.010998014 -0.010984489 -0.010971436 -0.010968437 -0.010963564 -0.010949352 -0.010948906 -0.010934481 -0.010930653 -0.010904673 -0.010899469 -0.01089786 -0.010891098 -0.010890671 -0.010883684 -0.010878458 -0.010868954 -0.010840351 -0.010828503 -0.010828463 -0.010825006 -0.010823111 -0.010821735 -0.010817783 -0.010810497 -0.010802845 -0.01079652 -0.010791281 -0.010790363 -0.01078661 -0.010768972 -0.010767355 -0.010755199 -0.010752583 -0.01073773 -0.010730816 -0.010725431 -0.010719328 -0.010708258 -0.010699146 -0.010698341 -0.010698065 -0.010691956 -0.010674366 -0.010650129 -0.010644913 -0.010642487 -0.010639471 -0.010637476 -0.010636229 -0.010623184 -0.010613899 -0.010610718 -0.010591265 -0.010589745 -0.010572945 -0.010570053 -0.010569427 -0.010567434 -0.010564369 -0.010555328 -0.01055295 -0.010534523 -0.010531313 -0.010522446 -0.010521631 -0.010521332 -0.010512012 -0.010507 -0.010502451 -0.010496294 -0.010495981 -0.010483732 -0.010479671 -0.010476015 -0.010474428 -0.010467804 -0.010461031 -0.010460667 -0.010458643 -0.010456127 -0.010455097 -0.010447887 -0.010445536 -0.010445459 -0.010440294 -0.010437674 -0.010424053 -0.010416035 -0.010414288 -0.010411982 -0.010407345 -0.010399019 -0.010397694 -0.010388165 -0.010378002 -0.01037006 -0.010369282 -0.010366194 -0.010362364 -0.010360876 -0.010360525 -0.010359678 -0.010355755 -0.010355 -0.010347639 -0.010340961 -0.010337378 -0.010333439 -0.010332153 -0.010330547 -0.010319702 -0.010315458 -0.010309067 -0.010282721 -0.010280952 -0.010279924 -0.010276993 -0.01026244 -0.010249809 -0.010248869 -0.010244844 -0.010238785 -0.010236814 -0.010225241 -0.010225189 -0.010216644 -0.010205359 -0.01020236 -0.010201057 -0.010196196 -0.010189608 -0.010189569 -0.010172859 -0.010172478 -0.010165102 -0.01014731 -0.010141016 -0.010140961 -0.010140358 -0.010133509 -0.010133013 -0.010129753 -0.010118662 -0.010115639 -0.010097383 -0.010086994 -0.010082422 -0.010079693 -0.010077808 -0.010072815 -0.010069971 -0.010069366 -0.010055101 -0.01005344 -0.010052853 -0.010047998 -0.010046717 -0.010044819 -0.010043018 -0.010027805 -0.010021772 -0.010021236 -0.01001984 -0.010019176 -0.010010813 -0.00999271 -0.009992634 -0.009991449 -0.009988405 -0.009984127 -0.009974216 -0.009973822 -0.009963972 -0.009963217 -0.009959003 -0.009956129 -0.009952198 -0.009951605 -0.009948689 -0.009944738 -0.009934162 -0.009918089 -0.009917334 -0.009915791 -0.009914267 -0.009904041 -0.009895824 -0.009893026 -0.009889654 -0.009885946 -0.009877302 -0.009871275 -0.009862823 -0.009861906 -0.009858282 -0.009857748 -0.009855597 -0.009847418 -0.009838875 -0.009835417 -0.009831131 -0.009821716 -0.009816917 -0.009803411 -0.009801027 -0.009800934 -0.009796852 -0.009794268 -0.00978698 -0.00978071 -0.009769447 -0.009763535 -0.009754473 -0.009749176 -0.009735178 -0.009727205 -0.009726158 -0.009698318 -0.009689453 -0.009668062 -0.009665691 -0.009660448 -0.00965749 -0.009654848 -0.009649281 -0.009637127 -0.009626499 -0.009619808 -0.009618343 -0.009615482 -0.0096136 -0.009610949 -0.009606657 -0.009603209 -0.009598448 -0.009588451 -0.009587584 -0.009577406 -0.009574543 -0.009573772 -0.009573324 -0.009570744 -0.009566359 -0.009563923 -0.009561911 -0.009549023 -0.009546049 -0.009538694 -0.009536924 -0.009534451 -0.009518095 -0.00951535 -0.009508617 -0.009503626 -0.009499363 -0.009495277 -0.009491816 -0.009480606 -0.009474659 -0.009469687 -0.009466248 -0.009465406 -0.009452772 -0.009446671 -0.009442673 -0.009437975 -0.00943074 -0.009428259 -0.009424911 -0.00942466 -0.009418406 -0.00941394 -0.009413757 -0.009407326 -0.009403046 -0.009401253 -0.009391813 -0.009382788 -0.009379992 -0.009376503 -0.009361496 -0.009357916 -0.009354851 -0.00935318 -0.009352173 -0.00934803 -0.009345863 -0.009329193 -0.009310602 -0.009304094 -0.009301453 -0.009299442 -0.009292503 -0.009284487 -0.009283396 -0.00928088 -0.009279207 -0.009275887 -0.009271751 -0.009265942 -0.009260149 -0.009254648 -0.009254284 -0.009252703 -0.009251087 -0.009249889 -0.009248173 -0.009242489 -0.00923875 -0.009236567 -0.009235508 -0.009233568 -0.009231432 -0.009230724 -0.009227587 -0.009224741 -0.009222822 -0.009221806 -0.009216061 -0.009210773 -0.009206926 -0.009206793 -0.00919978 -0.00919894 -0.009184977 -0.009181301 -0.009174124 -0.009171574 -0.009167807 -0.009165182 -0.009157467 -0.009156483 -0.009154934 -0.009154753 -0.009153097 -0.009150114 -0.009149862 -0.009133947 -0.009125546 -0.009125187 -0.009121799 -0.009118078 -0.009116598 -0.009116219 -0.009113089 -0.009109341 -0.009106779 -0.009098486 -0.009091818 -0.009087416 -0.009081589 -0.009071327 -0.009068558 -0.009067184 -0.009057989 -0.009054289 -0.00905188 -0.009050917 -0.009045128 -0.009042654 -0.009039398 -0.00903755 -0.009036253 -0.009035683 -0.009025154 -0.009024414 -0.009016073 -0.009010956 -0.009010275 -0.009009649 -0.009008425 -0.009008026 -0.009003935 -0.009003487 -0.009001575 -0.009000021 -0.008998213 -0.008997826 -0.00899695 -0.00899629 -0.008994701 -0.008980593 -0.008979242 -0.008973251 -0.008967598 -0.008967264 -0.008962202 -0.008958742 -0.008956482 -0.008949486 -0.008948862 -0.008936363 -0.008931353 -0.008928507 -0.00892395 -0.008912882 -0.008911312 -0.008905334 -0.008904833 -0.008898914 -0.008898584 -0.008896852 -0.008896091 -0.008895342 -0.008879528 -0.008878824 -0.008875925 -0.008873835 -0.008866924 -0.008866913 -0.008853792 -0.008847788 -0.008842609 -0.00884203 -0.008841763 -0.008823824 -0.008823648 -0.008821688 -0.008815807 -0.008815762 -0.008815523 -0.008813768 -0.008812487 -0.008809599 -0.00880356 -0.008800686 -0.008790859 -0.008787264 -0.008787136 -0.00878548 -0.008778179 -0.008773167 -0.008769232 -0.008766172 -0.008758953 -0.008753864 -0.008745367 -0.008728994 -0.008727705 -0.008722036 -0.008714931 -0.008713942 -0.008706615 -0.008706228 -0.008702322 -0.00869656 -0.008695816 -0.008694998 -0.008687172 -0.008683538 -0.008681408 -0.008680571 -0.008677876 -0.008668587 -0.008665112 -0.008660421 -0.00865873 -0.008652853 -0.008649252 -0.008645973 -0.008637754 -0.008627981 -0.008618307 -0.008618225 -0.008611267 -0.008608376 -0.008605997 -0.008605856 -0.008604956 -0.008601501 -0.008593412 -0.008593252 -0.008590149 -0.008581535 -0.008579865 -0.008579063 -0.008576729 -0.00857555 -0.008567648 -0.008565775 -0.00856448 -0.008560547 -0.008560545 -0.008559984 -0.008559341 -0.008557108 -0.00855102 -0.008548868 -0.00854011 -0.008531914 -0.008531733 -0.008530304 -0.008523857 -0.008521852 -0.0085205 -0.008506149 -0.008496536 -0.008492718 -0.008491959 -0.008491611 -0.008483423 -0.008482132 -0.008480064 -0.0084772 -0.00847496 -0.008471758 -0.00846702 -0.008464207 -0.00845647 -0.008449924 -0.008448872 -0.008446491 -0.008446367 -0.008444078 -0.00843767 -0.008437092 -0.008437023 -0.008436787 -0.008430056 -0.008423786 -0.008409794 -0.008409582 -0.00840749 -0.008404102 -0.008402639 -0.008402025 -0.008398212 -0.008398067 -0.008397497 -0.008390812 -0.008388365 -0.008387287 -0.008386095 -0.008385265 -0.008384295 -0.008382305 -0.008377583 -0.008375067 -0.008370543 -0.008363409 -0.008362431 -0.008350986 -0.008350721 -0.008347136 -0.008346004 -0.008345411 -0.008340242 -0.008339193 -0.008337996 -0.008335783 -0.008332388 -0.008331875 -0.008329184 -0.008329 -0.008325085 -0.008317554 -0.008315899 -0.00831558 -0.008312111 -0.008311546 -0.008308163 -0.008303694 -0.008302061 -0.008295502 -0.008276363 -0.0082719 -0.008268257 -0.008266729 -0.008265278 -0.008252605 -0.008252218 -0.008250618 -0.00824852 -0.008243444 -0.008241011 -0.008235146 -0.008234823 -0.008232748 -0.008228065 -0.00822789 -0.008227877 -0.008222773 -0.008221802 -0.008220362 -0.008214621 -0.0082124 -0.00821044 -0.008207237 -0.008198914 -0.008193914 -0.008192726 -0.008192453 -0.008189316 -0.008188591 -0.008180777 -0.008174021 -0.008166906 -0.008166307 -0.008163851 -0.008158514 -0.008132813 -0.008130104 -0.008126024 -0.008125488 -0.008124292 -0.008123589 -0.008123493 -0.008123234 -0.008116533 -0.008115725 -0.00811104 -0.008109131 -0.008099726 -0.008099237 -0.008098579 -0.00808876 -0.00808765 -0.008086834 -0.008085915 -0.00808304 -0.008081331 -0.008078959 -0.008076214 -0.008073627 -0.008070107 -0.008067293 -0.008065502 -0.008063486 -0.008058489 -0.008050545 -0.008043613 -0.008037531 -0.008033579 -0.00802656 -0.008025509 -0.008023716 -0.008019367 -0.008016018 -0.007995533 -0.007995502 -0.007994684 -0.007993433 -0.007991413 -0.007990221 -0.007981342 -0.007980297 -0.007976282 -0.00797542 -0.007963688 -0.007961447 -0.007960775 -0.007959494 -0.007949574 -0.007947363 -0.007943882 -0.00794335 -0.007938526 -0.007938213 -0.007937023 -0.007933744 -0.007928679 -0.0079184 -0.007917301 -0.007916977 -0.007916502 -0.007914402 -0.007911205 -0.007907639 -0.007898962 -0.007897505 -0.007890778 -0.007888922 -0.00788455 -0.007882633 -0.007878956 -0.007873016 -0.007866476 -0.007862608 -0.007861006 -0.007856619 -0.007848036 -0.007846813 -0.007837957 -0.007830175 -0.007830101 -0.007813538 -0.007806742 -0.007800179 -0.00779528 -0.007793753 -0.007782089 -0.007777205 -0.007774603 -0.007773149 -0.00777243 -0.007764381 -0.007753885 -0.007737322 -0.007736816 -0.007732416 -0.007730043 -0.007727249 -0.007725708 -0.007722313 -0.007709854 -0.007709442 -0.007707956 -0.007707741 -0.007705021 -0.007697092 -0.007690178 -0.007686562 -0.007686396 -0.007686283 -0.007685259 -0.007682032 -0.007679382 -0.007677752 -0.00767338 -0.007671814 -0.007669827 -0.007667139 -0.00766713 -0.00766556 -0.007663883 -0.007647295 -0.007645601 -0.007644512 -0.007641895 -0.007634661 -0.007633572 -0.007626781 -0.007620035 -0.007608179 -0.007603334 -0.007596003 -0.007594143 -0.00759277 -0.007587484 -0.00753887 -0.007538639 -0.007538141 -0.007532749 -0.007531567 -0.007530338 -0.007527729 -0.007527119 -0.007521132 -0.007515654 -0.007515554 -0.007508749 -0.007503225 -0.00749881 -0.007496796 -0.007492863 -0.007489515 -0.007487968 -0.007486027 -0.007480305 -0.007476843 -0.007475327 -0.007472973 -0.007472609 -0.007466551 -0.007458138 -0.007457579 -0.007454803 -0.007443495 -0.007440092 -0.007436852 -0.007423079 -0.007420023 -0.007415533 -0.007405418 -0.007404099 -0.007399483 -0.0073958 -0.007394213 -0.0073892 -0.007384178 -0.007381269 -0.007375069 -0.007370123 -0.007362854 -0.007362654 -0.007362572 -0.007360636 -0.007350525 -0.007348639 -0.007348511 -0.007345818 -0.007340227 -0.007333773 -0.007331263 -0.007330294 -0.0073283 -0.007322588 -0.007308031 -0.007306694 -0.007304211 -0.007295887 -0.007293764 -0.007292185 -0.007277504 -0.007276218 -0.007269623 -0.007268534 -0.007266216 -0.007261278 -0.007260929 -0.007249109 -0.00724872 -0.00723798 -0.007232494 -0.007231319 -0.007229631 -0.00722677 -0.007221827 -0.007221193 -0.00721487 -0.007211618 -0.007207369 -0.007204393 -0.007201649 -0.00720067 -0.00719776 -0.007197191 -0.007195637 -0.007190441 -0.007190075 -0.007189671 -0.007182873 -0.007180506 -0.007178869 -0.007171055 -0.007170536 -0.007169872 -0.007160252 -0.007159506 -0.007139025 -0.007138716 -0.007133526 -0.007132404 -0.007130962 -0.00712409 -0.007110884 -0.007107983 -0.007106459 -0.007106091 -0.007097916 -0.007090223 -0.007084623 -0.007083195 -0.007068876 -0.007065039 -0.007057159 -0.007055059 -0.00705242 -0.007050728 -0.007050497 -0.00704656 -0.007045835 -0.007043203 -0.007041342 -0.007037169 -0.007037048 -0.007037033 -0.007035322 -0.007035032 -0.007034454 -0.007027992 -0.007010723 -0.007010368 -0.007010002 -0.007004395 -0.007001211 -0.006998716 -0.00699678 -0.00698596 -0.0069813 -0.006970192 -0.006968014 -0.006967873 -0.006956198 -0.006955866 -0.006955643 -0.0069527 -0.006944527 -0.006943811 -0.006936493 -0.006932322 -0.006919962 -0.006917557 -0.006915163 -0.006913467 -0.006912697 -0.006910807 -0.006900354 -0.00689155 -0.006886789 -0.006880814 -0.006871332 -0.006867739 -0.00686223 -0.00686108 -0.00685799 -0.006856377 -0.006854639 -0.006851885 -0.006850521 -0.006846849 -0.00684086 -0.006840626 -0.006832794 -0.006831898 -0.006831432 -0.006830631 -0.006830364 -0.006822613 -0.006813906 -0.006807535 -0.006806032 -0.006804279 -0.006804209 -0.006803143 -0.006797207 -0.006792576 -0.00678742 -0.006786198 -0.006776249 -0.006767094 -0.006765043 -0.006759504 -0.006758421 -0.006748098 -0.006743984 -0.006743649 -0.006740118 -0.006735943 -0.006732008 -0.006731319 -0.006726734 -0.006720741 -0.00671867 -0.006716177 -0.006706623 -0.006698238 -0.006694654 -0.006692337 -0.006690315 -0.006687939 -0.006686069 -0.00668399 -0.006671804 -0.006667908 -0.006664333 -0.006659399 -0.006647436 -0.006647329 -0.006639271 -0.006638327 -0.006633261 -0.006633078 -0.006611351 -0.006607069 -0.006606344 -0.006600904 -0.006597185 -0.006595774 -0.006593163 -0.006589317 -0.006586607 -0.006580635 -0.006576479 -0.006574949 -0.006566893 -0.006566399 -0.006554573 -0.006530695 -0.006525759 -0.006521776 -0.006517738 -0.006501879 -0.006500742 -0.006499847 -0.006492546 -0.006478745 -0.006469521 -0.006459919 -0.006446957 -0.006436213 -0.006430162 -0.006429461 -0.006420221 -0.006410669 -0.006406378 -0.006403811 -0.006396671 -0.006391806 -0.006382936 -0.006363773 -0.006350231 -0.006341734 -0.006335096 -0.006329418 -0.006325489 -0.00632304 -0.006291357 -0.006279036 -0.00625112 -0.006240334 -0.006233267 -0.006232565 -0.006211235 -0.006205635 -0.006204079 -0.006202707 -0.00619545 -0.006194229 -0.006185663 -0.006182297 -0.006178352 -0.006153929 -0.006151711 -0.006140169 -0.006138277 -0.006132753 -0.006055676 -0.006026957 -0.006006159 -0.005980967 -0.005950672 -0.005929432 -0.005926622 -0.005907154 -0.005893517 -0.005889854 -0.005885946 -0.005880421 -0.005874573 -0.005866598 -0.005859877 -0.005851454 -0.005845602 -0.005840521 -0.005823341 -0.005810097 -0.005768602 -0.005765007 -0.005762871 -0.005753492 -0.005752243 -0.005749565 -0.005721613 -0.005683754 -0.005637468 -0.005622242 -0.005615107 -0.005605305 -0.005576214 -0.005545177 -0.005544794 -0.005515455 -0.005495152 -0.005432837 -0.005423744 -0.00542115 -0.005391729 -0.005372042 -0.005344336 -0.00532242 -0.005316675 -0.005290703 -0.005276886 -0.005098354 -0.005076155 -0.004904335 -0.0048818 -0.004871721 -0.004807217 -0.004717197 -0.004528528 -0.004348799 diff --git a/tests/morphology_test_cases/simple/ctem_driver.pro b/tests/morphology_test_cases/simple/ctem_driver.pro deleted file mode 100755 index 071af0f7..00000000 --- a/tests/morphology_test_cases/simple/ctem_driver.pro +++ /dev/null @@ -1,233 +0,0 @@ -pro ctem_driver - -;------------------------------------------------------------------------- -; Jim Richardson, Arecibo Observatory -; David Minton, Purdue University Dept. of Earth, Atmospheric, & Planetary Sciences -; July 2014 -; Cratered Terrain Evolution Model display module -; -; Inputs are read in from the ctem.in file -; -;------------------------------------------------------------------------- -;------------- Initial Setup ---------------- -;------------------------------------------------------------------------- -Compile_Opt DEFINT32 -!EXCEPT=2 - -; ----------- input file ----------------------- -infilename = 'ctem.in' -DATFILE='ctem.dat' - -; ---------- reading input files ---------- -seedarr = lon64arr(100) -seedn = 1 -totalimpacts = long64(0) -ncount = long64(0) -curyear = 0.d0 -restart = "F" -fracdone = 1.0d0 -masstot = 0.d0 - -ctem_io_read_input,infilename,interval,numintervals,gridsize,pix,seed,numlayers,sfdfile,impfile,maxcrat,ph1,shadedmaxhdefault,shadedminhdefault,shadedminh,shadedmaxh,restart,runtype,popupconsole,saveshaded,saverego,savepres,savetruelist - -seedarr(0) = seed -area = (gridsize * pix)^2 - -;read input data -pnum = file_lines(impfile) -production = dblarr(2,pnum) -productionfunction = dblarr(2,pnum) -openr,LUN,impfile,/GET_LUN -readf,LUN,productionfunction -free_lun,LUN - -;create impactor production population -production(0,*) = productionfunction(0,*) -production(1,*) = productionfunction(1,*)*area*interval - -;write out corrected production population -openw,1,sfdfile -printf,1,production -close,1 -free_lun,1 - -;set up cratering surface grid and display-only grid -surface_dem = dblarr(gridsize,gridsize) -regolith = dblarr(gridsize,gridsize) - -;set up temporary distribution bins -distl = 1 -pdistl = 1 -odist = dblarr(6,distl) -tdist = dblarr(6,distl) -pdist = dblarr(6,pdistl) -pdisttotal = dblarr(6,pdistl) - -datformat = "(I17,1X,I12,1X,E19.12,1X,A1,1X,F9.6,1X,E19.12)" - - -if strmatch(restart,'F',/fold_case) then begin ; Start with a clean slate - print, 'Starting a new run' - curyear = 0.0d0 - totalimpacts = 0 - masstot = 0.d0 - fracdone = 1.0d0 - - if strmatch(runtype,'statistical',/fold_case) then begin - ncount = 1 - openw,LUN,DATFILE,/GET_LUN - printf,LUN,totalimpacts,ncount,curyear,restart,fracdone,masstot,format=datformat - for n=0,seedn-1 do begin - printf,LUN,seedarr(n),format='(I12)' - endfor - free_lun,LUN - endif else begin - ncount = 0 - endelse - - surface_dem(*,*) = 0.0d0 - regolith(*,*) = 0.0d0 - - file_delete, 'tdistribution.dat',/allow_nonexistent - -endif else begin ; continue an old run - print, 'Continuing a previous run' - - ctem_io_read_old,gridsize,surface_dem,regolith,odist,tdist,pdist,mass - - ;read in constants file - openr,LUN,DATFILE,/GET_LUN - readf,LUN,totalimpacts,ncount,curyear,restart,fracdone,masstot,format=datformat - seedn = 0 - while ~ eof(LUN) do begin - readf,LUN,iseed - seedarr(seedn) = long64(iseed) - seedn=seedn+1 - endwhile - -endelse - -openw,FRACDONEFILE,'fracdone.dat',/GET_LUN -openw,REGODEPTHFILE,'regolithdepth.dat',/GET_LUN - -;------------------------------------------------------------------------- -; ---------- begin loops ---------- -;------------------------------------------------------------------------- -print, 'Beginning loops' - -;define number of loop iterations and begin -;numintervals=ceil(endyear/interval)-ncount -while (ncount le numintervals) do begin - - - ; ---------- creating crater population ---------- - if (ncount gt 0) then begin - - fnum = string(ncount,format='(I6.6)') - if (file_test('misc',/DIRECTORY) eq 0) then begin - file_mkdir,'misc' - endif - ; save a copy of the ctem.dat file - fname = 'misc/ctem_' + fnum + '.dat' - file_copy, 'ctem.dat', fname, /OVERWRITE - - print, ncount, ' Calling FORTRAN routine' - ;call fortran program to create & count craters - spawn, './CTEM',/noshell - - ; ---------- reading FORTRAN output ---------- - print, ncount, ' Reading FORTRAN output' - ctem_io_read_old,gridsize,surface_dem,regolith,odist,tdist,pdist,mass - - ;read in constants file - openr,LUN,DATFILE,/GET_LUN - readf,LUN,totalimpacts,ncount,curyear,restart,fracdone,masstot,format=datformat - seedn = 0 - while ~ eof(LUN) do begin - readf,LUN,iseed - seedarr(seedn) = long64(iseed) - seedn = seedn + 1 - endwhile - free_lun,LUN - - curyear = curyear + fracdone * interval - masstot = masstot + mass - printf,FRACDONEFILE,fracdone,curyear - flush,FRACDONEFILE - - printf,REGODEPTHFILE,curyear,mean(regolith),max(regolith),min(regolith) - flush,REGODEPTHFILE - - ;save a copy of the binned observed crater distribution - if (file_test('dist',/DIRECTORY) eq 0) then begin - file_mkdir,'dist' - endif - fname = 'dist/odist_' + fnum + '.dat' - file_copy, 'odistribution.dat', fname, /OVERWRITE - - ; save a copy of the cumulative observed crater distribution - fname = 'dist/ocum_' + fnum + '.dat' - file_copy, 'ocumulative.dat', fname, /OVERWRITE - - ;save a copy of the binned true distribution - fname = 'dist/tdist_' + fnum + '.dat' - file_copy, 'tdistribution.dat', fname, /OVERWRITE - - ;save a copy of the binned idealized production function - fname = 'dist/pdist_' + fnum + '.dat' - file_copy, 'pdistribution.dat', fname, /OVERWRITE - - ; save a copy of the cumulative true crater distribution if the user requests it - if strmatch(savetruelist,'T',/fold_case) then begin - fname = 'dist/tcum_' + fnum + '.dat' - file_copy, 'tcumulative.dat', fname, /OVERWRITE - endif - - ; save a copy of the impacted mass - fname = 'misc/mass_' + fnum + '.dat' - file_copy, 'impactmass.dat', fname, /OVERWRITE - - - endif - - ; Get the accumulated production function - pdisttotal = pdist - pdisttotal(3:5,*) = pdist(3:5,*) * curyear / interval - - ; ---------- displaying results ---------- - print, ncount, ' Displaying results' - - ctem_image_dem,ncount,gridsize,pix,surface_dem,surface_dem_image - if strmatch(saverego,'T',/fold_case) then ctem_image_regolith,ncount,gridsize,pix,regolith,regolith_image - if strmatch(saveshaded,'T',/fold_case) then begin - if (shadedminhdefault eq 1) then shadedminh = min(surface_dem) - if (shadedmaxhdefault eq 1) then shadedmaxh = max(surface_dem) - ctem_image_shaded_relief,ncount,gridsize,pix,surface_dem,surface_dem,shadedminh,shadedmaxh,'shaded',shaded_image - endif - if strmatch(savepres,'T',/fold_case) then ctem_image_presentation,ncount,gridsize,pix,curyear,odist,pdisttotal,tdist,ph1,surface_dem_image - ctem_window_display,ncount,totalimpacts,gridsize,pix,curyear,masstot,odist,pdisttotal,tdist,ph1,surface_dem,regolith,surface_dem_image,popupconsole - - ncount = ncount + 1 - - ;write out the current data file - if (strmatch(runtype,'statistical',/fold_case)) || (ncount eq 1) then begin - restart = 'F' - curyear = 0.0d0 - totalimpacts = 0 - masstot = 0.d0 - file_delete, 'tdistribution.dat',/allow_nonexistent - endif else begin - restart = 'T' - endelse - - openw,LUN,DATFILE,/GET_LUN - printf,LUN,totalimpacts,ncount,curyear,restart,fracdone,masstot,format=datformat - for n=0,seedn-1 do begin - printf,LUN,seedarr(n),format='(I12)' - endfor - free_lun,LUN -endwhile -free_lun,FRACDONEFILE -free_lun,REGODEPTHFILE - -end diff --git a/tests/morphology_test_cases/simple/ctem_io_read_input.pro b/tests/morphology_test_cases/simple/ctem_io_read_input.pro deleted file mode 100755 index ea135668..00000000 --- a/tests/morphology_test_cases/simple/ctem_io_read_input.pro +++ /dev/null @@ -1,131 +0,0 @@ -pro ctem_io_read_input,infilename,interval,numintervals,gridsize,pix,seed,numlayers,sfdfile,impfile,maxcrat,ph1,shadedmaxhdefault,shadedminhdefault,shadedminh,shadedmaxh,restart,runtype,popupconsole,saveshaded,saverego,savepres,savetruelist -Compile_Opt DEFINT32 -print, 'Reading input file' -openr,infile,infilename, /GET_LUN -line="" -comment="!" -interval = 0.d0 -numintervals = 0 -pix=-1.0d0 -gridsize=-1 -seed = 0 -maxcrat = 1.0d0 -shadedmaxhdefault = 1 -shadedminhdefault = 1 -shadedminh = 0.d0 -shademaxnh = 0.d0 - - -; Set required strings to unset value -notset="-----NOTSET----" -sfdfile = notset -impfile = notset -sfdcompare = notset -restart = notset -runtype = notset -popupconsole = notset -saveshaded = notset -saverego = notset -savepres = notset -savetruelist = notset -while (not EOF(infile)) do begin - readf,infile,line - if (~strcmp(line,comment,1)) then begin - substrings = strsplit(line,' ',/extract) - if strmatch(substrings(0),'pix',/fold_case) then reads,substrings(1),pix - if strmatch(substrings(0),'gridsize',/fold_case) then reads,substrings(1),gridsize - if strmatch(substrings(0),'seed',/fold_case) then reads,substrings(1),seed - if strmatch(substrings(0),'sfdfile',/fold_case) then reads,substrings(1),sfdfile - if strmatch(substrings(0),'impfile',/fold_case) then reads,substrings(1),impfile - if strmatch(substrings(0),'maxcrat',/fold_case) then reads,substrings(1),maxcrat - if strmatch(substrings(0),'sfdcompare',/fold_case) then reads,substrings(1),sfdcompare - if strmatch(substrings(0),'interval',/fold_case) then reads,substrings(1),interval - if strmatch(substrings(0),'numintervals',/fold_case) then reads,substrings(1),numintervals - if strmatch(substrings(0),'popupconsole',/fold_case) then reads,substrings(1),popupconsole - if strmatch(substrings(0),'saveshaded',/fold_case) then reads,substrings(1),saveshaded - if strmatch(substrings(0),'saverego',/fold_case) then reads,substrings(1),saverego - if strmatch(substrings(0),'savepres',/fold_case) then reads,substrings(1),savepres - if strmatch(substrings(0),'savetruelist',/fold_case) then reads,substrings(1),savetruelist - if strmatch(substrings(0),'runtype',/fold_case) then reads,substrings(1),runtype - if strmatch(substrings(0),'restart',/fold_case) then reads,substrings(1),restart - if strmatch(substrings(0),'shadedminh',/fold_case) then begin - reads,substrings(1),shadedminh - shadedminhdefault = 0 - endif - if strmatch(substrings(0),'shadedmaxh',/fold_case) then begin - reads,substrings(1),shadedmaxh - shadedmaxhdefault = 0 - endif - end -end -if interval le 0.0d0 then begin - print,'Invalid value for or missing variable INTERVAL in ' + infilename - stop -end -if numintervals le 0 then begin - print,'Invalid value for or missing variable NUMINTERVALS in ' + infilename - stop -end -if pix le 0.0d0 then begin - print,'Invalid value for or missing variable PIX in ' + infilename - stop -end -if gridsize le 0 then begin - print,'Invalid value for or missing variable GRIDSIZE in ' + infilename - stop -end -if seed eq 0 then begin - print,'Invalid value for or missing variable SEED in ' + infilename - stop -end -if strmatch(sfdfile,notset) then begin - print,'Invalid value for or missing variable SFDFILE in ' + infilename - stop -end -if strmatch(impfile,notset) then begin - print,'Invalid value for or missing variable IMPFILE in ' + infilename - stop -end -if strmatch(popupconsole,notset) then begin - print,'Invalid value for or missing variable POPUPCONSOLE in ' + infilename - stop -end -if strmatch(saveshaded,notset) then begin - print,'Invalid value for or missing variable SAVESHADED in ' + infilename - stop -end -if strmatch(saverego,notset) then begin - print,'Invalid value for or missing variable SAVEREGO in ' + infilename - stop -end -if strmatch(savepres,notset) then begin - print,'Invalid value for or missing variable SAVEPRES in ' + infilename - stop -end -if strmatch(savetruelist,notset) then begin - print,'Invalid value for or missing variable SAVETRUELIST in ' + infilename - stop -end -if strmatch(runtype,notset) then begin - print,'Invalid value for or missing variable RUNTYPE in ' + infilename - stop -end -if strmatch(restart,notset) then begin - print,'Invalid value for or missing variable RESTART in ' + infilename - stop -end - -free_lun,infile - -ph1 = dblarr(3,1) -if ~strmatch(sfdcompare,notset) then begin - cnum = file_lines(sfdcompare) - ph1 = dblarr(3,cnum) - openr,COMP,sfdcompare,/GET_LUN - readf,COMP,ph1 - close,COMP - free_lun,COMP -end -free_lun,infile - -end diff --git a/tests/morphology_test_cases/simple/ctem_io_readers.py b/tests/morphology_test_cases/simple/ctem_io_readers.py deleted file mode 100644 index a58ba9ab..00000000 --- a/tests/morphology_test_cases/simple/ctem_io_readers.py +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/local/bin/python -# -#Cratered Terrain Evolution Model file reading utilities -# -#Original IDL design: Jim Richardson, Arecibo Observatory -#Revised IDL design: David Minton, Purdue University -#Re-engineered design and Python implementation: Matthew Route, Purdue University -#August 2016 -# -#Known issues for operation with CTEM -#1) ctem.in has 1.0d0 value for maxcrat which is not readable by Python - -import numpy - -def read_ctemin(parameters,notset): - #Read and parse ctem.in file - inputfile = parameters['workingdir'] + parameters['ctemfile'] - - #Read ctem.in file - print('Reading input file '+ parameters['ctemfile']) - fp = open(inputfile,'r') - lines = fp.readlines() - fp.close() - - #Process file text - for line in lines: - fields = line.split() - if len(fields) > 0: - if ('pix' == fields[0].lower()): parameters['pix']=float(fields[1]) - if ('gridsize' == fields[0].lower()): parameters['gridsize']=int(fields[1]) - if ('seed' == fields[0].lower()): parameters['seed']=int(fields[1]) - if ('sfdfile' == fields[0].lower()): parameters['sfdfile']=fields[1] - if ('impfile' == fields[0].lower()): parameters['impfile']=fields[1] - if ('maxcrat' == fields[0].lower()): parameters['maxcrat']=float(fields[1]) - if ('sfdcompare' == fields[0].lower()): parameters['sfdcompare']=fields[1] - if ('interval' == fields[0].lower()): parameters['interval']=float(fields[1]) - if ('numintervals' == fields[0].lower()): parameters['numintervals']=int(fields[1]) - if ('popupconsole' == fields[0].lower()): parameters['popupconsole']=fields[1] - if ('saveshaded' == fields[0].lower()): parameters['saveshaded']=fields[1] - if ('saverego' == fields[0].lower()): parameters['saverego']=fields[1] - if ('savepres' == fields[0].lower()): parameters['savepres']=fields[1] - if ('savetruelist' == fields[0].lower()): parameters['savetruelist']=fields[1] - if ('runtype' == fields[0].lower()): parameters['runtype']=fields[1] - if ('restart' == fields[0].lower()): parameters['restart']=fields[1] - if ('shadedminh' == fields[0].lower()): - parameters['shadedminh'] = float(fields[1]) - parameters['shadedminhdefault'] = 0 - if ('shadedmaxh' == fields[0].lower()): - parameters['shadedmaxh'] = float(fields[1]) - parameters['shadedmaxhdefault'] = 0 - - #Test values for further processing - if (parameters['interval'] <= 0.0): - print('Invalid value for or missing variable INTERVAL in '+ inputfile) - if (parameters['numintervals'] <= 0): - print('Invalid value for or missing variable NUMINTERVALS in '+ inputfile) - if (parameters['pix'] <= 0.0): - print('Invalid value for or missing variable PIX in '+ inputfile) - if (parameters['gridsize'] <= 0): - print('Invalid value for or missing variable GRIDSIZE in '+ inputfile) - if (parameters['seed'] == 0): - print('Invalid value for or missing variable SEED in '+ inputfile) - if (parameters['sfdfile'] == notset): - print('Invalid value for or missing variable SFDFILE in '+ inputfile) - if (parameters['impfile'] == notset): - print('Invalid value for or missing variable IMPFILE in '+ inputfile) - if (parameters['popupconsole'] == notset): - print('Invalid value for or missing variable POPUPCONSOLE in '+ inputfile) - if (parameters['saveshaded'] == notset): - print('Invalid value for or missing variable SAVESHADED in '+ inputfile) - if (parameters['saverego'] == notset): - print('Invalid value for or missing variable SAVEREGO in '+ inputfile) - if (parameters['savepres'] == notset): - print('Invalid value for or missing variable SAVEPRES in '+ inputfile) - if (parameters['savetruelist'] == notset): - print('Invalid value for or missing variable SAVETRUELIST in '+ inputfile) - if (parameters['runtype'] == notset): - print('Invalid value for or missing variable RUNTYPE in '+ inputfile) - if (parameters['restart'] == notset): - print('Invalid value for or missing variable RESTART in '+ inputfile) - - return - -def read_formatted_ascii(filename, skip_lines): - #Generalized ascii text reader - #For use with sfdcompare, production, odist, tdist, pdist data files - data = numpy.genfromtxt(filename, skip_header = skip_lines) - return data - -def read_unformatted_binary(filename, gridsize): - #Read unformatted binary files created by Fortran - #For use with surface ejecta and surface dem data files - dt = numpy.float - data = numpy.fromfile(filename, dtype = dt) - data.shape = (gridsize,gridsize) - - return data - -def read_ctemdat(parameters, seedarr): - #Read and parse ctem.dat file - datfile = parameters['workingdir'] + 'ctem.dat' - - #Read ctem.dat file - print('Reading input file '+ parameters['datfile']) - fp = open(datfile,'r') - lines = fp.readlines() - fp.close() - - #Parse file lines and update parameter fields - fields = lines[0].split() - if len(fields) > 0: - parameters['totalimpacts'] = float(fields[0]) - parameters['ncount'] = int(fields[1]) - parameters['curyear'] = float(fields[2]) - parameters['restart'] = fields[3] - parameters['fracdone'] = float(fields[4]) - parameters['masstot'] = float(fields[5]) - - #Parse remainder of file to build seed array - nlines = len(lines) - index = 1 - while (index < nlines): - fields = lines[index].split() - seedarr[index - 1] = float(fields[0]) - index += 1 - - parameters['seedn'] = index - 1 - - return - -def read_impact_mass(filename): - #Read impact mass file - - fp=open(filename,'r') - line=fp.readlines() - fp.close() - - fields = line[0].split() - if (len(fields) > 0): - mass = float(fields[0]) - else: - mass = 0 - - return mass \ No newline at end of file diff --git a/tests/morphology_test_cases/simple/ctem_io_writers.py b/tests/morphology_test_cases/simple/ctem_io_writers.py deleted file mode 100644 index 5d591d9a..00000000 --- a/tests/morphology_test_cases/simple/ctem_io_writers.py +++ /dev/null @@ -1,274 +0,0 @@ -#!/usr/local/bin/python -# -#Cratered Terrain Evolution Model file and graphical writing utilities -# -#Original IDL design: Jim Richardson, Arecibo Observatory -#Revised IDL design: David Minton, Purdue University -#Re-engineered design and Python implementation: Matthew Route, Purdue University -#August 2016 -# - -import matplotlib -from matplotlib import pyplot -import numpy -import os -import shutil -import scipy -from scipy import signal - -#Set pixel scaling common for image writing, at 1 pixel/ array element -dpi = 72.0 - -#Write production function to file production.dat -#This file format does not exactly match that generated from IDL. Does it work? -def write_production(parameters, production): - filename = parameters['workingdir'] + parameters['sfdfile'] - numpy.savetxt(filename, production, fmt='%1.8e', delimiter=' ') - - return - -def create_dir_structure(parameters): - #Create directories for various output files if they do not already exist - directories=['dist','misc','rego','rplot','surf','shaded'] - - for directory in directories: - dir_test = parameters['workingdir'] + directory - if not os.path.isdir(dir_test): - os.makedirs(dir_test) - - return - -def write_ctemdat(parameters, seedarr): - #Write various parameters and random number seeds into ctem.dat file - filename = parameters['workingdir'] + parameters['datfile'] - fp = open(filename,'w') - - template = "%(totalimpacts)17d %(ncount)12d %(curyear)19.12E %(restart)s %(fracdone)9.6f %(masstot)19.12E\n" - fp.write(template % parameters) - - #Write random number seeds to the file - for index in range(parameters['seedn']): - fp.write("%12d\n" % seedarr[index]) - - fp.close() - - return - -def copy_dists(parameters): - #Save copies of distribution files - - orig_list = ['odistribution', 'ocumulative', 'pdistribution', 'tdistribution'] - dest_list = ['odist', 'ocum', 'pdist', 'tdist'] - - for index in range(len(orig_list)): - forig = parameters['workingdir'] + orig_list[index] + '.dat' - fdest = parameters['workingdir'] + 'dist' + os.sep + dest_list[index] + "_%06d.dat" % parameters['ncount'] - shutil.copy2(forig, fdest) - - forig = parameters['workingdir'] + 'impactmass.dat' - fdest = parameters['workingdir'] + 'misc' + os.sep + "mass_%06d.dat" % parameters['ncount'] - shutil.copy2(forig, fdest) - - if (parameters['savetruelist'].upper() == 'T'): - forig = parameters['workingdir'] + 'tcumulative.dat' - fdest = parameters['workingdir'] + 'dist' + os.sep + "tcum_%06d.dat" % parameters['ncount'] - shutil.copy2(forig, fdest) - - return - -#Possible references -#http://nbviewer.jupyter.org/github/ThomasLecocq/geophysique.be/blob/master/2014-02-25%20Shaded%20Relief%20Map%20in%20Python.ipynb - -def image_dem(parameters, surface_dem): - - #Create surface dem map - solar_angle = 20.0 - dem_map = numpy.copy(surface_dem) - numpy.roll(surface_dem, 1, 0) - dem_map = (0.5 * numpy.pi) + numpy.arctan2(dem_map, parameters['pix']) - dem_map = dem_map - numpy.radians(solar_angle) * (0.5 * numpy.pi) - numpy.place(dem_map, dem_map > (0.5 * numpy.pi), 0.5 *numpy.pi) - dem_map = numpy.absolute(dem_map) - dem_map = 254.0 * numpy.cos(dem_map) - - #Save image to file - filename = parameters['workingdir'] + 'surf' + os.sep + "surf%06d.png" % parameters['ncount'] - height = parameters['gridsize'] / dpi - width = height - fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi) - fig.figimage(dem_map, cmap = matplotlib.cm.gray, origin = 'lower') - matplotlib.pyplot.savefig(filename) - - return - -def image_regolith(parameters, regolith): - - #Create scaled regolith image - minref = parameters['pix'] * 1.0e-4 - maxreg = numpy.amax(regolith) - minreg = numpy.amin(regolith) - if (minreg < minref): minreg = minref - if (maxreg < minref): maxreg = (minref + 1.0e3) - regolith_scaled = numpy.copy(regolith) - numpy.place(regolith_scaled, regolith_scaled < minref, minref) - regolith_scaled = 254.0 * ((numpy.log(regolith_scaled) - numpy.log(minreg)) / (numpy.log(maxreg) - numpy.log(minreg))) - - #Save image to file - filename = parameters['workingdir'] + 'rego' + os.sep + "rego%06d.png" % parameters['ncount'] - height = parameters['gridsize'] / dpi - width = height - fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi) - fig.figimage(regolith_scaled, cmap = matplotlib.cm.nipy_spectral, origin = 'lower') - matplotlib.pyplot.savefig(filename) - - return - -def image_shaded_relief(parameters, surface_dem): - #The color scale and appearance of this do not quite match the IDL version - - #Create image by convolving DEM with 3x3 illumination matrix - light = numpy.array([[1.0, 1.0, 1.0], [0.0, 0.0, 0.0], [-1.0, -1.0, -1.0]]) - convolved_map = scipy.signal.convolve2d(surface_dem, light, mode = 'same') - - #Adjust output to resemble IDL (north slopes illuminated, south in shadow) - convolved_map = convolved_map * -1.0 - convolved_map[0,:]=0.0 - convolved_map[-1,:] =0.0 - convolved_map[:,0]=0.0 - convolved_map[:,-1]=0.0 - - #If no shadedmin/max parameters are read in from ctem.dat, determine the values from the data - if (parameters['shadedminhdefault'] == 1): shadedminh = numpy.amin(surface_dem) - if (parameters['shadedmaxhdefault'] == 1): shadedmaxh = numpy.amax(surface_dem) - - #If min and max appear to be reversed, then fix them - if (parameters['shadedminh'] > parameters['shadedmaxh']): - temp = parameters['shadedminh'] - shadedminh = parameters['shadedmaxh'] - shadedmaxh = temp - else: - shadedminh = parameters['shadedminh'] - shadedmaxh = parameters['shadedmaxh'] - - #If dynamic range is valid, construct a shaded DEM - dynamic_range = shadedmaxh - shadedminh - if (dynamic_range != 0): - dem_scaled = numpy.copy(surface_dem) - shadedminh - numpy.place(dem_scaled, dem_scaled < 0.0, 0.0) - numpy.place(dem_scaled, dem_scaled > dynamic_range, dynamic_range) - dem_scaled = dem_scaled / dynamic_range - else: - dem_scaled = numpy.copy(surface_dem) * 0.0 - - #Generate shaded depth map with surface_dem color scaling (RGBA) - shaded = scipy.misc.bytescale(convolved_map) - if numpy.amax(shaded) == 0: shaded=255 - shadedscl = shaded / 255.0 - - #shaded_imagearr = matplotlib.cm.jet(dem_scaled) - #print dem_scaled[0:4,0:4] - #shaded_imagearr[:,:,0] = shaded_imagearr[:,:,0] * shadedscl - #shaded_imagearr[:,:,1] = shaded_imagearr[:,:,1] * shadedscl - #shaded_imagearr[:,:,2] = shaded_imagearr[:,:,2] * shadedscl - #shaded_imagearr[:,:,3] = shaded_imagearr[:,:,3] * shadedscl - - #Delivers nearly proper coloring, but no shaded relief - shaded_imagearr = dem_scaled * shadedscl - shaded_imagearr = matplotlib.cm.jet(shaded_imagearr) - shaded_imagearr = numpy.around(shaded_imagearr, decimals = 1) - - #Save image to file - filename = parameters['workingdir'] + 'shaded' + os.sep + "shaded%06d.png" % parameters['ncount'] - height = parameters['gridsize'] / dpi - width = height - fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi) - fig.figimage(shaded_imagearr, cmap = matplotlib.cm.jet, origin = 'lower') - matplotlib.pyplot.savefig(filename) - return - -def create_rplot(parameters,odist,pdist,tdist,ph1): - #Parameters: empirical saturation limit and dfrac - satlimit = 3.12636 - dfrac = 2**(1./4) * 1.0e-3 - - #Calculate geometric saturation - minx = (parameters['pix'] / 3.0) * 1.0e-3 - maxx = 3 * parameters['pix'] * parameters['gridsize'] * 1.0e-3 - geomem = numpy.array([[minx, satlimit / 20.0], [maxx, satlimit / 20.0]]) - geomep = numpy.array([[minx, satlimit / 10.0], [maxx, satlimit / 10.0]]) - - #Create distribution arrays without zeros for plotting on log scale - idx = numpy.nonzero(odist[:,5]) - odistnz = odist[idx] - odistnz = odistnz[:,[2,5]] - - idx = numpy.nonzero(pdist[:,5]) - pdistnz = pdist[idx] - pdistnz = pdistnz[:,[2,5]] - - idx = numpy.nonzero(tdist[:,5]) - tdistnz = tdist[idx] - tdistnz = tdistnz[:,[2,5]] - - #Correct pdist - pdistnz[:,1] = pdistnz[:,1] * parameters['curyear'] / parameters['interval'] - - #Create sdist bin factors, which contain one crater per bin - area = (parameters['gridsize'] * parameters['pix'] * 1.0e-3)**2. - plo = 1 - sq2 = 2**(1./2) - while (sq2**plo > minx): - plo = plo - 1 - phi = plo + 1 - while (sq2**phi < maxx): - phi = phi + 1 - n = phi - plo + 1 - sdist = numpy.zeros([n , 2]) - p = plo - for index in range(n): - sdist[index, 0] = sq2**p - sdist[index, 1] = sq2**(2.0*p + 1.5) / (area * (sq2 - 1)) - p = p + 1 - - #Create time label - tlabel = "%5.4e" % parameters['curyear'] - tlabel = tlabel.split('e') - texp = str(int(tlabel[1])) - timelabel = 'Time = '+ r'${}$ x 10$^{}$'.format(tlabel[0], texp) + ' yrs' - - #Save image to file - filename = parameters['workingdir'] + 'rplot' + os.sep + "rplot%06d.png" % parameters['ncount'] - height = parameters['gridsize'] / dpi - width = height - fig = matplotlib.pyplot.figure(figsize = (width, height), dpi = dpi) - - #Alter background color to be black, and change axis colors accordingly - matplotlib.pyplot.style.use('dark_background') - matplotlib.pyplot.rcParams['axes.prop_cycle'] - - #Plot data - matplotlib.pyplot.plot(odistnz[:,0]*1.0e-3, odistnz[:,1], linewidth=3.0, color = 'blue') - matplotlib.pyplot.plot(pdistnz[:,0]*1.0e-3, pdistnz[:,1], linewidth=2.0, linestyle='dashdot', color = 'white') - matplotlib.pyplot.plot(tdistnz[:,0]*1.0e-3, tdistnz[:,1], linewidth=2.0, color = 'red') - - matplotlib.pyplot.plot(geomem[:,0], geomem[:,1], linewidth=2.0, linestyle =':', color = 'yellow') - matplotlib.pyplot.plot(geomep[:,0], geomep[:,1], linewidth=2.0, linestyle =':', color = 'yellow') - matplotlib.pyplot.plot(sdist[:,0], sdist[:,1], linewidth=2.0, linestyle =':', color = 'yellow') - - matplotlib.pyplot.plot(ph1[:,0] * dfrac, ph1[:,1], 'wo') - - #Create plot labels - matplotlib.pyplot.title('Crater Distribution R-Plot',fontsize=22) - matplotlib.pyplot.xlim([minx, maxx]) - matplotlib.pyplot.xscale('log') - matplotlib.pyplot.xlabel('Crater Diameter (km)',fontsize=18) - matplotlib.pyplot.ylim([5.0e-4, 5.0]) - matplotlib.pyplot.yscale('log') - matplotlib.pyplot.ylabel('R Value', fontsize=18) - matplotlib.pyplot.text(1.0e-2, 1.0, timelabel, fontsize=18) - - matplotlib.pyplot.tick_params(axis='both', which='major', labelsize=14) - matplotlib.pyplot.tick_params(axis='both', which='minor', labelsize=12) - - matplotlib.pyplot.savefig(filename) - - return \ No newline at end of file diff --git a/tests/morphology_test_cases/simple/lunar-MBA-impactor-velocities.dat b/tests/morphology_test_cases/simple/lunar-MBA-impactor-velocities.dat deleted file mode 100755 index b56ce090..00000000 --- a/tests/morphology_test_cases/simple/lunar-MBA-impactor-velocities.dat +++ /dev/null @@ -1,64 +0,0 @@ -6000 41.000000 0.002861 -7000 200.000000 0.016817 -8000 541.000000 0.054567 -9000 793.000000 0.109902 -10000 822.000000 0.167260 -11000 974.000000 0.235224 -12000 978.000000 0.303468 -13000 973.000000 0.371363 -14000 901.000000 0.434233 -15000 1034.000000 0.506385 -16000 1036.000000 0.578676 -17000 934.000000 0.643849 -18000 784.000000 0.698556 -19000 644.000000 0.743493 -20000 467.000000 0.776080 -21000 356.000000 0.800921 -22000 285.000000 0.820808 -23000 239.000000 0.837485 -24000 232.000000 0.853674 -25000 319.000000 0.875933 -26000 368.000000 0.901612 -27000 240.000000 0.918359 -28000 162.000000 0.929663 -29000 132.000000 0.938874 -30000 84.000000 0.944735 -31000 82.000000 0.950457 -32000 83.000000 0.956249 -33000 79.000000 0.961761 -34000 81.000000 0.967413 -35000 50.000000 0.970902 -36000 63.000000 0.975298 -37000 66.000000 0.979904 -38000 43.000000 0.982904 -39000 41.000000 0.985765 -40000 44.000000 0.988835 -41000 28.000000 0.990789 -42000 37.000000 0.993371 -43000 19.000000 0.994697 -44000 20.000000 0.996092 -45000 19.000000 0.997418 -46000 5.000000 0.997767 -47000 10.000000 0.998465 -48000 5.000000 0.998814 -49000 3.000000 0.999023 -50000 2.000000 0.999163 -51000 1.000000 0.999232 -52000 0.000000 0.999232 -53000 1.000000 0.999302 -54000 0.000000 0.999302 -55000 1.000000 0.999372 -56000 1.000000 0.999442 -57000 1.000000 0.999512 -58000 0.000000 0.999512 -59000 0.000000 0.999512 -60000 1.000000 0.999581 -61000 0.000000 0.999581 -62000 1.000000 0.999651 -63000 1.000000 0.999721 -64000 0.000000 0.999721 -65000 1.000000 0.999791 -66000 2.000000 0.999930 -67000 0.000000 0.999930 -68000 0.000000 0.999930 -69000 1.000000 1.000000 diff --git a/tests/regolith-transport-run-example/CTEM b/tests/regolith-transport-run-example/CTEM deleted file mode 120000 index 4e9df72b..00000000 --- a/tests/regolith-transport-run-example/CTEM +++ /dev/null @@ -1 +0,0 @@ -../build/src/CTEM \ No newline at end of file diff --git a/tests/regolith-transport-run-example/ctem_image_dem.pro b/tests/regolith-transport-run-example/ctem_image_dem.pro deleted file mode 100755 index ad6fbd7e..00000000 --- a/tests/regolith-transport-run-example/ctem_image_dem.pro +++ /dev/null @@ -1,41 +0,0 @@ -pro ctem_image_dem,ncount,gridsize,pix,surface_dem,surface_dem_image -; Generates the shaded surface DEM image and saves it as a jpeg output image in the 'surf' directory -; outputs surface_dem_arr, which may be scaled to use as a console image - -; This code is for reading in the x-y positions from the cumulative distribution and separating out into layers -; so that the tallied craters can be drawn as circles -;!PATH = Expand_Path('+/home/campus/daminton/coyote/') + ':' + !PATH - -Compile_Opt DEFINT32 -thisDevice = !D.Name -Set_Plot, 'Z' -Erase -Device, Set_Resolution=[gridsize,gridsize],Set_Pixel_Depth=24, Decomposed=0 -TVLCT, red, green, blue, /GET - -sun = 20.d0 -radsun = sun * !dtor - -surface_dem_arr = dblarr(gridsize,gridsize) - -surface_dem_arr=surface_dem-shift(surface_dem,0,1) -surface_dem_arr = (0.5d0*!dpi) + atan(surface_dem_arr,pix) ; Get average slope -surface_dem_arr = abs(surface_dem_arr - radsun < 0.5d0*!dpi) ; incident angle -surface_dem_arr = 254.0d0 * cos(surface_dem_arr) ; shaded relief surface - -tv, surface_dem_arr, 0, 0, xsize=gridsize, ysize=gridsize, /device -print,'plotting' - -surface_dem_image = TVRD(True=1) -Set_Plot, thisDevice - -; save surface display -if (file_test('surf',/DIRECTORY) eq 0) then begin - file_mkdir,'surf' -endif -fnum = string(ncount,format='(I6.6)') -fname = 'surf/surf' + fnum + '.jpg' - -write_jpeg, fname, surface_dem_image, true=1, quality=100 - -end diff --git a/tests/regolith-transport-run-example/ctem_image_presentation.pro b/tests/regolith-transport-run-example/ctem_image_presentation.pro deleted file mode 100755 index 05a7d65a..00000000 --- a/tests/regolith-transport-run-example/ctem_image_presentation.pro +++ /dev/null @@ -1,143 +0,0 @@ -pro ctem_image_presentation,ncount,gridsize,pix,curyear,odist,pdist,tdist,ph1,map -; Generates the simplified version of the console display for use in presentations -; Plots the R-plot on the left and the image map on the right - -; presentation graphics -presresx = 1024 -presresy = 0.6*presresx -area = (gridsize * pix)^2 - -minx = (pix / 3.0d0) * 1d-3 -maxx = 3 * pix * gridsize * 1d-3 - -;strings for display -dum = string(format='(E10.4)', curyear) -parts = strsplit(dum, 'E', /extract) -fcuryear = strcompress(string(format='(F6.4,"x10!U",i,"!N")', parts[0], parts[1])) -time = 'Time = ' -timeunit = ' yr' - -if (file_test('presentation',/DIRECTORY) eq 0) then begin - file_mkdir,'presentation' -endif - -thisDevice = !D.Name -Set_Plot, 'Z' -Erase -Device, Set_Resolution=[presresx,presresy],Set_Pixel_Depth=24, Decomposed=0 -loadct, 0 -TVLCT, red, green, blue, /GET - -;geometric saturation -geom = dblarr(2,2) -geomem = dblarr(2,2) -geomep = dblarr(2,2) -geomel = dblarr(2,2) -geom(0,0) = minx -geom(0,1) = maxx -geom(1,*) = 3.12636d0 -geomem(0,0) = minx -geomem(0,1) = maxx -geomem(1,*) = 0.156318d0 -geomep(0,0) = minx -geomep(0,1) = maxx -geomep(1,*) = 0.312636d0 -geomel(0,0) = minx -geomel(0,1) = maxx -geomel(1,*) = 0.0312636d0 - -; Remove zeros -nz = where(odist(5,*) ne 0.0,count) -if (count gt 0) then begin - odistnz = dblarr(6,count) - odistnz(*,*)= odist(*,nz) -endif else begin - odistnz = odist -endelse - -nz = where(tdist(5,*) ne 0.0,count) -if (count gt 0) then begin - tdistnz = dblarr(6,count) - tdistnz(*,*)= tdist(*,nz) -endif else begin - tdistnz = tdist -endelse - -nz = where(pdist(5,*) ne 0.0,count) -if (count gt 0) then begin - pdistnz = dblarr(6,count) - pdistnz(*,*)= pdist(*,nz) -endif else begin - pdistnz = pdist -endelse - -; create r-plot array containing exactly 1 crater per bin -area = (gridsize * pix * 1d-3)^2 -plo = 1 -while (sqrt(2.0d0)^plo gt minx) do begin - plo = plo - 1 -endwhile -phi = plo + 1 -while (sqrt(2.0d0)^phi lt maxx) do begin - phi = phi + 1 -endwhile -n = phi - plo -sdist = dblarr(6,n + 1) -p = plo -for i=0,n do begin - sdist(0,i) = sqrt(2.d0)^p - sdist(1,i) = sqrt(2.d0)^(p+1) - sdist(2,i) = sqrt(sdist(0,i) * sdist(1,i)) - sdist(3,i) = 1.0d0 - sdist(5,i) = (sdist(2,i))^3 / (area * (sdist(1,i) - sdist(0,i))) - p = p + 1 -endfor -sdist(4,*) = reverse(total(sdist(3,*),/cumulative),2) - - -plot, odistnz(2,*)*1.0d-3, odistnz(5,*), line=0, color=255, thick=2.0, $ - TITLE='Crater Distribution R-Plot', charsize=1.2, $ - XTITLE='Crater Diameter (km)', $ - XRANGE=[minx,maxx], /XLOG, XSTYLE=1, $ - YTITLE='R Value', $ - YRANGE=[5.0e-4,5.0e0], /YLOG, YSTYLE=1, $ - /device, pos = [0.12,0.12,0.495,0.495]*presresx - -Dfac = sqrt(sqrt(2.0d0)) - -;display observed crater distribution -oplot, tdistnz(2,*)*1.0d-3, tdistnz(5,*), line=0, color=255, thick=1.0 -;oplot, geom(0,*), geom(1,*), line=2, color=255, thick=1.0 -oplot, geomem(0,*), geomem(1,*), line=1, color=255, thick=1.0 -oplot, geomep(0,*), geomep(1,*), line=1, color=255, thick=1.0 -;oplot, geomel(0,*), geomel(1,*), line=1, color=255, thick=1.0 -oplot, pdistnz(2,*)*1.0d-3, pdistnz(5,*), line=3, color=255, thick=1.0 -oplot, odistnz(2,*)*1.0d-3, odistnz(5,*), line=1, color=255, thick=1.0 -oplot, sdist(0,*), sdist(5,*), line=1, color=255, thick=1.0 -oplot, ph1(0,*)*Dfac*1.0d-3, ph1(1,*), psym=1, color=255, thick=1.0 -;oplot, ph2(0,*), ph2(1,*), psym=4, color=255, thick=1.0 -;oplot, ph3(0,*), ph3(1,*), psym=5, color=255, thick=1.0 - -;draw box around the main surface display & fill -displaysize = floor(0.45*presresx) ; size of displayed surface -surfxpos = floor(0.520*presresx) -surfypos = floor(0.12*presresy) -xbox = [surfxpos - 1,surfxpos - 1,surfxpos + displaysize,surfxpos + displaysize,surfxpos - 1] -ybox = [surfypos - 1,surfypos + displaysize,surfypos + displaysize,surfypos - 1,surfypos - 1] -plotS, xbox, ybox, /device, color=255 - -mapscaled = congrid(map,3,displaysize,displaysize,/interp) - -;mapscaled=congrid(map,displaysize,displaysize) ; scale image -tv, mapscaled, surfxpos, surfypos, xsize=displaysize, ysize=displaysize, true=1, /device - -xyouts, 0.310*presresx, 0.04*presresy, time + fcuryear + timeunit, color=255, charsize=2*presresy/720., /device - -snapshot = TVRD(True=1) -Set_Plot, thisDevice -fnum = string(ncount,format='(I6.6)') -fname = 'presentation/presentation' + fnum + '.jpg' -Write_JPEG, fname, snapshot, True=1, Quality=90 - - -end diff --git a/tests/regolith-transport-run-example/ctem_image_regolith.pro b/tests/regolith-transport-run-example/ctem_image_regolith.pro deleted file mode 100755 index 8d7f07a7..00000000 --- a/tests/regolith-transport-run-example/ctem_image_regolith.pro +++ /dev/null @@ -1,33 +0,0 @@ -pro ctem_image_regolith,ncount,gridsize,pix,regolith,regolith_image -; Generates the regolith depth map image and saves it as a jpeg output image in the 'rego' directory -; outputs dregolith, which may be scaled to use as a console image -Compile_Opt DEFINT32 -thisDevice = !D.Name -Set_Plot, 'Z' -Erase -Device, Set_Resolution=[gridsize,gridsize],Set_Pixel_Depth=24, Decomposed=0 -loadct, 39 -TVLCT, red, green, blue, /GET - -minref = pix * 1.0d-4 -regolith_scaled = dblarr(gridsize,gridsize) -maxreg = max(regolith) -minreg = min(regolith) -if minreg lt minref then minreg = minref -if maxreg lt minref then maxreg = minref + 1.0d30 -regolith_scaled = regolith > minreg -regolith_scaled = 254.0d0 * ((alog(regolith_scaled) - alog(minreg)) / (alog(maxreg) - alog(minreg))) - -; save regolith display -tv, regolith_scaled, 0, 0, xsize=gridsize, ysize=gridsize, /device -regolith_image = TVRD(True=1) -Set_Plot, thisDevice - -if (file_test('rego',/DIRECTORY) eq 0) then begin - file_mkdir,'rego' -endif -fnum = string(ncount,format='(I6.6)') -fname = 'rego/rego' + fnum + '.jpg' -write_jpeg, fname, regolith_image, true=1, quality=100 - -end diff --git a/tests/regolith-transport-run-example/ctem_image_shaded_relief.pro b/tests/regolith-transport-run-example/ctem_image_shaded_relief.pro deleted file mode 100755 index 73986f84..00000000 --- a/tests/regolith-transport-run-example/ctem_image_shaded_relief.pro +++ /dev/null @@ -1,52 +0,0 @@ -pro ctem_image_shaded_relief,ncount,gridsize,pix,surface_dem,height_vals,minh,maxh,dirname,shaded_image -; Generates the shaded depth map image and saves it as a jpeg output image in the 'rego' directory -; outputs dshaded, which may be scaled to use as a console image -; Uses the array height_vals for the color -Compile_Opt DEFINT32 -thisDevice = !D.Name -Set_Plot, 'Z' -Erase -Device, Set_Resolution=[gridsize,gridsize],Set_Pixel_Depth=24, Decomposed=0 -loadct, 33 -TVLCT, red, green, blue, /GET - -light=[[1,1,1],[0,0,0],[-1,-1,-1]] - -; convolution of the dem with the 3x3 matrix - -shaded=bytscl(convol(float(surface_dem),float(light))) -if max(shaded) eq 0 then shaded=255 - -; scale the dem to the height -if (minh gt maxh) then begin - tmp = minh - minh = maxh - maxh = tmp -endif - -demscaled = ((height_vals - minh) > 0.0) < (maxh-minh) -if ((maxh - minh) eq 0.0) then begin - demscaled = demscaled * 0.0 -endif else begin - demscaled = demscaled/(maxh-minh)*255.0 -endelse - -tv, demscaled, 0, 0, xsize=gridsize, ysize=gridsize, /device -shaded_image = TVRD(True=1) -shadedscl =float(shaded)/255.0 -shaded_imagearr = dblarr(3,gridsize,gridsize) -shaded_imagearr(0,*,*) = float(shaded_image(0,*,*)) * shadedscl(*,*) -shaded_imagearr(1,*,*) = float(shaded_image(1,*,*)) * shadedscl(*,*) -shaded_imagearr(2,*,*) = float(shaded_image(2,*,*)) * shadedscl(*,*) -shaded_image=round(shaded_imagearr) -Set_Plot, thisDevice - -if (file_test(dirname,/DIRECTORY) eq 0) then begin - file_mkdir,dirname -endif - -fnum = string(ncount,format='(I6.6)') -fname = dirname + '/' + dirname + fnum + '.jpg' -write_jpeg,fname,shaded_image,true=1,quality=90 - -end diff --git a/tests/regolith-transport-run-example/ctem_io_read_old.pro b/tests/regolith-transport-run-example/ctem_io_read_old.pro deleted file mode 100644 index a9013687..00000000 --- a/tests/regolith-transport-run-example/ctem_io_read_old.pro +++ /dev/null @@ -1,45 +0,0 @@ -pro ctem_io_read_old,gridsize,surface_dem,regolith,odist,tdist,pdist,mass -Compile_Opt DEFINT32 -openr,LUN,'surface_ejc.dat',/GET_LUN -readu,LUN,regolith -free_lun,LUN - -openr,LUN,'surface_dem.dat',/GET_LUN -readu,LUN,surface_dem -free_lun,LUN - -distl = file_lines('odistribution.dat') - 1 -pdistl = file_lines('pdistribution.dat') - 1 - -;read in observed cumulative distribution -odist = dblarr(6,distl) -line = "temp" -openr,LUN,'odistribution.dat',/GET_LUN -readf,LUN,line -readf,LUN,odist -close,LUN -free_lun,LUN - -;read in true cumulative distribution -tdist = dblarr(6,distl) -openr,LUN,'tdistribution.dat',/GET_LUN -readf,LUN,line -readf,LUN,tdist -close,LUN -free_lun,LUN - -;read in production function -pdist = dblarr(6,pdistl) -openr,LUN,'pdistribution.dat',/GET_LUN -readf,LUN,line -readf,LUN,pdist -close,LUN -free_lun,LUN - -;read in accumulated mass from file -openr,LUN,'impactmass.dat',/GET_LUN -readf,LUN,mass -close,LUN -free_lun,LUN - -end diff --git a/tests/regolith-transport-run-example/ctem_window_display.pro b/tests/regolith-transport-run-example/ctem_window_display.pro deleted file mode 100644 index d6edf5b9..00000000 --- a/tests/regolith-transport-run-example/ctem_window_display.pro +++ /dev/null @@ -1,249 +0,0 @@ -pro ctem_window_display,ncount,totalimpacts,gridsize,pix,curyear,masstot,odist,pdist,tdist,ph1,surface_dem,regolith,map,popupconsole -; Produces the console window display. The array 'map' is used to generate the image on the right-hand side -Compile_Opt DEFINT32 - -; console output graphics resolution -minref = pix * 1.0d-4 -conresx = 1280 -;conresy = 0.758*conresx -profsize = 0.00 -conresy = (0.60 + profsize) * conresx -sun = 20.d0 ; sun angle for display - -minx = (pix / 3.0d0) * 1d-3 -maxx = 3 * pix * gridsize * 1d-3 -charfac = 1.6 ; character size multiplier - -if strmatch(popupconsole,'T',/fold_case) then begin - device, decomposed=0, retain=2 - thisDevice = !D.NAME - SET_PLOT, 'Z' - TVLCT, red, green, blue, /GET - SET_PLOT, thisDevice - !P.MULTI = [0, 1, 2] - Window, 0, xsize=conresx, ysize=conresy -endif else begin - SET_PLOT, 'Z', /COPY - device, set_resolution=[conresx,conresy],decomposed=0, Z_Buffer=0 - TVLCT, red, green, blue, /GET - !P.MULTI = [0, 1, 2] - erase -endelse - -;set up first color scale -loadct, 0 - -;strings for display -time = 'Time = ' -timeunit = ' yr' -timp = 'Total impacts (dotdash) = ' -tcrt = 'Total craters (line) = ' -ocrt = 'Countable craters (bold) = ' -epwr = 'Mean regolith depth = ' -mtot = 'Impacted mass = ' -c1lab = 'Min. Elevation' -c2lab = 'Mean Elevation' -c3lab = 'Max. Elevation' - -maxelev = max(surface_dem) -minelev = min(surface_dem) -medelev = mean(surface_dem) -c1 = string(minelev, format = '(F9.1)') + ' m' -c2 = string(medelev, format = '(F9.1)') + ' m' -c3 = string(maxelev, format = '(F9.1)') + ' m' -tslp = mean(regolith) - -;geometric saturation -geom = dblarr(2,2) -geomem = dblarr(2,2) -geomep = dblarr(2,2) -geomel = dblarr(2,2) -geom(0,0) = minx -geom(0,1) = maxx -geom(1,*) = 3.12636d0 -geomem(0,0) = minx -geomem(0,1) = maxx -geomem(1,*) = 0.156318d0 -geomep(0,0) = minx -geomep(0,1) = maxx -geomep(1,*) = 0.312636d0 -geomel(0,0) = minx -geomel(0,1) = maxx -geomel(1,*) = 0.0312636d0 - -; Remove zeros -nz = where(odist(5,*) ne 0.0,count) -if (count gt 0) then begin - odistnz = dblarr(6,count) - odistnz(*,*)= odist(*,nz) -endif else begin - odistnz = odist -endelse - -nz = where(tdist(5,*) ne 0.0,count) -if (count gt 0) then begin - tdistnz = dblarr(6,count) - tdistnz(*,*)= tdist(*,nz) -endif else begin - tdistnz = tdist -endelse - -nz = where(pdist(5,*) ne 0.0,count) -if (count gt 0) then begin - pdistnz = dblarr(6,count) - pdistnz(*,*)= pdist(*,nz) - -endif else begin - pdistnz = pdist -endelse - -; create r-plot array containing exactly 1 crater per bin -area = (gridsize * pix * 1d-3)^2 -plo = 1 -while (sqrt(2.0d0)^plo gt minx) do begin - plo = plo - 1 -endwhile -phi = plo + 1 -while (sqrt(2.0d0)^phi lt maxx) do begin - phi = phi + 1 -endwhile -n = phi - plo -sdist = dblarr(6,n + 1) -p = plo -for i=0,n do begin - sdist(0,i) = sqrt(2.d0)^p - sdist(1,i) = sqrt(2.d0)^(p+1) - sdist(2,i) = sqrt(sdist(0,i) * sdist(1,i)) - sdist(3,i) = 1.0d0 - sdist(5,i) = (sdist(2,i))^3 / (area * (sdist(1,i) - sdist(0,i))) - p = p + 1 -endfor -sdist(4,*) = reverse(total(sdist(3,*),/cumulative),2) - -plot, odistnz(2,*)*1.0d-3, odistnz(5,*), line=0, color=255, thick=2.0, $ - TITLE='Crater Distribution R-Plot', charsize=charfac*conresy/720, $ - XTITLE='Crater Diameter (km)', $ - XRANGE=[minx,maxx], /XLOG, XSTYLE=1, $ - YTITLE='R Value', $ - YRANGE=[5.0e-4,5.0e0], /YLOG, YSTYLE=1, $ - /device, pos = [0.085*conresx,(0.25 + profsize)*conresy,0.44*conresx,0.85*conresy] - -Dfac = sqrt(sqrt(2.0d0)) - -;display observed crater distribution -oplot, tdistnz(2,*)*1.0d-3, tdistnz(5,*), line=0, color=255, thick=1.0 -oplot, geom(0,*), geom(1,*), line=2, color=255, thick=1.0 -oplot, geomem(0,*), geomem(1,*), line=1, color=255, thick=1.0 -oplot, geomep(0,*), geomep(1,*), line=1, color=255, thick=1.0 -oplot, geomel(0,*), geomel(1,*), line=1, color=255, thick=1.0 -oplot, pdistnz(2,*)*1.0d-3, pdistnz(5,*), line=3, color=255, thick=1.0 -oplot, odistnz(2,*)*1.0d-3, odistnz(5,*), line=1, color=255, thick=1.0 -oplot, sdist(0,*), sdist(5,*), line=1, color=255, thick=1.0 -oplot, ph1(0,*)*Dfac*1.0d-3, ph1(1,*), psym=1, color=255, thick=1.0 -;oplot, ph2(0,*), ph2(1,*), psym=4, color=255, thick=1.0 -;oplot, ph3(0,*), ph3(1,*), psym=5, color=255, thick=1.0 - -; set up profile display -surfpos = dblarr(gridsize) -surfpro = dblarr(gridsize) -surfhpro = dblarr(gridsize) -surfrpro = dblarr(gridsize) -for k = 0,gridsize-1 do begin - surfpos(k) = (-0.5d0*(gridsize-1) + double(k)) * pix -endfor -surfpro(*) = surface_dem(*,gridsize/2-1) -surfhpro(*) = regolith(*,gridsize/2-1) -surfrpro(*) = surfpro(*) - surfhpro(*) - -; set up profile -;maxelevp = max(surfpro) -;minelevp = min(surfpro) -;medelevp = mean(surfpro) -;vertrange = 1.5 * abs(maxelevp-minelevp) -;vertadd = 0.5d0 * (vertrange - abs(maxelevp-minelevp)) -;horzrange = vertrange * 5.86666666667d0 -;if (horzrange gt (pix*gridsize)) then horzrange = pix*gridsize -;plot, surfpos(*)/1.0d3, surfpro(*)/1.0d3, line=0, color=255, thick=1.0, $ -; TITLE='Matrix Cross-Section', charsize=1.0, $ -; XTITLE='Horizontal Position (km)', $ -; XRANGE=[(-1.0d0*horzrange/2.0d3),(horzrange/2.0d3)], XSTYLE=1, $ -; YTITLE='Elevation (km)', $ -; YRANGE=[((minelevp - vertadd)/1.0d3),((maxelevp + vertadd)/1.0d3)], YSTYLE=1, $ -; /device, pos = [0.063*conresx,0.049*conresy,0.99*conresx,0.26*conresy] -;oplot, surfpos(*)*1.0d-3, surfrpro(*)*1.0d-3, line=0, color=255, thick=1.0 - -;display text -dum = string(format='(E10.4)', curyear) -parts = strsplit(dum, 'E', /extract) -fcuryear = strcompress(string(format='(F6.4,"x10!U",i,"!N")', parts[0], parts[1])) + ' yr' -ftimp = string(totalimpacts, format = '(I13)') -ftcnt = string(tdist(4,0), format = '(I13)') -focnt = string(odist(4,0), format = '(I13)') -ftslp = string(tslp, format = '(F13.3)') + ' m' - - -dum = string(format='(E10.4)',masstot) -parts = strsplit(dum, 'E', /extract) -fmtot = strcompress(string(format='(F6.4,"x10!U",i,"!N")', parts[0], parts[1])) + ' kg' - -; Display information text below the R-plot -texttop = 0.15 + profsize -textspc = 0.035 -textleft = 0.05*conresx -textbreak = 0.25*conresx -xyouts, textleft, (texttop - 0*textspc)*conresy, time, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft, (texttop - 1*textspc)*conresy, timp, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft, (texttop - 2*textspc)*conresy, tcrt, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft, (texttop - 3*textspc)*conresy, ocrt, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft, (texttop - 4*textspc)*conresy, mtot, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft + textbreak, (texttop - 0*textspc)*conresy, fcuryear, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft + textbreak, (texttop - 1*textspc)*conresy, ftimp, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft + textbreak, (texttop - 2*textspc)*conresy, ftcnt, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft + textbreak, (texttop - 3*textspc)*conresy, focnt, color=255, charsize=charfac*conresy/720., /device -xyouts, textleft + textbreak, (texttop - 4*textspc)*conresy, fmtot, color=255, charsize=charfac*conresy/720., /device - -; Display information text above the R-plot -xyouts, 0.0368*conresx, 0.972*conresy, c1lab, color=255, charsize=charfac*conresy/720., /device -xyouts, 0.195*conresx, 0.972*conresy, c2lab, color=255, charsize=charfac*conresy/720., /device -xyouts, 0.353*conresx, 0.972*conresy, c3lab, color=255, charsize=charfac*conresy/720., /device -xyouts, 0.0368*conresx, 0.944*conresy, c1, color=255, charsize=charfac*conresy/720., /device -xyouts, 0.195*conresx, 0.944*conresy, c2, color=255, charsize=charfac*conresy/720., /device -xyouts, 0.353*conresx, 0.944*conresy, c3, color=255, charsize=charfac*conresy/720., /device -xyouts, 0.100*conresx, 0.917*conresy, epwr, color=255, charsize=charfac*conresy/720., /device -xyouts, 0.278*conresx, 0.917*conresy, ftslp, color=255, charsize=charfac*conresy/720., /device - -;print to screen -print, ncount, ' time = ', curyear -;print, ncount, ' tot impacts = ', tdist -;print, ncount, ' tot craters = ', totalimpacts -;print, ncount, ' obs craters = ', ocrcnt -;print, ncount, ' regolith = ', tslp -;print, ncount, ' prod R = ', mean(prval(1,*)) - -;draw box around the main surface display & fill -displaysize = floor(0.53*conresx) ; size of displayed surface -surfxpos = floor(0.462*conresx) -surfypos = floor((0.05 + profsize)*conresy) -xbox = [surfxpos - 1,surfxpos - 1,surfxpos + displaysize,surfxpos + displaysize,surfxpos - 1] -ybox = [surfypos - 1,surfypos + displaysize,surfypos + displaysize,surfypos - 1,surfypos - 1] -plotS, xbox, ybox, /device, color=255 - -; for display -mapscaled = congrid(map,3,displaysize,displaysize,/interp) - -tv, mapscaled, surfxpos, surfypos, xsize=displaysize, ysize=displaysize, true=1, /device - -; ---------- saving window ---------- - -; save console window -fnum = string(ncount,format='(I6.6)') -; print screen to JPEG file -if (file_test('console',/DIRECTORY) eq 0) then begin - file_mkdir,'console' -endif -print, ncount, ' saving window' -fname = 'console/console' + fnum + '.jpg' -dwin = tvrd(true=1) -write_jpeg, fname, dwin, true=1, quality=90 - -end diff --git a/tests/regolith-transport-run-example/start.in b/tests/regolith-transport-run-example/start.in deleted file mode 100644 index eb1e22d6..00000000 --- a/tests/regolith-transport-run-example/start.in +++ /dev/null @@ -1 +0,0 @@ -ctem_driver