Merge branch 'debugGlassMerge' into realistic

.gitignore

@@ -22,26 +22,48 @@ examples/global-lunar-bombardment/.DS_Store
 
 examples/mare-with-rays-model2/.DS_Store
 
+testing/
+
 __pycache__/
 
 *.dat
 
 *.DS_Store
 
+*.json
+
+*.xml
+
+*.iml
+
+examples/mare-with-rays-model2/CTEM
+
+examples/global-lunar-bombardment/CTEM
+
+!LOLA*.dat
+!lunar*.dat
+!NPF*.dat
 alocal.m4
 
 *.m4
 
 *.eps
-
 examples/mare-with-rays-model2/CTEM
 
+
 examples/global-lunar-bombardment/CTEM
 
-examples/*/*.o*
 
+examples/*/*.o*
 *.out
-.vscode/*
 
-*.sh
 !autogen.sh
+*.sh
+.vscode/*
+
+
+examples/global-lunar-bombardment/scale.ipynb
+*~
+
+*.m4
+*.code-workspace

README

@@ -1,33 +1,40 @@
-Installing CTEM for code development
+### Installing CTEM for code development
 ************************************
 
 CTEM uses Autotools to automate makefile generation. To set up your system, 
 first run the script 
-$ ./autogen.sh
+
+`$ ./autogen.sh`
 
 You may have to modify the contents of src/Makefile.am in order to set the 
 appropriate flags for your compiler.  The default file contains examples of 
 common flags (optimized code vs. debugging code) for gfortran and ifort.  Simply
 activate the appropriate set of flags for your system.
 
 From then on, you simply need to execute the following:
-$ mkdir build
+
+```
 $ cd build
 $ ../configure
 $ make clean
 $ make
+```
 
-The executable that is generated is build/src/CTEM
+The executable that is generated is `build/src/CTEM`
 
 
-Running CTEM
 ************************************
-Example CTEM simulations are included in the examples directory. 
-The run parameters are controlled by the ctem.in file.
+### Running CTEM
+************************************
+An example CTEM simulation is included in the idl directory. You can execute the
+CTEM run using the IDL frontend using:
 
-You can execute the CTEM run using the IDL frontend using:
-$ idl < start.in
+`$ idl < start.in`
 
-or with the Python frontend using:
-$ python ctem_driver.py
+Alternatively you may wish to use the Python front end.
+
+
+`$ python3 ctem_driver.py`
+
+The run parameters are controlled by the ctem.in file.
 

README.md

@@ -0,0 +1,39 @@
+### Installing CTEM for code development
+************************************
+
+CTEM uses Autotools to automate makefile generation. To set up your system, 
+first run the script 
+
+`$ ./autogen.sh`
+
+You may have to modify the contents of src/Makefile.am in order to set the 
+appropriate flags for your compiler.  The default file contains examples of 
+common flags (optimized code vs. debugging code) for gfortran and ifort.  Simply
+activate the appropriate set of flags for your system.
+
+From then on, you simply need to execute the following:
+
+```
+$ cd build
+$ ../configure
+$ make clean
+$ make
+```
+
+The executable that is generated is `build/src/CTEM`
+
+
+************************************
+### Running CTEM
+************************************
+An example CTEM simulation is included in the idl directory. You can execute the
+CTEM run using the IDL frontend using:
+
+`$ idl < start.in`
+
+Alternatively you may wish to use the Python front end.
+
+
+`$ python3 ctem_driver.py`
+
+The run parameters are controlled by the ctem.in file.

build/.gitignore

@@ -1,3 +1,5 @@
+*
+!.gitignore
 config*
 Makefile*
 src/*

configure.ac

@@ -1,6 +1,4 @@
-AC_INIT([Cratered Terrain Evolution Model], [1.1],
-		  [David Minton <daminton@purdue.edu> , James Richardson <jerichardsonjr@me.com>],
-		  [CTEM])
+AC_INIT([Cratered Terrain Evolution Model],[1.5],[David Minton <daminton@purdue.edu> , James Richardson <jerichardsonjr@me.com>],[CTEM])
 FCFLAGS=""
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/main/CTEM.f90])
@@ -9,4 +7,5 @@ AC_LANG([Fortran])
 AC_PROG_FC([ifort gfortran])
 AC_FC_FREEFORM
 AC_PROG_INSTALL
-AC_OUTPUT([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile])
+AC_OUTPUT

examples/global-lunar-bombardment/.gitignore

@@ -0,0 +1,4 @@
+*.jpg
+*.png
+*.out
+surface_*

examples/global-lunar-bombardment/craterlist.in

@@ -0,0 +1,74 @@
+#  Dcrat(m)   vel(m/s)   ang(deg)   lat(lunar_deg)  long(lunar_deg)  t(Ga)
+2050000  18.3e3   45.0  -54.0 190.0 4.31
+690000   18.3e3   45.0  -4.6  52.0  4.309
+264656   18.3e3   45.0  -15.61332546   69.3302824  4.308
+326000   18.3e3   45.0  0.8   0.5   4.307
+330000   18.3e3   45.0  11.3  351.1 4.306
+260000   18.3e3   45.0  7.2   341.8 4.305
+410000   18.3e3   45.0  14.2  3.1   4.304
+374000   18.3e3   45.0  39.5  218.0 4.303
+880000   18.3e3   45.0  -35.5 96.0  4.302
+450000   18.3e3   45.0  -53.5 24.0  4.301
+835450   18.3e3   45.0  -18.62889246   344.6275284 4.3
+730000   18.3e3   45.0  -7.7  26.8  4.295
+308094   18.3e3   45.0  59.27627528 212.7525524 4.29
+319231   18.3e3   45.0  -32.80724329   163.6812023 4.28
+220000   18.3e3   45.0  -37.25   147.4 4.27
+378676   18.3e3   45.0  -81.07525086   123.29507   4.263
+290000   18.3e3   45.0  27.7  268.2 4.262
+212469   18.3e3   45.0  -16.00128558   293.9277616 4.261
+886977   18.3e3   45.0  -1.825465537   86.643846   4.26
+359054   18.3e3   45.0  25.10176659 190.1586435 4.257
+350250   18.3e3   45.0  -55.45675   314.7328254 4.24
+311641   18.3e3   45.0  -57.31934795   163.1532724 4.234
+205004   18.3e3   45.0  40.23031791 251.638764  4.233
+275673   18.3e3   45.0  -28.12752755   251.4752918 4.232
+314000   18.3e3   45.0  49.4  179.0 4.231
+393547   18.3e3   45.0  13.45214311 201.8355846 4.23
+315767   18.3e3   45.0  51.34935346 237.4660505 4.229
+210000   18.3e3   45.0  35.7  16.8  4.228
+255770   18.3e3   45.0  -19.66310347   149.3783832 4.226
+240785   18.3e3   45.0  -19.67249958   123.3894353 4.225
+226910   18.3e3   45.0  42.1224033  241.0298572 4.224
+250897   18.3e3   45.0  -31.48490896   112.8567971 4.222
+658628   18.3e3   45.0  27.02355091 18.8607004  4.22
+221894   18.3e3   45.0  -11.6594669 104.8591143 4.216
+245208   18.3e3   45.0  -46.9757255 176.3039635 4.213
+211558   18.3e3   45.0  -22.49490849   352.9452915 4.21
+216511   18.3e3   45.0  -32.60970161   354.7296497 4.205
+333285   18.3e3   45.0  34.36310409 262.9001708 4.2
+220895   18.3e3   45.0  57.65611017 261.1243421 4.195
+210024   18.3e3   45.0  -14.1118114 207.354835  4.19
+233749   18.3e3   45.0  -38.34957695   179.1268146 4.186
+199964   18.3e3   45.0  -44.53551179   305.0047616 4.183
+265187   18.3e3   45.0  40.37696785 98.55965302 4.18
+221563   18.3e3   45.0  45.45055682 152.8752047 4.176
+370000   18.3e3   45.0  4.8   23.4  4.173
+914999   18.3e3   45.0  -14.46498859   34.667295   4.17
+582285   18.3e3   45.0  18.3492662  175.0038852 4.141
+233783   18.3e3   45.0  -5.010529467   291.3107245 4.14
+475882   18.3e3   45.0  -36.06581235   208.2781341 4.139
+320524   18.3e3   45.0  -57.39129925   135.0916217 4.132
+231696   18.3e3   45.0  51.05426018 164.8361278 4.131
+635875   18.3e3   45.0  -50.09793662   266.3026523 4.13
+330791   18.3e3   45.0  5.443621698 141.1357112 4.128
+205592   18.3e3   45.0  -35.37554544   193.9546907 4.12
+417139   18.3e3   45.0  -4.44301171 202.529925  4.11
+218802   18.3e3   45.0  -10.11195196   156.8421346 4.1
+628680   18.3e3   45.0  27.48770128 148.7715485 4.094
+401559   18.3e3   45.0  26.12735269 147.0496675 4.093
+220531   18.3e3   45.0  -58.69456785   -14.7671648 4.092
+207028   18.3e3   45.0  70.33554386 120.0916322 4.091
+407689   18.3e3   45.0  -24.68698867   320.3032688 4.09
+549393   18.3e3   45.0  2.02469787  230.8428995 4.089
+603126   18.3e3   45.0  57.23607662 81.9745336  4.08
+204083   18.3e3   45.0  61.5741765  90.19942127 4.076
+252194   18.3e3   45.0  -68.64688088   109.0653245 4.074
+299358   18.3e3   45.0  -67.18128041   291.2041322 4.073
+372000   18.3e3   45.0  16.5  66 4.071
+1091521  18.3e3   45.0  16.97625333 59.8465947  4.07
+1113841  18.3e3   45.0  33.46347978 342.5932292 3.87
+312747   18.3e3   45.0  -74.8652181 133.5337028 3.86
+928472   18.3e3   45.0  -19.73452267   265.4434194 3.81
+205511   18.3e3   45.0  -27.0857633 80.81672154 3.7
+233931   18.3e3   45.0  44.52984365 328.81901   3.65