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

This commit is contained in:
sebastianp 2016-07-13 14:15:50 +02:00
commit d4fd93ed8f

View File

@ -460,10 +460,10 @@ class SeisArray(object):
Generate FMTOMO input files from the SeisArray dimensions. Generate FMTOMO input files from the SeisArray dimensions.
Generates: vgridsref.in, interfacesref.in, propgrid.in Generates: vgridsref.in, interfacesref.in, propgrid.in
:param: nPointsPropgrid, number of points in each direction of the propagation grid (z, y, x) :param: nPointsPropgrid, number of points in each direction of the propagation grid (x, y, z)
:type: tuple :type: tuple
:param: nPointsInvgrid, number of points in each direction of the inversion grid (z, y, x) :param: nPointsInvgrid, number of points in each direction of the inversion grid (x, y, z)
:type: tuple :type: tuple
:param: zBotTop, (bottom, top) dimensions of the model :param: zBotTop, (bottom, top) dimensions of the model
@ -473,8 +473,8 @@ class SeisArray(object):
:type: float :type: float
''' '''
nRP, nThetaP, nPhiP = nPointsPropgrid nPhiP, nThetaP, nRP = nPointsPropgrid
nRI, nThetaI, nPhiI = nPointsInvgrid nPhiI, nThetaI, nRI = nPointsInvgrid
print('\n------------------------------------------------------------') print('\n------------------------------------------------------------')
print('Automatically generating input for FMTOMO from array size.') print('Automatically generating input for FMTOMO from array size.')