[cig-commits] [commit] master: minor bug fixes related to sac-sources (98d7bd9)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/sw4

On branch  : master
Link       : https://github.com/geodynamics/sw4/compare/82097c4d1dd428ac74d19be8aed92737fbef1246...98d7bd9a0b6cd48a418cfa18d198ad2a7a5f6690

>---------------------------------------------------------------

commit 98d7bd9a0b6cd48a418cfa18d198ad2a7a5f6690
Author: Bjorn Sjogreen <sjogreen2 at llnl.gov>
Date:   Fri Dec 12 16:24:49 2014 -0800

    minor bug fixes related to sac-sources


>---------------------------------------------------------------

98d7bd9a0b6cd48a418cfa18d198ad2a7a5f6690
 src/Source.C         | 9 ++++++---
 src/parseInputFile.C | 6 +++++-
 src/sacutils.C       | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Source.C b/src/Source.C
index 6d76457..42c04c3 100644
--- a/src/Source.C
+++ b/src/Source.C
@@ -216,14 +216,17 @@ Source::Source(EW *a_ew, double frequency, double t0,
 //-----------------------------------------------------------------------
 Source::Source()
 {
-
+   mNpar = 0;
+   mNipar = 0;
 }
 
 //-----------------------------------------------------------------------
 Source::~Source()
 {
-   delete[] mPar;
-   delete[] mIpar;
+   if( mNpar > 0 )
+      delete[] mPar;
+   if( mNipar > 0 )
+      delete[] mIpar;
 }
 
 //-----------------------------------------------------------------------
diff --git a/src/parseInputFile.C b/src/parseInputFile.C
index f5e57f1..02e166a 100644
--- a/src/parseInputFile.C
+++ b/src/parseInputFile.C
@@ -4919,7 +4919,7 @@ void EW::processSource(char* buffer, vector<Source*> & a_GlobalUniqueSources )
      {
 	double laterr = fabs((latsac-lat)/lat);
 	double lonerr = fabs((lonsac-lon)/lon);
-	if( laterr > 1e-6 || lonerr < 1e-6 )
+	if( laterr > 1e-6 || lonerr > 1e-6 )
 	{
 	   if( proc_zero() )
 	      cout << "WARNING in processSource: reading sac files: (lat,lon) location on sac file different from (lat,lon) on command line" << endl;
@@ -5127,6 +5127,10 @@ void EW::processSource(char* buffer, vector<Source*> & a_GlobalUniqueSources )
       a_GlobalUniqueSources.push_back(sourcePtr);
     }
   }	  
+  if( npar > 0 )
+     delete[] par;
+  if( nipar > 0 )
+     delete[] ipar;
   if (mVerbose >=4 && proc_zero())
     cout << "********Done parsing source command*********" << endl;
 }
diff --git a/src/sacutils.C b/src/sacutils.C
index 72a43ee..4f7f460 100644
--- a/src/sacutils.C
+++ b/src/sacutils.C
@@ -127,8 +127,8 @@ void readSACheader( const char* fname, double& dt, double& t0,
    cmpinc = float70[58];
    utc[0] = int35[0];
    int jday=int35[1];
-
-   convertjday( jday, utc[0], utc[2], utc[1] );
+   if( utc[0] != -12345 )
+      convertjday( jday, utc[0], utc[2], utc[1] );
    utc[3] = int35[2];
    utc[4] = int35[3];
    utc[5] = int35[4];