[cig-commits] [commit] master: Added default constructors (66d5c6b)

[cig_noreply at geodynamics.org]

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

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

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

commit 66d5c6b0b3a3f2fec0894c25b7e2fd60dbf8efa4
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Thu Sep 25 14:44:54 2014 -0700

    Added default constructors


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

66d5c6b0b3a3f2fec0894c25b7e2fd60dbf8efa4
 quakelib/src/QuakeLib.h   | 11 +++++++++--
 quakelib/src/QuakeLibIO.h | 12 ++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/quakelib/src/QuakeLib.h b/quakelib/src/QuakeLib.h
index 5df3301..02b5cd8 100644
--- a/quakelib/src/QuakeLib.h
+++ b/quakelib/src/QuakeLib.h
@@ -33,8 +33,6 @@
 #ifndef _QUAKELIB_H_
 #define _QUAKELIB_H_
 
-// TODO: add default constructors to blank out objects
-
 namespace quakelib {
     //! Represents a complete triangular or rectangular element for use in a simulation.
     class SimElement {
@@ -61,6 +59,15 @@ namespace quakelib {
             double      _max_slip;
 
         public:
+            SimElement(void) {
+                _vert[0] = Vec<3>();
+                _vert[1] = Vec<3>();
+                _vert[2] = Vec<3>();
+                _is_quad = false;
+                _rake = _slip_rate = _aseis_factor = nan("");
+                _lame_mu = _lame_lambda = nan("");
+                _static_strength = _dynamic_strength = _max_slip = nan("");
+            }
             //! Calculate the stress tensor at a location with Lame parameters lambda and mu
             //! caused by this element moving unit_slip meters.
             Tensor<3,3> calc_stress_tensor(const Vec<3> &location, const double &unit_slip, const double &loc_lambda, const double &loc_mu) const throw(std::invalid_argument);
diff --git a/quakelib/src/QuakeLibIO.h b/quakelib/src/QuakeLibIO.h
index 334004b..a72a2fa 100644
--- a/quakelib/src/QuakeLibIO.h
+++ b/quakelib/src/QuakeLibIO.h
@@ -640,6 +640,8 @@ namespace quakelib {
             }
 
         public:
+            ModelSweeps(void) : _event_number(UNDEFINED_EVENT_ID) {};
+        
             typedef std::vector<SweepData>::iterator       iterator;
             typedef std::vector<SweepData>::const_iterator const_iterator;
 
@@ -755,6 +757,16 @@ namespace quakelib {
             // TODO: add a flag indicating whether this is an aftershock?
 
         public:
+            ModelEvent(void) {
+                _event_trigger_on_this_node = false;
+
+                _data._event_number = UNDEFINED_EVENT_ID;
+                _data._event_year = _data._event_magnitude = nan("");
+                _data._event_trigger = UNDEFINED_EVENT_ID;
+                _data._shear_stress_init = _data._shear_stress_final = nan("");
+                _data._normal_stress_init = _data._normal_stress_final = nan("");
+                _data._start_sweep_rec = _data._end_sweep_rec = UNDEFINED_EVENT_ID;
+            }
             typedef EventElementMap::iterator iterator;
             typedef EventElementMap::const_iterator const_iterator;