setting s=log(-1) when AmplificationProxyValue == -1

Author: billyburgoa

.gitignore

@@ -1 +1,2 @@
 **/.DS_Store
+/nbproject/private/

lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar

@@ -8,7 +8,7 @@ libs.CommonsLang.src=\
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
-libs.CopyLibs.prop-version=2.0
+libs.CopyLibs.prop-version=3.0
 libs.Gozirra.classpath=\
     ${base}/gozirra/gozirra-client-0.4.1.jar
 libs.Gozirra.src=\

lib/nblibraries.properties

@@ -4,5 +4,5 @@ [email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=bf23cbc1
-nbproject/build-impl.xml.script.CRC32=f7470203
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
+nbproject/build-impl.xml.script.CRC32=eaddba06
+nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.96.0.48

nbproject/build-impl.xml

@@ -20,8 +20,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # Files in build.classes.dir which should be excluded from distribution jar
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
@@ -43,13 +47,17 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.7
 javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
@@ -75,8 +83,12 @@ run.classpath=\
 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
 # To set system properties for unit tests define test-sys-prop.name=value:
 run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=${file.reference.ew-viewer-src}

nbproject/genfiles.properties

@@ -158,10 +158,9 @@ public Shaking getPGA(double magnitude, double sourceLat, double sourceLon,
         }
 
         if (amplificationProxyValueSI == -1) {
-            //S II firm or steady soil 
             // 
-            S = 0;
-            H = 1;
+            S = log(-1);
+            H = 0;
         }
 
         double depthKm = sourceDepthM / 1000.; // Depth in km
@@ -268,11 +267,10 @@ public Shaking getPSA(double magnitude, double sourceLat, double sourceLon,
             H = 0;
         }
 
-        if (amplificationProxyValueSI == -1) {
-            //S II firm or steady soil 
+        if (amplificationProxyValueSI == -1) { 
             // 
-            S = 0;
-            H = 1;
+            S = log(-1);
+            H = 0;
         }
 
         double depthKm = sourceDepthM / 1000.0; //depth in km