[cig-commits] [commit] master: Fix sweep/event functions (1e316cc)

[cig_noreply at geodynamics.org]

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

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

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

commit 1e316cc3370ca872579f06955898e1d02f80de9f
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Sep 24 16:20:25 2014 -0700

    Fix sweep/event functions


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

1e316cc3370ca872579f06955898e1d02f80de9f
 quakelib/src/QuakeLibIO.cpp |  9 +++++++++
 quakelib/src/QuakeLibIO.h   | 19 +++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/quakelib/src/QuakeLibIO.cpp b/quakelib/src/QuakeLibIO.cpp
index ff841db..2e35548 100644
--- a/quakelib/src/QuakeLibIO.cpp
+++ b/quakelib/src/QuakeLibIO.cpp
@@ -2690,3 +2690,12 @@ void quakelib::ModelEvent::append_event_hdf5(const hid_t &data_file) const {
     delete field_offsets;
     delete field_sizes;
 }
+
+std::ostream &operator<<(std::ostream &os, const quakelib::ModelSweeps &ms) {
+    return os;
+}
+
+std::ostream &operator<<(std::ostream &os, const quakelib::ModelEvent &me) {
+    //os << me._data._event_number << " " << me._data._event_year;
+    return os;
+}
diff --git a/quakelib/src/QuakeLibIO.h b/quakelib/src/QuakeLibIO.h
index 18a35f1..7b7f4dc 100644
--- a/quakelib/src/QuakeLibIO.h
+++ b/quakelib/src/QuakeLibIO.h
@@ -687,7 +687,7 @@ namespace quakelib {
         /*unsigned int count(const UIndex &element_id) const {
             return element_vals.count(element_id);
         };*/
-        unsigned int size(void) {
+        unsigned int size(void) const {
             return _sweeps.size();
         };
         
@@ -761,6 +761,14 @@ namespace quakelib {
             _data._normal_stress_final = final_normal;
         }
         
+        const ModelSweeps &getSweeps(void) const {
+            return _sweeps;
+        };
+        
+        void setStartEndSweep(const unsigned int start_sweep, const unsigned int end_sweep) {
+            _data._start_sweep_rec = start_sweep;
+            _data._end_sweep_rec = end_sweep;
+        }
         double getShearStressInit(void) {
             return _data._shear_stress_init;
         };
@@ -907,15 +915,6 @@ namespace quakelib {
         
         friend std::ostream &operator<<(std::ostream &os, const ModelEvent &me);
     };
-    
-    std::ostream &operator<<(std::ostream &os, const ModelSweeps &ms) {
-        return os;
-    }
-    
-    std::ostream &operator<<(std::ostream &os, const ModelEvent &me) {
-        os << me._data._event_number << " " << me._data._event_year;
-        return os;
-    }
 }
 
 #endif