[cig-commits] [commit] master: Added missing gravity functions (4f50ee5)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/vc/compare/082524e7240f51389b2429bcb08d3f4fa4715b12...ae8034470f079d470aa770153864cd607aa7f66b

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

commit 4f50ee54ba1e396de323100ad605eed0a691eb6b
Author: kwschultz <kwschultz at ucdavis.edu>
Date:   Wed Oct 1 13:02:34 2014 -0700

    Added missing gravity functions


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

4f50ee54ba1e396de323100ad605eed0a691eb6b
 quakelib/src/QuakeLibOkada.cpp | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/quakelib/src/QuakeLibOkada.cpp b/quakelib/src/QuakeLibOkada.cpp
index ddd46f0..869dc18 100644
--- a/quakelib/src/QuakeLibOkada.cpp
+++ b/quakelib/src/QuakeLibOkada.cpp
@@ -3431,9 +3431,35 @@ double quakelib::Okada::I5g(double _R, double xi, double eta, double _q){
     }
 }
 
+double quakelib::Okada::I1g(double _R, double xi, double eta, double _q){
+	OP_MULT(1);OP_ADD(1);
+	double _Rpeta = _R+eta;
+	double xi_cos = xi*_cos_o_dip;
+    if (_cos_o_dip!=0.0) {
+        if (!singularity2(xi)){
+		    OP_MULT(2); OP_ADD(1); OP_SUB(1); OP_DIV(1);
+		    return atan((_Rpeta*(1.0+_sin_o_dip)-_q*_cos_o_dip)/xi_cos);
+	    } else {
+		    return 0.0;
+	    }
+    } else {
+        return M_PI*0.5;
+    }
+}
 
-
-
+double quakelib::Okada::I0g(double _R, double eta, double _q){
+	double _dtil = dtil(_q,eta);
+	double _Rpeta 	 = _R+eta;
+	double ret_value = -1.0*_sin_o_dip*log(_R+_dtil);
+    if (!singularity4(_Rpeta)) {
+    	OP_ADD(1); OP_LOG(1);
+    	ret_value += log(_R+eta);
+    } else {
+    	OP_SUB(2); OP_LOG(1);
+    	ret_value -= log(_R-eta);
+    }
+    return ret_value;
+}