Merge branch 'main' into bc_fixes

Author: rcjackson

pydda/cost_functions/_cost_functions_numpy.py

@@ -571,6 +571,7 @@ def calculate_mass_continuity_gradient(
     # Impermeability condition
     grad_w[0, :, :] = 0
     grad_w = _apply_upper_bc(grad_w, upper_bc, upper_bc_mask)
+
     y = np.stack([grad_u, grad_v, grad_w], axis=0)
     return y.flatten()
 

pydda/cost_functions/cost_functions.py

@@ -549,6 +549,7 @@ def grad_J(winds, parameters):
                             parameters.dx,
                             parameters.dy,
                             parameters.dz,
+                            parameters.vrs,
                             parameters.Cm,
                             1,
                             parameters.upper_bc,

pydda/retrieval/wind_retrieve.py

@@ -219,6 +219,7 @@ def __init__(self):
         self.above = 2.0
         self.upper_bc_mask = None
         self.roi = 1000.0
+        self.above = 2.0
         self.frz = 4500.0
         self.Nfeval = 0.0
         self.engine = "scipy"
@@ -275,6 +276,7 @@ def _get_dd_wind_field_scipy(
     model_fields=None,
     output_cost_functions=True,
     roi=1000.0,
+    above=2.0,
     wind_tol=0.1,
     tolerance=1e-8,
     const_boundary_cond=False,