Changeset 12742 for NEMO

Timestamp:

2020-04-12T14:46:30+02:00 (4 years ago)

Author:

clem

Message:

all sette tests passed

Location:

NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl

Files:

• cfgs/SHARED/namelist_ice_ref (modified) (3 diffs)
• src/OCE/SBC/sbccpl.F90 (modified) (3 diffs)

NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/cfgs/SHARED/namelist_ice_ref

@@ -178 +178 @@
 &namthd_pnd     !   Melt ponds
 !------------------------------------------------------------------------------
-   ln_pnd           = .false.         !  activate melt ponds or not
-     ln_pnd_H12     = .false.         !  activate evolutive melt ponds (from Flocco et al 2007,2010 & Holland et al 2012)
+   ln_pnd           = .true.         !  activate melt ponds or not
+     ln_pnd_H12     = .true.         !  activate evolutive melt ponds (from Flocco et al 2007,2010 & Holland et al 2012)
        ln_pnd_lids  = .true.          !  ponds with frozen lids
        ln_pnd_flush = .true.          !  ponds flushing trhu the ice  
@@ -187 +187 @@
        rn_apnd      =   0.2           !     prescribed pond fraction, at Tsu=0 degC
        rn_hpnd      =   0.05          !     prescribed pond depth,    at Tsu=0 degC
-     ln_pnd_alb     = .false.         !  melt ponds affect albedo or not
+     ln_pnd_alb     = .true.         !  melt ponds affect albedo or not
 /
 !------------------------------------------------------------------------------
@@ -252 +252 @@
       iiceprt       =  10             !     i-index for debug
       jiceprt       =  10             !     j-index for debug
-   ln_icediacvg     = .false.         !  check convergence of ice rheology (outputs: file ice_cvg.nc & variable uice_cvg)
-/
+/

NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/OCE/SBC/sbccpl.F90

@@ -837 +837 @@
 
       ! Initialise ice fractions from last coupling time to zero (needed by Met-Office)
+#if defined key_si3 || defined key_cice
        a_i_last_couple(:,:,:) = 0._wp
-
+#endif
       !                                                      ! ------------------------- ! 
       !                                                      !      Ice Meltponds        ! 
@@ -2297 +2298 @@
       ENDIF
 
+#if defined key_si3 || defined key_cice
       ! If this coupling was successful then save ice fraction for use between coupling points. 
       ! This is needed for some calculations where the ice fraction at the last coupling point 
@@ -2306 +2308 @@
          ENDIF
       ENDIF
+#endif
 
       IF( ssnd(jps_fice1)%laction ) THEN