Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
sebastianp 2015-12-03 17:20:43 +01:00
commit 686002567c

View File

@ -25,8 +25,8 @@ AUTOLOC_nlloc #outpatter# %pattern of NLLoc-output file
%(returns 'eventID_outpatter')
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#parameters for seismic moment estimation#
3000 #vp# %average P-wave velocity
2600 #rho# %rock density [kg/m^3]
3530 #vp# %average P-wave velocity
2500 #rho# %average rock density [kg/m^3]
300 #Qp# %quality factor for P waves
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
AUTOFOCMEC_AIC_HOS4_ARH.in #focmecin# %name of focmec input file containing polarities