Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 (modified) (6 diffs)

trunk/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
@@ -54 +53 @@
 # endif
 
-#if defined key_bdy 
+   USE bdy_oce   , ONLY: ln_bdy
    USE bdyice_lim       ! unstructured open boundary data  (bdy_ice_lim routine)
-#endif
 
    IMPLICIT NONE
@@ -93 +91 @@
       !!---------------------------------------------------------------------
       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 +159 @@
 
          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 +180 @@
          !
          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
          
@@ -230 +219 @@
                            CALL lim_trp_2      ( kt )      ! Ice transport   ( Advection/diffusion )
            IF( ln_limdmp ) CALL lim_dmp_2      ( kt )      ! Ice damping 
-#if defined key_bdy
-                           CALL bdy_ice_lim( kt ) ! bdy ice thermo
-#endif
+           IF( ln_bdy    ) CALL bdy_ice_lim( kt ) ! bdy ice thermo
          END IF
          !                                             ! Ice surface fluxes in coupled mode