correct phase estimate

abarbour · abarbour · Sep 18, 2019 · Sep 13, 2019 · Sep 13, 2019 · Sep 17, 2019
commit 1610331a03a4470fa83e30160af4a6c279072277
diff --git a/R/open_well_response.R b/R/open_well_response.R
@@ -180,15 +180,12 @@ open_well_response.default <- function(omega, T., S.,
       gamma <- sqrt(2*onei*omega/(Rs.**2 * grav * U.))
       expgam <- exp(-1*gamma*Ta)
       exp2gam <- exp(-2*gamma*Ta)
-      A. <- -1 * omegsq / grav * (Hw + (1 - expgam)/(1 + expgam)/gamma)
+      A. <- -1 * omegsq / grav * (Hw + (1 - expgam)/(1 + expgam)/gamma) + 1
       # fix a -1 sign convention in Liu (relative to Hsieh/Cooper)
-      B. <- 1 * onei * omega * U. * Rs.**2 * gamma * expgam / (1 - exp2gam)
+      B. <- -1 * onei * omega * U. * Rs.**2 * gamma * expgam / (1 - exp2gam)
       # Eq A20 -- x / h
-      wellresp <- 1 / (A. + B. + 1)
-      # amp <- Mod(wellresp)
-      # phs <- Arg(wellresp)
-      # wellresp <- complex(modulus=amp, argument=phs)
-      #
+      wellresp <- complex(modulus = Mod(1/(A.+B.)), argument = -Arg(A. - B.))
+
     } else if (model=="hsieh"){
       #
       # from Hsieh et al (1987), Eq 12-16

diff --git a/vignettes/ResponseModels.pdf b/vignettes/ResponseModels.pdf
diff --git a/vignettes/figure/ALLORESPFIG-1.pdf b/vignettes/figure/ALLORESPFIG-1.pdf
diff --git a/vignettes/figure/ALLRESPFIG-1.pdf b/vignettes/figure/ALLRESPFIG-1.pdf
diff --git a/vignettes/figure/COOPERRESP-1.pdf b/vignettes/figure/COOPERRESP-1.pdf
diff --git a/vignettes/figure/COOPERRESPFIG-1.pdf b/vignettes/figure/COOPERRESPFIG-1.pdf
diff --git a/vignettes/figure/HSIEHRESP-1.pdf b/vignettes/figure/HSIEHRESP-1.pdf
diff --git a/vignettes/figure/HSIEHRESPFIG-1.pdf b/vignettes/figure/HSIEHRESPFIG-1.pdf
diff --git a/vignettes/figure/KITRESP-1.pdf b/vignettes/figure/KITRESP-1.pdf
diff --git a/vignettes/figure/KITRESPFIG-1.pdf b/vignettes/figure/KITRESPFIG-1.pdf
diff --git a/vignettes/figure/LIURESP-1.pdf b/vignettes/figure/LIURESP-1.pdf
diff --git a/vignettes/figure/LIURESPFIG-1.pdf b/vignettes/figure/LIURESPFIG-1.pdf
diff --git a/vignettes/figure/ROJRESP-1.pdf b/vignettes/figure/ROJRESP-1.pdf
diff --git a/vignettes/figure/ROJRESPFIG-1.pdf b/vignettes/figure/ROJRESPFIG-1.pdf