Changeset 10532 for NEMO/trunk/src/ICE/icethd_pnd.F90

Timestamp:

2019-01-16T14:39:38+01:00 (4 years ago)

Author:

clem

Message:

remove ln_pnd_fwb from the ice code

File:

• NEMO/trunk/src/ICE/icethd_pnd.F90 (modified) (4 diffs)

NEMO/trunk/src/ICE/icethd_pnd.F90

@@ -166 +166 @@
             !
             ! melt pond mass flux (<0)
-            IF( ln_pnd_fwb .AND. zdv_mlt > 0._wp ) THEN
+            IF( zdv_mlt > 0._wp ) THEN
                zfac = zfr_mlt * zdv_mlt * rhow * r1_rdtice
                wfx_pnd_1d(ji) = wfx_pnd_1d(ji) - zfac
@@ -205 +205 @@
       INTEGER  ::   ios, ioptio   ! Local integer
       !!
-      NAMELIST/namthd_pnd/  ln_pnd_H12, ln_pnd_fwb, ln_pnd_CST, rn_apnd, rn_hpnd, ln_pnd_alb
+      NAMELIST/namthd_pnd/  ln_pnd_H12, ln_pnd_CST, rn_apnd, rn_hpnd, ln_pnd_alb
       !!-------------------------------------------------------------------
       !
@@ -221 +221 @@
          WRITE(numout,*) '~~~~~~~~~~~~~~~~'
          WRITE(numout,*) '   Namelist namicethd_pnd:'
-         WRITE(numout,*) '      Evolutive melt pond fraction and depth (Holland et al 2012)  ln_pnd_H12 = ', ln_pnd_H12
-         WRITE(numout,*) '         Melt ponds store fresh water or not                       ln_pnd_fwb = ', ln_pnd_fwb
-         WRITE(numout,*) '      Prescribed melt pond fraction and depth                      ln_pnd_Cst = ', ln_pnd_CST
+         WRITE(numout,*) '      Evolutive  melt pond fraction and depth (Holland et al 2012) ln_pnd_H12 = ', ln_pnd_H12
+         WRITE(numout,*) '      Prescribed melt pond fraction and depth                      ln_pnd_CST = ', ln_pnd_CST
          WRITE(numout,*) '         Prescribed pond fraction                                  rn_apnd    = ', rn_apnd
          WRITE(numout,*) '         Prescribed pond depth                                     rn_hpnd    = ', rn_hpnd
@@ -238 +237 @@
       SELECT CASE( nice_pnd )
       CASE( np_pndNO )         
-         IF(ln_pnd_fwb) THEN ; ln_pnd_fwb = .FALSE. ; CALL ctl_warn( 'ln_pnd_fwb=false when no ponds' ) ; ENDIF
-         IF(ln_pnd_alb) THEN ; ln_pnd_alb = .FALSE. ; CALL ctl_warn( 'ln_pnd_alb=false when no ponds' ) ; ENDIF
-      CASE( np_pndCST)
-         IF(ln_pnd_fwb) THEN ; ln_pnd_fwb = .FALSE. ; CALL ctl_warn( 'ln_pnd_fwb=false when ln_pnd_CST=true' ) ; ENDIF
+         IF( ln_pnd_alb ) THEN ; ln_pnd_alb = .FALSE. ; CALL ctl_warn( 'ln_pnd_alb=false when no ponds' ) ; ENDIF
       END SELECT
       !