Changeset 9119 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3

Timestamp:

2017-12-18T17:33:07+01:00 (7 years ago)

Author:

nicolasmartin

Message:

Fix longer lines so should be harmless (passed SETTE compilations)

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3

Files:

• icethd_zdf.F90 (modified) (1 diff)
• icevar.F90 (modified) (1 diff)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icethd_zdf.F90

@@ -119 +119 @@
       ENDIF
       !
-      IF ( ( ln_cndi_U64 .AND. ln_cndi_P07 ) .OR. ( .NOT.ln_cndi_U64 .AND. .NOT.ln_cndi_P07 ) ) THEN
-         CALL ctl_stop( 'ice_thd_zdf_init: choose one and only one formulation for thermal conduction (ln_cndi_U64 or ln_cndi_P07)' )
+      IF ( ( ln_cndi_U64 .AND. ln_cndi_P07 ) .OR. ( .NOT. ln_cndi_U64 .AND. .NOT. ln_cndi_P07 ) ) THEN
+         CALL ctl_stop( 'ice_thd_zdf_init: choose 1 and only 1 formulation for thermal conduction (ln_cndi_U64 or ln_cndi_P07)' )
       ENDIF
       !                             !== set the choice of ice vertical thermodynamic formulation ==!

branches/2017/dev_merge_2017/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90

@@ -236 +236 @@
       DO jk = 1, nlay_s
          WHERE( v_s(:,:,:) > epsi20 )        !--- icy area
-            t_s(:,:,jk,:) = MAX( -100._wp , MIN( r1_cpic * ( -r1_rhosn * (e_s(:,:,jk,:)/v_s(:,:,:)*zlay_s) + lfus ) , 0._wp ) ) + rt0
+            t_s(:,:,jk,:) = MAX( -100._wp                                                                          ,   &
+                 &               MIN( r1_cpic * ( -r1_rhosn * ( e_s(:,:,jk,:) / v_s(:,:,:) * zlay_s ) + lfus ) ,       &
+                 &                    0._wp                                                                      )   ) &
+                 &        + rt0
          ELSEWHERE                           !--- no ice
             t_s(:,:,jk,:) = rt0