[cig-commits] [commit] master: Correct ordering of sweep rec indices (6966f2a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04

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

commit 6966f2a5c61713231aab4fdbd8a9b8630fa750ad
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Thu Sep 25 13:18:16 2014 -0700

    Correct ordering of sweep rec indices


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

6966f2a5c61713231aab4fdbd8a9b8630fa750ad
 quakelib/src/QuakeLibIO.cpp | 10 +++++-----
 quakelib/src/QuakeLibIO.h   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/quakelib/src/QuakeLibIO.cpp b/quakelib/src/QuakeLibIO.cpp
index 765be10..ff81e65 100644
--- a/quakelib/src/QuakeLibIO.cpp
+++ b/quakelib/src/QuakeLibIO.cpp
@@ -2215,12 +2215,12 @@ void quakelib::ModelEvent::read_ascii(std::istream &in_stream) {
     ss >> _data._event_year;
     ss >> _data._event_trigger;
     ss >> _data._event_magnitude;
-    ss >> _data._start_sweep_rec;
-    ss >> _data._end_sweep_rec;
     ss >> _data._shear_stress_init;
     ss >> _data._shear_stress_final;
     ss >> _data._normal_stress_init;
     ss >> _data._normal_stress_final;
+    ss >> _data._start_sweep_rec;
+    ss >> _data._end_sweep_rec;
 }
 
 void quakelib::ModelEvent::write_ascii(std::ostream &out_stream) const {
@@ -2228,12 +2228,12 @@ void quakelib::ModelEvent::write_ascii(std::ostream &out_stream) const {
     out_stream << _data._event_year << " ";
     out_stream << _data._event_trigger << " ";
     out_stream << _data._event_magnitude << " ";
-    out_stream << _data._start_sweep_rec << " ";
-    out_stream << _data._end_sweep_rec << " ";
     out_stream << _data._shear_stress_init << " ";
     out_stream << _data._shear_stress_final << " ";
     out_stream << _data._normal_stress_init << " ";
-    out_stream << _data._normal_stress_final;
+    out_stream << _data._normal_stress_final << " ";
+    out_stream << _data._start_sweep_rec << " ";
+    out_stream << _data._end_sweep_rec;
 
     next_line(out_stream);
 }
diff --git a/quakelib/src/QuakeLibIO.h b/quakelib/src/QuakeLibIO.h
index 039a57d..66ffaac 100644
--- a/quakelib/src/QuakeLibIO.h
+++ b/quakelib/src/QuakeLibIO.h
@@ -722,14 +722,14 @@ namespace quakelib {
         //! Which element triggered the event through a static friction failure
         UIndex          _event_trigger;
 
-        //! Start and end record of the sweeps comprising this event
-        unsigned int    _start_sweep_rec, _end_sweep_rec;
-
         //! Initial and final sum of shear stress on all elements involved in the event
         double          _shear_stress_init, _shear_stress_final;
 
         //! Initial and final sum of normal stress on all elements involved in the event
         double          _normal_stress_init, _normal_stress_final;
+        
+        //! Start and end record of the sweeps comprising this event
+        unsigned int    _start_sweep_rec, _end_sweep_rec;
     };
 
     /*!