Changeset 10534 for NEMO/trunk/src/OCE

Timestamp:

2019-01-16T17:49:45+01:00 (5 years ago)

Author:

clem

Message:

change some more names in the ice

Location:

NEMO/trunk/src/OCE/SBC

Files:

• sbcblk.F90 (modified) (4 diffs)
• sbccpl.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/SBC/sbcblk.F90

@@ -17 +17 @@
    !!                 !                        ==> based on AeroBulk (http://aerobulk.sourceforge.net/)
    !!            4.0  !  2016-10  (G. Madec)  introduce a sbc_blk_init routine
-   !!            4.0  !  2016-10  (M. Vancoppenolle)  Introduce Jules emulator (M. Vancoppenolle) 
+   !!            4.0  !  2016-10  (M. Vancoppenolle)  Introduce conduction flux emulator (M. Vancoppenolle) 
    !!----------------------------------------------------------------------
 
@@ -31 +31 @@
    !!   blk_ice_tau   : provide the air-ice stress
    !!   blk_ice_flx   : provide the heat and mass fluxes at air-ice interface
-   !!   blk_ice_qcn   : provide ice surface temperature and snow/ice conduction flux (emulating JULES coupler)
+   !!   blk_ice_qcn   : provide ice surface temperature and snow/ice conduction flux (emulating conduction flux)
    !!   Cdn10_Lupkes2012 : Lupkes et al. (2012) air-ice drag
    !!   Cdn10_Lupkes2015 : Lupkes et al. (2015) air-ice drag 
@@ -688 +688 @@
    !!   blk_ice_tau : provide the air-ice stress
    !!   blk_ice_flx : provide the heat and mass fluxes at air-ice interface
-   !!   blk_ice_qcn : provide ice surface temperature and snow/ice conduction flux (emulating JULES coupler)
+   !!   blk_ice_qcn : provide ice surface temperature and snow/ice conduction flux (emulating conduction flux)
    !!   Cdn10_Lupkes2012 : Lupkes et al. (2012) air-ice drag
    !!   Cdn10_Lupkes2015 : Lupkes et al. (2015) air-ice drag 
@@ -932 +932 @@
       !! ** Purpose :   Compute surface temperature and snow/ice conduction flux
       !!                to force sea ice / snow thermodynamics
-      !!                in the case JULES coupler is emulated
+      !!                in the case conduction flux is emulated
       !!                
       !! ** Method  :   compute surface energy balance assuming neglecting heat storage

NEMO/trunk/src/OCE/SBC/sbccpl.F90

@@ -2012 +2012 @@
       !                                                      !      Transmitted Qsr      !   [W/m2]
       !                                                      ! ========================= !
-      SELECT CASE( nice_jules )
-      CASE( np_jules_OFF    )       !==  No Jules coupler  ==!
+      IF( .NOT.ln_cndflx ) THEN                              !==  No conduction flux as surface forcing  ==!
          !
          !                    ! ===> used prescribed cloud fraction representative for polar oceans in summer (0.81)
@@ -2022 +2021 @@
          WHERE( phi(:,:,:) <= 0.1_wp )   qtr_ice_top(:,:,:) = qsr_ice(:,:,:)   ! thin ice transmits all solar radiation
          !     
-      CASE( np_jules_ACTIVE )       !==  Jules coupler is active  ==!
+      ELSEIF( ln_cndflx .AND. .NOT.ln_cndemulate ) THEN      !==  conduction flux as surface forcing  ==!
          !
          !                    ! ===> here we must receive the qtr_ice_top array from the coupler
@@ -2028 +2027 @@
          qtr_ice_top(:,:,:) = 0._wp
          !
-      END SELECT
+      ENDIF
       !
 #endif