Changeset 7280 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

Timestamp:

2016-11-21T11:40:00+01:00 (7 years ago)

Author:

flavoni

Message:

merge CNRS2016 with aerobulk branch

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) (4 diffs)

branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

@@ -24 +24 @@
    USE sbc_oce          ! Surface boundary condition: ocean fields
    USE sbc_ice          ! Surface boundary condition: ice   fields
-   USE sbcblk_core      ! Surface boundary condition: CORE bulk
-   USE sbcblk_clio      ! Surface boundary condition: CLIO bulk
+   USE sbcblk           ! Surface boundary condition: bulk
    USE sbccpl           ! Surface boundary condition: coupled interface
    USE albedo
@@ -93 +92 @@
       !!---------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt      ! ocean time step
-      INTEGER, INTENT(in) ::   ksbc    ! type of sbc ( =3 CLIO bulk ; =4 CORE bulk ; =5 coupled )
+      INTEGER, INTENT(in) ::   ksbc    ! type of sbc ( =4 bulk ; =5 coupled )
       !!
       INTEGER  ::   ji, jj   ! dummy loop indices
@@ -161 +160 @@
 
          SELECT CASE( ksbc )
-         CASE( jp_core , jp_purecpl )   ! CORE and COUPLED bulk formulations
+         CASE( jp_blk , jp_purecpl )   ! BULK and COUPLED bulk formulations
 
             ! albedo depends on cloud fraction because of non-linear spectral effects
             zalb_ice(:,:,:) = ( 1. - cldf_ice ) * zalb_cs(:,:,:) + cldf_ice * zalb_os(:,:,:)
-            ! In CLIO the cloud fraction is read in the climatology and the all-sky albedo 
-            ! (zalb_ice) is computed within the bulk routine
 
          END SELECT
@@ -184 +181 @@
          !
          SELECT CASE( ksbc )
-         CASE( jp_clio )           ! CLIO bulk formulation
-!           CALL blk_ice_clio( zsist, zalb_cs    , zalb_os    , zalb_ice   ,            &
-!              &                      utau_ice   , vtau_ice   , qns_ice    , qsr_ice,   &
-!              &                      qla_ice    , dqns_ice   , dqla_ice   ,            &
-!              &                      tprecip    , sprecip    ,                         &
-!              &                      fr1_i0     , fr2_i0     , cp_ice_msh , jpl  )
-            CALL blk_ice_clio_tau
-            CALL blk_ice_clio_flx( zsist, zalb_cs, zalb_os, zalb_ice )
-
-         CASE( jp_core )           ! CORE bulk formulation
-            CALL blk_ice_core_tau
-            CALL blk_ice_core_flx( zsist, zalb_ice )
-
+         !
+         CASE( jp_blk )           ! Bulk formulation
+            CALL blk_ice_tau
+            CALL blk_ice_flx( zsist, zalb_ice )
+            !
          CASE( jp_purecpl )            ! Coupled formulation : atmosphere-ice stress only (fluxes provided after ice dynamics)
             CALL sbc_cpl_ice_tau( utau_ice , vtau_ice )
+            !
          END SELECT