Change zeroing of residuals for non-wind terms (#662)

Author: nhartney

gusto/timestepping/semi_implicit_quasi_newton.py

@@ -538,12 +538,13 @@ def timestep(self):
                 with timed_stage("Apply forcing terms"):
                     logger.info(f'Semi-implicit Quasi Newton: Implicit forcing {(outer, inner)}')
                     self.forcing.apply(xp, xnp1, xrhs, "implicit")
+                    xrhs += xrhs_phys
+
                     if (inner > 0 and self.accelerator):
                         # Zero implicit forcing to accelerate solver convergence
-                        self.forcing.zero_forcing_terms(self.equation, xnp1, xrhs, self.equation.field_names)
+                        self.forcing.zero_non_wind_terms(self.equation, xnp1, xrhs, self.equation.field_names)
 
                 xrhs -= xnp1(self.field_name)
-                xrhs += xrhs_phys
 
                 # Linear solve -------------------------------------------------
                 with timed_stage("Implicit solve"):
@@ -738,7 +739,7 @@ def apply(self, x_in, x_nl, x_out, label):
         x_out.assign(x_in(self.field_name))
         x_out += self.xF
 
-    def zero_forcing_terms(self, equation, x_in, x_out, field_names):
+    def zero_non_wind_terms(self, equation, x_in, x_out, field_names):
         """
         Zero forcing term F(x) for non-wind prognostics.
 

gusto/timestepping/tr_bdf2_quasi_newton.py

@@ -365,12 +365,12 @@ def timestep(self):
                 with timed_stage("Apply forcing terms"):
                     logger.info(f'TR-BDF2 Quasi Newton: TR Implicit forcing {(outer, inner)}')
                     self.tr_forcing.apply(xp, xm, xrhs, "implicit")
+                    xrhs += xrhs_phys
                     if inner > 0:
                         # Zero implicit forcing to accelerate solver convergence
-                        self.tr_forcing.zero_forcing_terms(self.equation, xm, xrhs, self.equation.field_names)
+                        self.tr_forcing.zero_non_wind_terms(self.equation, xm, xrhs, self.equation.field_names)
 
                 xrhs -= xm(self.field_name)
-                xrhs += xrhs_phys
 
                 # Linear solve -------------------------------------------------
 
@@ -429,12 +429,12 @@ def timestep(self):
                 with timed_stage("Apply forcing terms"):
                     logger.info(f'TR-BDF2 Quasi Newton: BDF Implicit forcing {(outer, inner)}')
                     self.bdf_forcing.apply(xp, xnp1, xrhs, "implicit")
+                    xrhs += xrhs_phys
                     if inner > 0:
                         # Zero implicit forcing to accelerate solver convergence
-                        self.bdf_forcing.zero_forcing_terms(self.equation, xnp1, xrhs, self.equation.field_names)
+                        self.bdf_forcing.zero_non_wind_terms(self.equation, xnp1, xrhs, self.equation.field_names)
 
                 xrhs -= xnp1(self.field_name)
-                xrhs += xrhs_phys
 
                 # Linear solve -------------------------------------------------
                 with timed_stage("Implicit solve"):