Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phylmd/slab_heat_transp_mod.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/slab_heat_transp_mod.F90 (modified) (3 diffs)

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

@@ -83 +83 @@
                                   cu_,cuvsurcv_,cv_,cvusurcu_, &
                                   aire_,apoln_,apols_, &
-                                  aireu_,airev_,rlatv)
-    USE comconst_mod, ONLY: omeg, rad
+                                  aireu_,airev_,rlatv, rad, omeg)
     ! number of points in lon, lat
     IMPLICIT NONE
@@ -104 +103 @@
     REAL,INTENT(IN) :: airev_(ip1jm)
     REAL,INTENT(IN) :: rlatv(nbp_lat-1)
-
+    REAL,INTENT(IN) :: rad
+    REAL,INTENT(IN) :: omeg
+
+    CHARACTER (len = 20) :: modname = 'slab_heat_transp'
+    CHARACTER (len = 80) :: abort_message
+    
     ! Sanity check on dimensions
     if ((ip1jm.ne.((nbp_lon+1)*(nbp_lat-1))).or. &
         (ip1jmp1.ne.((nbp_lon+1)*nbp_lat))) then
-      write(*,*) "ini_slab_transp_geom Error: wrong array sizes"
-      stop
+      abort_message="ini_slab_transp_geom Error: wrong array sizes"
+      CALL abort_physic(modname,abort_message,1)
     endif
 ! Allocations could be done only on master process/thread...
@@ -924 +928 @@
   INTEGER j,ifield,ig
 
+  CHARACTER (len = 20)                      :: modname = 'slab_heat_transp'
+  CHARACTER (len = 80)                      :: abort_message
+
   ! Sanity check:
   IF(klon_glo.NE.2+(jm-2)*(im-1)) THEN
-    WRITE(*,*) "gr_dyn_fi error, wrong sizes"
-    STOP
+    abort_message="gr_dyn_fi error, wrong sizes"
+    CALL abort_physic(modname,abort_message,1)
   ENDIF