Add files via upload

suzumushi0 · Nov 19, 2021 · 6b6e1c2 · 6b6e1c2
1 parent 118c44c
commit 6b6e1c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/source/SODSPparam.cpp b/source/SODSPparam.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2021 suzumushi
 //
-// 2021-11-14		SODSPparam.cpp
+// 2021-11-16		SODSPparam.cpp
 //
 // Licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 (CC BY-NC-SA 4.0).
 //
@@ -177,19 +177,19 @@ void SODSPparam:: rt_param_update (struct GUI_param &gp, IParameterChanges* outP
 		// update of direct wave parameters
 		double s_x_2 = pow (s_x, 2.0);
 		double s_z_2 = pow (s_z, 2.0);
+		double r_2 = s_x_2 + pow (s_y, 2.0) + s_z_2;
+		double r = sqrt (r_2);
 		double med_r = sqrt (s_x_2 + s_z_2);
-		if (med_r != 0.0) {
+		if (r > a && med_r != 0.0) {
 			theta_p = acos (s_x / med_r);
 			if (s_z < 0.0)
 				theta_p = - theta_p;			
 		} else{
 			theta_p = 0.0;
 		}
 
-		double r_2 = s_x_2 + pow (s_y, 2.0) + s_z_2;
-		double r = sqrt (r_2);
 		double r_cos_theta_o = s_y;											// bcause cos_theta_o = s_y / r
-		double next_cos_theta_o = (r == 0.0 ? 0.0: (r_cos_theta_o / r));
+		double next_cos_theta_o = (a >= r ? 0.0: (r_cos_theta_o / r));
 		double theta_o {0.0};
 		double theta_d {0.0};
 		if (r > a) {

diff --git a/source/version.h b/source/version.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2021 suzumushi
 //
-// 2021-11-14		version.h
+// 2021-11-16		version.h
 //
 // Licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 (CC BY-NC-SA 4.0).
 //
@@ -16,11 +16,11 @@
 #define MAJOR_VERSION_STR "1"
 #define MAJOR_VERSION_INT 1
 
-#define SUB_VERSION_STR "3"
-#define SUB_VERSION_INT 3
+#define SUB_VERSION_STR "4"
+#define SUB_VERSION_INT 4
 
-#define RELEASE_NUMBER_STR "2"
-#define RELEASE_NUMBER_INT 2
+#define RELEASE_NUMBER_STR "0"
+#define RELEASE_NUMBER_INT 0
 
 #define BUILD_NUMBER_STR "1" // Build number to be sure that each result could be identified.
 #define BUILD_NUMBER_INT 1