Changeset 13307

Timestamp:

2020-07-15T10:38:15+02:00 (3 years ago)

Author:

andmirek

Message:

Ticket #2482: Few additional corrections

Location:

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE

Files:

• DIU/diurnal_bulk.F90 (modified) (3 diffs)
• SBC/sbcdcy.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/DIU/diurnal_bulk.F90

@@ -198 +198 @@
       
       CHARACTER(200) :: warn_string
+      LOGICAL        :: lwarn
        
       INTEGER :: ji,jj
+
+      lwarn = .FALSE.
                      
       DO jj = 1, jpj
@@ -212 +215 @@
             IF (p_fvel(ji,jj) < pp_min_fvel) THEN
                z_fvel = pp_min_fvel
-               WRITE(warn_string,*) "diurnal_sst_takaya step: "&
-               &//"friction velocity < minimum\n" &
-               &//"Setting friction velocity =",pp_min_fvel
-               CALL ctl_warn(warn_string)
-               
+               lwarn = .TRUE.
             ELSE
                z_fvel = p_fvel(ji,jj)
@@ -262 +261 @@
          END DO
       END DO
-      
+
+      IF(lwarn) THEN
+         WRITE(warn_string,*) "diurnal_sst_takaya step: "&
+         &//"friction velocity < minimum\n" &
+         &//"Setting friction velocity =",pp_min_fvel
+         CALL ctl_warn(warn_string)
+      ENDIF
+
       END FUNCTION t_imp
 

NEMO/branches/UKMO/NEMO_4.0_mirror_SI3_GPU/src/OCE/SBC/sbcdcy.F90

@@ -240 +240 @@
       !
       IF( PRESENT(l_mask) ) THEN
-        IF(l_mask) zqsrout(:,:) = float(imask_night(:,:))
+        IF(l_mask) THEN
+           zqsrout(:,:) = float(imask_night(:,:))
+        ENDIF
       ENDIF
       !