Checkpointing simulations

src/Models/NonhydrostaticModels/nonhydrostatic_model.jl

@@ -309,7 +309,7 @@ function prognostic_state(model::NonhydrostaticModel)
         velocities = prognostic_state(model.velocities),
         tracers = prognostic_state(model.tracers),
         pressures = prognostic_state(model.pressures),
-        diffusivity_fields = prognostic_state(model.diffusivity_fields),
+        closure_fields = prognostic_state(model.closure_fields),
         timestepper = prognostic_state(model.timestepper),
         auxiliary_fields = prognostic_state(model.auxiliary_fields),
         boundary_mass_fluxes = prognostic_state(model.boundary_mass_fluxes)
@@ -320,14 +320,16 @@ function restore_prognostic_state!(model::NonhydrostaticModel, state)
     restore_prognostic_state!(model.clock, state.clock)
     restore_prognostic_state!(model.particles, state.particles)
     restore_prognostic_state!(model.velocities, state.velocities)
+    restore_prognostic_state!(model.pressures, state.pressures)
+    restore_prognostic_state!(model.timestepper, state.timestepper)
 
     if length(model.tracers) > 0
         restore_prognostic_state!(model.tracers, state.tracers)
     end
 
-    restore_prognostic_state!(model.pressures, state.pressures)
-    restore_prognostic_state!(model.diffusivity_fields, state.diffusivity_fields)
-    restore_prognostic_state!(model.timestepper, state.timestepper)
+    if length(model.closure_fields) > 0
+        restore_prognostic_state!(model.closure_fields, state.closure_fields)
+    end
 
     if length(model.auxiliary_fields) > 0
         restore_prognostic_state!(model.auxiliary_fields, state.auxiliary_fields)