Give correct lable to snapshots

Katetc · Dec 11, 2024 · 53dd7a4 · 53dd7a4
1 parent a15f13a
commit 53dd7a4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/physics/cam/physpkg.F90 b/src/physics/cam/physpkg.F90
@@ -1666,14 +1666,26 @@ subroutine tphysac (ztodt,   cam_in,  &
     ! Rayleigh friction calculation
     !===================================================
     call t_startf('rayleigh_friction')
+    if (trim(cam_take_snapshot_before) == "rayleigh_friction_tend") then
+       call cam_snapshot_all_outfld_tphysac(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf,&
+            fh2o, surfric, obklen, flx_heat)
+    end if
     call rayleigh_friction_tend( ztodt, state, ptend)
+    if ( (trim(cam_take_snapshot_after) == "rayleigh_friction_tend") .and.      &
+         (trim(cam_take_snapshot_before) == trim(cam_take_snapshot_after))) then
+       call cam_snapshot_ptend_outfld(ptend, lchnk)
+    end if
     if ( ptend%lu ) then
       call outfld( 'UTEND_RAYLEIGH', ptend%u, pcols, lchnk)
     end if
     if ( ptend%lv ) then
       call outfld( 'VTEND_RAYLEIGH', ptend%v, pcols, lchnk)
     end if
     call physics_update(state, ptend, ztodt, tend)
+    if (trim(cam_take_snapshot_after) == "rayleigh_friction_tend") then
+       call cam_snapshot_all_outfld_tphysac(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf,&
+            fh2o, surfric, obklen, flx_heat)
+    end if
     call t_stopf('rayleigh_friction')
 
     if (do_clubb_sgs) then

diff --git a/src/physics/cam7/physpkg.F90 b/src/physics/cam7/physpkg.F90
@@ -2164,12 +2164,12 @@ subroutine tphysac (ztodt,   cam_in,  &
     ! Rayleigh friction calculation
     !===================================================
     call t_startf('rayleigh_friction')
-    if (trim(cam_take_snapshot_before) == "user_set") then
+    if (trim(cam_take_snapshot_before) == "rayleigh_friction_tend") then
        call cam_snapshot_all_outfld_tphysac(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
             fh2o, surfric, obklen, flx_heat, cmfmc, dlf, det_s, det_ice, net_flx)
     end if
     call rayleigh_friction_tend( ztodt, state, ptend)
-    if ( (trim(cam_take_snapshot_after) == "user_set") .and.      &
+    if ( (trim(cam_take_snapshot_after) == "rayleigh_friction_tend") .and.      &
          (trim(cam_take_snapshot_before) == trim(cam_take_snapshot_after))) then
        call cam_snapshot_ptend_outfld(ptend, lchnk)
     end if
@@ -2180,7 +2180,7 @@ subroutine tphysac (ztodt,   cam_in,  &
       call outfld( 'VTEND_RAYLEIGH', ptend%v, pcols, lchnk)
     end if
     call physics_update(state, ptend, ztodt, tend)
-    if (trim(cam_take_snapshot_after) == "user_set") then
+    if (trim(cam_take_snapshot_after) == "rayleigh_friction_tend") then
        call cam_snapshot_all_outfld_tphysac(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
             fh2o, surfric, obklen, flx_heat, cmfmc, dlf, det_s, det_ice, net_flx)
     end if