Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phylmd/alpale_th.F90

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/alpale_th.F90 (modified) (11 diffs, 1 prop)

LMDZ6/branches/Ocean_skin/libf/phylmd/alpale_th.F90

@@ +1 @@
+!
+! $Id$
+!
 SUBROUTINE alpale_th ( dtime, lmax_th, t_seri, cell_area,  &
                        cin, s2, n2,  &
@@ -62 +65 @@
  REAL umexp  ! expression of (1.-exp(-x))/x valid for all x, especially when x->0
  REAL x
+     CHARACTER (LEN=20) :: modname='alpale_th'
+     CHARACTER (LEN=80) :: abort_message
+     
  umexp(x) = max(sign(1.,x-1.e-3),0.)*(1.-exp(-x))/max(x,1.e-3) + &
             (1.-max(sign(1.,x-1.e-3),0.))*(1.-0.5*x*(1.-x/3.*(1.-0.25*x)))  !!! correct formula            (jyg)
@@ -104 +110 @@
              !
              IF (prt_level .GE. 10) THEN
-                print *,'cin, ale_bl_stat, alp_bl, alp_bl_stat ', &
+                WRITE(lunout,*)'cin, ale_bl_stat, alp_bl, alp_bl_stat ', &
                      cin, ale_bl_stat, alp_bl, alp_bl_stat
              ENDIF
@@ -122 +128 @@
              !
              IF (prt_level .GE. 10) THEN
-                print *,'random_notrig, tau_trig ', &
+                WRITE(lunout,*)'random_notrig, tau_trig ', &
                      random_notrig, tau_trig
-                print *,'s_trig,s2,n2 ', &
+                WRITE(lunout,*)'s_trig,s2,n2 ', &
                      s_trig,s2,n2
              ENDIF
@@ -178 +184 @@
              !
              IF (prt_level .GE. 10) THEN
-                print *,'proba_notrig, ale_bl_trig ', &
+                WRITE(lunout,*)'proba_notrig, ale_bl_trig ', &
                      proba_notrig, ale_bl_trig
              ENDIF
@@ -224 +230 @@
         !
         IF (prt_level .GE. 10) THEN
-           print *,'cin, ale_bl_stat, alp_bl_stat ', &
+           WRITE(lunout,*)'cin, ale_bl_stat, alp_bl_stat ', &
                 cin, ale_bl_stat, alp_bl_stat
         ENDIF
@@ -253 +259 @@
         !
         IF (prt_level .GE. 10) THEN
-           print *,'random_notrig, tau_trig ', &
+           WRITE(lunout,*)'random_notrig, tau_trig ', &
                 random_notrig, tau_trig
-           print *,'s_trig,s2,n2 ', &
+           WRITE(lunout,*)'s_trig,s2,n2 ', &
                 s_trig,s2,n2
         ENDIF
@@ -289 +295 @@
         !
         IF (prt_level .GE. 10) THEN
-           print *,'proba_notrig, ale_bl_trig ', &
+           WRITE(lunout,*)'proba_notrig, ale_bl_trig ', &
                 proba_notrig, ale_bl_trig
         ENDIF
@@ -300 +306 @@
 
           IF (prt_level .GE. 10) THEN
-             print *,'alpale_th: ale_bl_trig, alp_bl_stat, birth_rate ', &
+             WRITE(lunout,*)'alpale_th: ale_bl_trig, alp_bl_stat, birth_rate ', &
                       ale_bl_trig(1), alp_bl_stat(1), birth_rate(1)
           ENDIF
@@ -310 +316 @@
           if (iflag_coupl==2) then
              IF (prt_level .GE. 10) THEN
-                print*,'Couplage Thermiques/Emanuel seulement si T<0'
+                WRITE(lunout,*)'Couplage Thermiques/Emanuel seulement si T<0'
              ENDIF
              do i=1,klon
@@ -317 +323 @@
                 endif
              enddo
-    print *,'In order to run with iflag_coupl=2, you have to comment out the following stop'
-             STOP
+!    print *,'In order to run with iflag_coupl=2, you have to comment out the following stop'
+!             STOP
+             abort_message='In order to run with iflag_coupl=2, you have to comment out the following abort'
+             CALL abort_physic(modname,abort_message,1)
           endif
    RETURN