Changeset 2464 for branches

Timestamp:

04/13/12 12:57:18 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs:

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Merge bug fix on trunk (r2461).

File:

• branches/hpc33/src/STGrid.cpp (modified) (1 diff, 1 prop)

branches/hpc33/src/STGrid.cpp

@@ -1058 +1058 @@
     center_(0) = xcen.getValue( "rad" ) ;
     center_(1) = ycen.getValue( "rad" ) ;
-  }
+    double base = 0.5 * (xmin + xmax) ;
+    int maxrotate = 1 ;
+    int nelem = 2 * maxrotate + 1 ;
+    double *sep = new double[nelem] ;
+    for ( int i = 0 ; i < nelem ; i++ )
+      sep[i] = abs(base - center_[0] - (i-maxrotate) * C::_2pi) ;
+//     os << "sep[0]=" << sep[0] << endl  
+//        << "sep[1]=" << sep[1] << endl
+//        << "sep[2]=" << sep[2] << LogIO::POST ;
+    int idx = 0 ;
+    base = sep[0] ;
+    int nrotate = 0 ;
+    while ( idx < nelem ) {
+      if ( base > sep[idx] ) {
+        base = sep[idx] ;
+        nrotate = idx ;
+      }
+      idx++ ;
+    }
+    delete sep ;
+    nrotate -= maxrotate ;
+//     os << "nrotate = " << nrotate << LogIO::POST ;
+    center_[0] += nrotate * C::_2pi ;
+  }
+//   os << "xmin=" << xmin << LogIO::POST ;
+//   os << "center_=" << center_ << LogIO::POST ;