fixed stats

DassHydro · May 27, 2024 · 32eceb0 · 32eceb0
1 parent c2c878b
commit 32eceb0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/smash/fcore/forward/md_simulation.f90 b/smash/fcore/forward/md_simulation.f90
@@ -99,7 +99,7 @@ subroutine store_time_step(setup, mesh, output, returns, checkpoint_variable, ti
                     & returns%q_domain(:, :, time_step_returns))
                 end if
 
-                if (return%qt_flag) then
+                if (returns%qt_flag) then
                     returns%qt(:, :, time_step_returns) = qt
                 end if
 
@@ -210,7 +210,7 @@ subroutine simulation_checkpoint(setup, mesh, input_data, parameters, output, op
         type(Checkpoint_VariableDT), intent(inout) :: checkpoint_variable
         integer, intent(in) :: start_time_step, end_time_step
 
-        integer :: t, rr_parameters_inc, rr_states_inc
+        integer :: t, rr_parameters_inc, rr_states_inc, i
         ! % Might add any number if needed
         real(sp), dimension(mesh%nac) :: h1, h2, h3, h4
 
@@ -477,7 +477,7 @@ subroutine simulation_checkpoint(setup, mesh, input_data, parameters, output, op
                 end do
             end if
 
-            call store_time_step(setup, mesh, output, returns, checkpoint_variable, t)
+            call store_time_step(setup, mesh, output, returns, checkpoint_variable, t, checkpoint_variable%ac_qtz)
 
         end do
 
@@ -564,4 +564,4 @@ subroutine simulation(setup, mesh, input_data, parameters, output, options, retu
 
     end subroutine simulation
 
-end module md_simulation
+end module md_simulation
diff --git a/smash/fcore/meson.build b/smash/fcore/meson.build
@@ -68,6 +68,7 @@ mwd_f90_sources = [
     'derived_type/mwd_serr_sigma_parameters.f90',
     'derived_type/mwd_setup.f90',
     'derived_type/mwd_sparse_matrix.f90',
+    'derived_type/mwd_stats.f90',
     'derived_type/mwd_u_response_data.f90',
 
     'external/mwd_bayesian_tools.f90',
@@ -162,4 +163,4 @@ py.extension_module(
     dependencies: dependencies,
     install: true,
     subdir: 'smash' / 'fcore',
-)
+)
diff --git a/smash/fcore/operator/md_gr_operator.f90 b/smash/fcore/operator/md_gr_operator.f90
@@ -20,13 +20,9 @@ module md_gr_operator
     use mwd_mesh !% only: MeshDT
     use mwd_input_data !% only: Input_DataDT
     use mwd_options !% only: OptionsDT
-<<<<<<< HEAD
     use mwd_returns !% only: ReturnDT
-
-=======
     use mwd_atmos_manipulation !% get_ac_atmos_data_time_step
 
->>>>>>> main
     implicit none
 
 contains