From 1bff0fbd50a3a30c2e8fadd039dec4d91999a1f4 Mon Sep 17 00:00:00 2001 From: David Bailey Date: Fri, 25 Oct 2024 13:44:35 -0600 Subject: [PATCH] Code cleanup in icepack_therm_itd.F90 --- columnphysics/icepack_therm_itd.F90 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/columnphysics/icepack_therm_itd.F90 b/columnphysics/icepack_therm_itd.F90 index 102147be..3610b7a0 100644 --- a/columnphysics/icepack_therm_itd.F90 +++ b/columnphysics/icepack_therm_itd.F90 @@ -873,7 +873,7 @@ subroutine lateral_melt (dt, fpond, & fresh, fsalt, & fhocn, faero_ocn, & fiso_ocn, & - rsiden, meltl, & + rsiden, meltl, & wlat, & aicen, vicen, & vsnon, trcrn, & @@ -1104,22 +1104,21 @@ subroutine lateral_melt (dt, fpond, & if (tr_aero) then do k = 1, n_aero - faero_ocn(k) = faero_ocn(k) + (vsnon_init(n) & - *(trcrn(nt_aero +4*(k-1),n) & - + trcrn(nt_aero+1+4*(k-1),n)) & - + vicen_init(n) & - *(trcrn(nt_aero+2+4*(k-1),n) & - + trcrn(nt_aero+3+4*(k-1),n))) & - * rsiden(n) / dt + faero_ocn(k) = faero_ocn(k) & + + (vsnon_init(n) * (trcrn(nt_aero +4*(k-1),n) & + + trcrn(nt_aero+1+4*(k-1),n)) & + + vicen_init(n) * (trcrn(nt_aero+2+4*(k-1),n) & + + trcrn(nt_aero+3+4*(k-1),n))) & + * rsiden(n) / dt enddo ! k endif ! tr_aero if (tr_iso) then do k = 1, n_iso fiso_ocn(k) = fiso_ocn(k) & - + (vsnon_init(n)*trcrn(nt_isosno+k-1,n) & - + vicen_init(n)*trcrn(nt_isoice+k-1,n)) & - * rsiden(n) / dt + + (vsnon_init(n)*trcrn(nt_isosno+k-1,n) & + + vicen_init(n)*trcrn(nt_isoice+k-1,n)) & + * rsiden(n) / dt enddo ! k endif ! tr_iso @@ -1172,7 +1171,6 @@ subroutine lateral_melt (dt, fpond, & end if - end subroutine lateral_melt !======================================================================= @@ -2106,7 +2104,7 @@ subroutine icepack_step_therm2(dt, hin_max, & fresh, fsalt, & fhocn, faero_ocn, & fiso_ocn, & - rsiden, meltl, & + rsiden, meltl, & wlat, & aicen, vicen, & vsnon, trcrn, &