Old radiation code cleaned up

source/model/lake.f90

@@ -83,11 +83,6 @@ if (error_cov==1) then
     &only in standalone runs: STOP'
     STOP
   endif
-! if (spinup_day/=0) then
-!  print*, 'No spinup is allowed when calculating 
-!& error covariances: STOP'
-!  STOP
-! endif 
   if (assim == 1) then
     print*, 'assim = 1 and error_cov = 1: these regimes could not &
     &be turned on simultaneously: STOP'
@@ -822,24 +817,9 @@ elseif (varalb%par == 1) then
   & (1 - WATER_ALBEDO( SINH0(year,month,day,hour,phi) ) ) ! Note: the time here must be a local one
 endif  ! time, not UTC
 
-! Different extinction coefficients for surface mixed layer and below
-!do i = i_ML, M+1
-!  extwatarr(i) = extwat*(1.+1.*float(i-i_ML)/float(M+1-i_ML))
-!enddo
-
 !Radiation fluxes in layers
 x = 1._ireals - sabspen*skin%par
-!SR(1) = Erad*(1 - sabs0)*x*exp( - extwatarr(1)*dzeta_05int(1)*h1)
-!xx = Erad*(1 - sabs0)*x*exp( - extwatarr(1)*dzeta_05int(1)*h1)
-!do i = 2, M
-!  SR(i) = SR(i-1)*exp( - extwatarr(i)*ddz05(i-1)*h1)
-!   y = xx*exp( - extwatarr(i)*ddz05(i-1)*h1)
-!   print*, y
-!   xx = y
-!enddo
 call RadWater%RAD_UPDATE(ddz05(0:M)*h1,(/Erad*(1 - sabs0)*x/))
-!print*, RadWater%integr(2:M)
-!read*
 ! Calculating photic zone depth (<1% of surface irradiance)
 if (RadWater%integr(1) > 0) then
   H_photic_zone = h1
@@ -853,10 +833,6 @@ else
   H_photic_zone = 0.
 endif
 if (ls1 /= 0.e0_ireals) then
-  !do i = 1, Mice
-  !  SRdi(i) = SR(M)*exp(-extwatarr(M+1)*ddz05(M)*h1)* & 
-  !  & (1-albedoofice)*exp(-extice*dzetai_05int(i)*ls1)
-  !enddo
   ! xx - radiation penetrated through the water - deep ice interface
   xx = RadWater%flux(M+1,1)*(1-albedoofice)
   call RadDeepIce%RAD_UPDATE(ddzi05(0:Mice)*ls1, (/xx/))
@@ -1144,15 +1120,8 @@ if (flag_snow == 1) then
       SR_botsnow = SR_botsnow*EXTINCT_SNOW(dens(i))**dz(i)
     enddo
   endif
-  !do i = 1, Mice
-  !  SRi(i) = SR_botsnow*exp(-extice*dzetai_05int(i)*l1)
-  !enddo
   call RadIce  %RAD_UPDATE(ddzi05(0:Mice)*l1, (/SR_botsnow/))
   call RadWater%RAD_UPDATE(ddz05 (0:Mice)*h1, (/RadIce%flux(Mice+1,1)/))
-  !SR(1) = SR_botsnow*exp(-extice*l1)*exp(-extwatarr(1)*ddz05(0)*h1)
-  !do i = 2, M
-  !  SR(i) = SR(i-1)*exp(-extwatarr(i)*ddz05(i-1)*h1)
-  !enddo
 ! Calculating photic zone depth (<1% of surface irradiance)
   if (RadWater%integr(1) > 0) then
     H_photic_zone = h1
@@ -1166,10 +1135,6 @@ if (flag_snow == 1) then
     H_photic_zone = 0.
   endif
   if (ls1 /= 0.e0_ireals) then
-    !do i = 1, Mice
-    !  SRdi(i) = SR(M)*exp(-extwatarr(M+1)*ddz05(M)*h1)* &
-    !  & (1-albedoofice)*exp(-extice*dzetai_05int(i)*ls1)
-    !enddo
     call RadDeepIce%RAD_UPDATE(ddzi05(0:Mice)*ls1, (/RadWater%flux(M+1,1)/))
   endif
 
@@ -1400,14 +1365,7 @@ else
 
 !Radiation fluxes in layers
   Erad = shortwave*(1-albedoofice)
-  !do i = 1, Mice
-  !  SRi(i) = Erad*exp(-extice*dzetai_05int(i)*l1)
-  !enddo
   call RadIce  %RAD_UPDATE(ddzi05(0:Mice)*l1, (/Erad/))
-  !SR(1) = Erad*exp(-extice*l1)*exp(-extwatarr(1)*ddz05(0)*h1)
-  !do i = 2, M
-  !  SR(i) = SR(i-1)*exp(-extwatarr(i)*ddz05(i-1)*h1) 
-  !enddo
   call RadWater%RAD_UPDATE(ddz05(0:M)*h1, (/RadIce%flux(Mice+1,1)/))
 ! Calculating photic zone depth (<1% of surface irradiance)
   if (RadWater%integr(1) > 0) then
@@ -1422,10 +1380,6 @@ else
     H_photic_zone = 0.
   endif
   if (ls1 /= 0.e0_ireals) then
-    !do i = 1, Mice
-    !  SRdi(i) = SR(M)*exp(-extwatarr(M+1)*ddz05(M)*h1)* &
-    !  & (1-albedoofice)*exp(-extice*dzetai_05int(i)*ls1)
-    !enddo
     call RadDeepIce%RAD_UPDATE(ddzi05(0:Mice)*ls1, (/RadWater%flux(M+1,1)/))
   endif
 
@@ -1665,9 +1619,6 @@ if (flag_snow == 1) then
       SR_botsnow = SR_botsnow*EXTINCT_SNOW(dens(i))**dz(i)
     enddo
   endif
-  !do i = 1, Mice
-  !  SRi(i) = SR_botsnow*exp(-extice*dzetai_05int(i)*l1)
-  !enddo
   call RadIce%RAD_UPDATE(ddzi05(0:Mice)*l1, (/SR_botsnow/))
 
   x = Meltpnt(0.e0_ireals,0.e0_ireals,nmeltpoint%par)
@@ -1741,9 +1692,6 @@ else
 
   ! Radiation fluxes
   Erad = shortwave*(1-albedoofice)
-  !do i = 1, Mice
-  !  SRi(i) = Erad*exp( - extice*dzetai_05int(i)*l1)
-  !enddo
   call RadIce%RAD_UPDATE(ddzi05(0:Mice)*l1, (/Erad/))
 
   if (precip > 0 .and. tempair < 0) then