Changeset 7280 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

Timestamp:

2016-11-21T11:40:00+01:00 (7 years ago)

Author:

flavoni

Message:

merge CNRS2016 with aerobulk branch

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 (modified) (3 diffs)

branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

@@ -621 +621 @@
       IF(lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) 'lim_thd : Ice Thermodynamics'
-         WRITE(numout,*) '~~~~~~~'
+         WRITE(numout,*) 'lim_thd_init : Ice Thermodynamics initialization'
+         WRITE(numout,*) '~~~~~~~~~~~~'
       ENDIF
       !
@@ -634 +634 @@
       IF(lwm) WRITE ( numoni, namicethd )
       !
-      IF ( ( jpl > 1 ) .AND. ( nn_monocat == 1 ) ) THEN 
-         nn_monocat = 0
-         IF(lwp) WRITE(numout, *) '   nn_monocat must be 0 in multi-category case '
-      ENDIF
-
-      !
       IF(lwp) THEN                          ! control print
-         WRITE(numout,*)
          WRITE(numout,*)'   Namelist of ice parameters for ice thermodynamic computation '
          WRITE(numout,*)'      ice thick. for lateral accretion                        rn_hnewice   = ', rn_hnewice
@@ -659 +652 @@
          WRITE(numout,*)'      iterate the surface non-solar flux (T) or not (F)       ln_it_qnsice = ', ln_it_qnsice
       ENDIF
+      IF( jpl > 1 .AND. nn_monocat == 1 ) THEN 
+         nn_monocat = 0
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) '   nn_monocat forced to 0 as jpl>1, i.e. multi-category case is chosen'
+      ENDIF
       !
    END SUBROUTINE lim_thd_init