[cig-commits] [commit] master: Change function name in SimElement (618d9fd)

[cig_noreply at geodynamics.org]

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

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

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

commit 618d9fde1d8044c24a129149ff1cc31035292edd
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Sep 17 12:37:45 2014 -0700

    Change function name in SimElement


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

618d9fde1d8044c24a129149ff1cc31035292edd
 quakelib/src/QuakeLib.h      | 2 +-
 src/core/VCSimulation.cpp    | 2 +-
 src/misc/GreensFunctions.cpp | 6 +++---
 src/simulation/RunEvent.cpp  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/quakelib/src/QuakeLib.h b/quakelib/src/QuakeLib.h
index e3abaa3..6730f47 100644
--- a/quakelib/src/QuakeLib.h
+++ b/quakelib/src/QuakeLib.h
@@ -209,7 +209,7 @@ namespace quakelib {
             };
 
             //! Calculates the area of this block based on vertices and whether it is a triangle or quad.
-            double get_area(void) const {
+            double area(void) const {
                 Vec<3> a,b;
                 a=_vert[1]-_vert[0];
                 b=_vert[2]-_vert[0];
diff --git a/src/core/VCSimulation.cpp b/src/core/VCSimulation.cpp
index 2b42b64..9e7d5ef 100644
--- a/src/core/VCSimulation.cpp
+++ b/src/core/VCSimulation.cpp
@@ -657,7 +657,7 @@ void VCSimulation::collectEventSweep(VCEventSweep &cur_sweep) {
             bid = all_blocks[i].block_id;
             cur_sweep.setSlipAndArea(bid,
                                      all_blocks[i].slip,
-                                     getBlock(bid).get_area(),
+                                     getBlock(bid).area(),
                                      getBlock(bid).lame_mu());
             cur_sweep.setInitStresses(bid,
                                       all_blocks[i].init_shear,
diff --git a/src/misc/GreensFunctions.cpp b/src/misc/GreensFunctions.cpp
index cd5ae9d..a3a2bc8 100644
--- a/src/misc/GreensFunctions.cpp
+++ b/src/misc/GreensFunctions.cpp
@@ -253,8 +253,8 @@ void GreensFuncCalc::symmetrizeMatrix(VCSimulation *sim, GreensValsSparseMatrix
         for (n=0; n<num_elems; ++n) {
             ic = (full_row ? n : sim->getGlobalBID(n));
             double ir_area, ic_area;
-            ir_area = sim->getBlock(ir).get_area();
-            ic_area = sim->getBlock(ic).get_area();
+            ir_area = sim->getBlock(ir).area();
+            ic_area = sim->getBlock(ic).area();
             assertThrow(ir_area > 0 && ic_area > 0, "Blocks cannot have negative area.");
 
             int local_ir = (sim->isLocalBlockID(ic) ? ir : sim->getLocalInd(ir));
@@ -357,7 +357,7 @@ void GreensFuncCalcBarnesHut::bhInnerCalc(VCSimulation *sim, quakelib::Octree<3>
             mean_center += target_block.center();
             rake_vec += target_block.rake_vector();
             mean_rake += target_block.rake();
-            mean_area += target_block.get_area();
+            mean_area += target_block.area();
             mean_normal += target_block.normal();
             mean_lambda += target_block.lame_lambda();
             mean_mu += target_block.lame_mu();
diff --git a/src/simulation/RunEvent.cpp b/src/simulation/RunEvent.cpp
index 673f460..ea6c5de 100644
--- a/src/simulation/RunEvent.cpp
+++ b/src/simulation/RunEvent.cpp
@@ -76,7 +76,7 @@ void RunEvent::processBlocksOrigFail(VCSimulation *sim, VCEventSweep &current_sw
             if (slip > -b.state.slipDeficit) slip = -b.state.slipDeficit;
 
             // Record how much the block slipped in this sweep and initial stresses
-            current_sweep.setSlipAndArea(b.getBlockID(), slip, b.get_area(), b.lame_mu());
+            current_sweep.setSlipAndArea(b.getBlockID(), slip, b.area(), b.lame_mu());
             current_sweep.setInitStresses(b.getBlockID(), b.getShearStress(), b.getNormalStress());
 
             b.state.slipDeficit += slip;
@@ -209,7 +209,7 @@ void RunEvent::processBlocksSecondaryFailures(VCSimulation *sim, VCEventSweep &c
 
         if (slip > 0) {
             // Record how much the block slipped in this sweep and initial stresses
-            current_sweep.setSlipAndArea(block.getBlockID(), slip, block.get_area(), block.lame_mu());
+            current_sweep.setSlipAndArea(block.getBlockID(), slip, block.area(), block.lame_mu());
             current_sweep.setInitStresses(block.getBlockID(), block.getShearStress(), block.getNormalStress());
 
             block.state.slipDeficit += slip;