Changeset 1859 for branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/OPA_SRC/SBC/sbcice_if.F90

Timestamp:

2010-05-06T10:40:07+02:00 (14 years ago)

Author:

gm

Message:

ticket:#665 step 2 & 3: heat content in qns & new forcing terms

File:

• branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/OPA_SRC/SBC/sbcice_if.F90 (modified) (4 diffs)

branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/OPA_SRC/SBC/sbcice_if.F90

@@ -30 +30 @@
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.0 , LOCEAN-IPSL (2008) 
+   !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -72 +72 @@
          !             !   file    ! frequency !  variable  ! time intep !  clim  ! 'yearly' or ! weights  ! rotation   !
          !             !   name    !  (hours)  !   name     !   (T/F)    !  (T/F) !  'monthly'  ! filename ! pairs      ! 
-         sn_ice = FLD_N('ice_cover',    -1    ,  'ice_cov' ,  .true.    , .true. ,   'yearly'  , ''       , ''         )
-
-         REWIND ( numnam )               ! ... read in namlist namiif
+         sn_ice = FLD_N('ice_cover',    -1     ,  'ice_cov' ,  .true.    , .true. ,   'yearly'  , ''       , ''         )
+         !
+         REWIND ( numnam )               ! read in namlist namiif
          READ   ( numnam, namsbc_iif )
-
+         !
          ALLOCATE( sf_ice(1), STAT=ierror )
          IF( ierror > 0 ) THEN
@@ -83 +83 @@
          ALLOCATE( sf_ice(1)%fnow(jpi,jpj) )
          ALLOCATE( sf_ice(1)%fdta(jpi,jpj,2) )
-
-
-         ! fill sf_ice with sn_ice and control print
+         !
+         !                               ! fill sf_ice with sn_ice and control print
          CALL fld_fill( sf_ice, (/ sn_ice /), cn_dir, 'sbc_ice_if', 'ice-if sea-ice model', 'namsbc_iif' )
          !
       ENDIF
 
-      CALL fld_read( kt, nn_fsbc, sf_ice )           ! Read input fields and provides the
-      !                                              ! input fields at the current time-step
+      CALL fld_read( kt, nn_fsbc, sf_ice )           ! Read input fields at the current time-step
       
       IF( MOD( kt-1, nn_fsbc) == 0 ) THEN
@@ -101 +99 @@
          fr_i(:,:) = tfreez( sss_m ) * tmask(:,:,1)      ! sea surface freezing temperature [Celcius]
 
-         ! Flux and ice fraction computation
 !CDIR COLLAPSE
-         DO jj = 1, jpj
+         DO jj = 1, jpj          ! Flux and ice fraction computation
             DO ji = 1, jpi
                !