Changeset 9576 for branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/MY_SRC/sbcblk.F90

Timestamp:

2018-05-11T16:50:48+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Global renaming for SETTE + fix for key_lim3 in MY_SRC: push remaining modifications in order to start from a clean checkout

File:

• branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/MY_SRC/sbcblk.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/MY_SRC/sbcblk.F90

@@ -45 +45 @@
    USE sbc_ice        ! Surface boundary condition: ice fields
    USE lib_fortran    ! to use key_nosignedzero
-#if defined key_lim3
+#if defined key_si3
    USE ice     , ONLY :   u_ice, v_ice, jpl, a_i_b, at_i_b, tm_su, rn_cnd_s
    USE icethd_dh      ! for CALL ice_thd_snwblow
@@ -65 +65 @@
    PUBLIC   sbc_blk_init  ! called in sbcmod
    PUBLIC   sbc_blk       ! called in sbcmod
-#if defined key_lim3
+#if defined key_si3
    PUBLIC   blk_ice_tau   ! routine called in iceforcing
    PUBLIC   blk_ice_flx   ! routine called in iceforcing
@@ -539 +539 @@
          &     * ( MIN( sf(jp_tair)%fnow(:,:,1), rt0_snow ) - rt0 ) * cpic * tmask(:,:,1)
       !
-#if defined key_lim3
+#if defined key_si3
       qns_oce(:,:) = zqlw(:,:) - zqsb(:,:) - zqla(:,:)                                ! non solar without emp (only needed by LIM3)
       qsr_oce(:,:) = qsr(:,:)
@@ -690 +690 @@
    END FUNCTION L_vap
 
-#if defined key_lim3
+#if defined key_si3
    !!----------------------------------------------------------------------
-   !!   'key_lim3'                                       ESIM sea-ice model
+   !!   'key_si3'                                       ESIM sea-ice model
    !!----------------------------------------------------------------------
    !!   blk_ice_tau : provide the air-ice stress