trunk:

Bug fix to shortwave module, to ensure fractions of snow, ponds and bare ice add to 1.
Not BFB.

Updated project code for LANL institutional computing machines.

cice/input_templates/run_ice.Linux.LANL.conejo

@@ -1,5 +1,5 @@
 #!/bin/tcsh 
-#MSUB -A s11_climate
+#MSUB -A s11_climateacme
 #MSUB -l walltime=01:00:00
 #MSUB -l nodes=1:ppn=4
 #MSUB -N cice

cice/source/ice_shortwave.F90

@@ -1345,10 +1345,13 @@ subroutine run_dEdd(ilo,ihi,jlo,jhi,     &
                      hpn(i,j) = hp * tmp
                      fpn(i,j) = fpn(i,j) * tmp
                   endif
-                  fsn(i,j) = min(fsn(i,j), c1-fpn(i,j))
 
                endif ! hp > puny
 
+               ! Zero out fraction of thin ponds for radiation only
+               if (hpn(i,j) < hpmin) fpn(i,j) = c0
+               fsn(i,j) = min(fsn(i,j), c1-fpn(i,j))
+
                ! endif    ! masking by lid ice
                apeffn(i,j,n) = fpn(i,j) ! for history
             enddo ! ij
@@ -1762,7 +1765,7 @@ subroutine shortwave_dEdd  (nx_block, ny_block,    &
             coszen(i,j) = max(puny,coszen(i,j))
             hi(i,j)  = vice(i,j) / aice(i,j)
             ! if non-zero pond fraction and sufficient pond depth
-            if( fp(i,j) > puny .and. hp(i,j) > hpmin ) then
+            if (fp(i,j) > puny) then
                icells_DE = icells_DE + 1
                indxi_DE(icells_DE) = i
                indxj_DE(icells_DE) = j