fix of substep

FWI/src/FWINonlinearSolvers.cpp

@@ -202,9 +202,6 @@ public:
           mout << "after get iterate " << PPM->TotalMemoryUsage() << endl;
           vout(2) << Name() + " problem " << prob << ": d(" << iter << ")" << endl;
           FWD.NonlinearEvaluation(iterateNonlinear, nonlinearEvaluation, subproblems[prob]);
-          if (FWD.GetReconstructionType() == "AllAtOnce" && substep == 0) {
-            iterateNonlinear.getVectorsWrite() = 0.0;
-          }
           mout << "after NonlinearEvaluation " << PPM->TotalMemoryUsage() << endl;
           if (iter % writeSeismoToFileEvery == 0) {
             nonlinearEvaluation[0].getSeismogram().WriteToFile(Config::GetDataPath() + "FWI/" +
@@ -212,7 +209,9 @@ public:
                                                                std::to_string(iter));
           }
           FWD.CalculateDefect(dataObs, nonlinearEvaluation, defect, subproblems[prob]);
-
+          if (FWD.GetReconstructionType() == "AllAtOnce" && substep == 0) {
+            defect[0].getVectorsWrite() = 0.0;
+          }
           mout << "after Defect " << PPM->TotalMemoryUsage() << endl;
           if (defect.size() != nonlinearEvaluation.size()) {
             Exit(" DataContainer sizes do not match")

FWI/src/ForwardModels/ForwardModelAAO.cpp

@@ -89,6 +89,7 @@ void ForwardModelAAO::CalculateDefect(const std::vector<FWIDataContainerRange> &
     defect[i].getSeismogramWrite() = data_obs[subproblem[i]].getSeismogram();
     defect[i].getSeismogramWrite() -= nonlinearEvaluation[i].getSeismogram();
     Vectors RhsWF(TConf.timeSteps + 1, GetWaveVec());
+    RhsWF.MakeAdditive();
     Vector Mat(0.0, GetMatVec());
     Mat.SetAccumulateFlag(false);
     FillVectorFromProblem(*problem_fwd, Mat);