Changeset 7452


Ignore:
Timestamp:
06/01/18 16:34:39 (4 months ago)
Author:
baker
Message:

fix Z1 < -ELEVMAX every time ELEVMAX is updated in HYTRA (fixes divide-by-zero in HYLOC)

Location:
trunk/src/seismic_processing
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/seismic_processing/hyp2000/arcprint.for

    r6197 r7452  
    181181C--OLD HYPOINVERSE 
    182182        ELSE IF (IFOR.EQ.2) THEN 
    183           READ (SCARD,1000,ERR=90) IY,IM,ID,IH,IN,SEC, LAT,XLAT,LON,XLON,Z, 
     183          READ (SCARD,1000,ERR=90) IY,IM,ID,IH,IN,SEC, 
     184        1 LAT,XLAT,LON,XLON,Z, 
    184185        2 XMAG,NR,IGAP,MIND,RMS, (IAZ(I),IDIP(I),SERR(I),I=1,2), 
    185186        3 FMAG,REMK3,SERR(3),REMK1,REMK2, NS,ERH,ERZ,NFM, 
  • trunk/src/seismic_processing/hyp2000/arcprints.for

    r4735 r7452  
    124124C--OLD HYPOINVERSE 
    125125        ELSE IF (IFOR.EQ.2) THEN 
    126           READ (SCARD,1000,ERR=90) IY,IM,ID,IH,IN,SEC, LAT,XLAT,LON,XLON,Z, 
     126          READ (SCARD,1000,ERR=90) IY,IM,ID,IH,IN,SEC, 
     127        1 LAT,XLAT,LON,XLON,Z, 
    127128        2 XMAG,NR,IGAP,MIND,RMS, (IAZ(I),IDIP(I),SERR(I),I=1,2), 
    128129        3 FMAG,REMK3,SERR(3),REMK1,REMK2, NS,ERH,ERZ,NFM, 
  • trunk/src/seismic_processing/hyp2000/hybda.for

    r7368 r7452  
    55C--GENERAL PARAMETERS 
    66      DATA GREETING 
    7      2 /'4/2018 VERSION 1.42 (CRE bug fix)'/ 
     7     2 /'6/2018 VERSION 1.42 (CRE, ELEVMAX bug fixes)'/ 
    88      DATA PI,RDEG,LJUNK,LMULT /3.14159,57.2958,2*.FALSE./ 
    99      DATA NSTLET,NETLET,NCOMP,NSLOC,NSLOC2 /4,4*0/ 
  • trunk/src/seismic_processing/hyp2000/hytra.for

    r7368 r7452  
    233233      WMOD(1)=1. 
    234234      ELEVMAX=ELEVMX(MOD)       !FWK 1.37 
     235 
     236C--LIMIT DEPTH TO BE BELOW THE MAXIMUM ELEVATION TO AVOID PROGRAM CRASH 
     237C  LMB 1.42 
     238      IF (Z1.LT.-ELEVMAX) THEN 
     239        Z1=-ELEVMAX 
     240        IF (LMESS) WRITE (15,*) 
     241     2  ' LIMIT QUAKE BELOW MINIMUM REFERENCE ELEVATION OF MODELS USED' 
     242      END IF 
     243 
    235244      IF (MODTYP(MOD).EQ.0) THEN 
    236245          CALL HYTRT (.FALSE.)  !CALL ONCE FOR P MODEL, AGAIN FOR S IF NEEDED 
  • trunk/src/seismic_processing/hyp2000_mgr/hyp2000_mgr.c

    r7449 r7452  
    117117#define ERR_PIPEPUT       107   /* Trouble writing to pipe                 */ 
    118118 
    119 #define VERSION_NUMBER "1.47 2018/04/23 hypoinverse-1.42" 
     119#define VERSION_NUMBER "1.47 2018/06/01 hypoinverse-1.42" 
    120120 
    121121 
Note: See TracChangeset for help on using the changeset viewer.