Changeset 4187

Timestamp:

Dec 19, 2019, 10:26:38 PM (5 years ago)

Author:

dubos

Message:

simple_physics : cleanup

Location:

dynamico_lmdz/simple_physics/phyparam

Files:

• param/vdif.F (modified) (1 diff)
• physics/planet.F90 (modified) (1 diff)
• physics/vdif_mod.F90 (modified) (4 diffs)

dynamico_lmdz/simple_physics/phyparam/param/vdif.F

@@ -7 +7 @@
      $                lwrite)
       USE phys_const
-      USE planet, ONLY : karman
       USE vdif_mod
       IMPLICIT NONE

dynamico_lmdz/simple_physics/phyparam/physics/planet.F90

@@ -7 +7 @@
        lmixmin=100., emin_turb=1e-8
   
-  REAL, PARAMETER :: karman=0.4
-
 END MODULE planet

dynamico_lmdz/simple_physics/phyparam/physics/vdif_mod.F90

@@ -2 +2 @@
   IMPLICIT NONE
   SAVE
+  PRIVATE
 
+  REAL, PARAMETER :: karman=0.4
+
+  PUBLIC :: vdif_cd, vdif_k
+  
 CONTAINS
 
   SUBROUTINE vdif_cd( ngrid,pz0,pg,pz,pu,pv,pts,ph,pcdv,pcdh)
-    USE planet, ONLY : karman
     !=======================================================================
     !
@@ -52 +56 @@
     !   ------
     
+    REAL, PARAMETER :: b=5., c=5., d=5., umin2=1e-12, &
+         c2b=2.*b, c3bc=3.*b*c, c3b=3.*b
+  
     INTEGER ig
     
     REAL zu2,z1,zri,zcd0,zz
     
-    REAL b,c,d,c2b,c3bc,c3b,z0,umin2
-    LOGICAL firstcal
-    DATA b,c,d,umin2/5.,5.,5.,1.e-12/
-    DATA firstcal/.true./
-    SAVE b,c,d,c2b,c3bc,c3b,firstcal,umin2
     
     !-----------------------------------------------------------------------
@@ -73 +75 @@
     !     RETURN
     
-    IF (firstcal) THEN
-       c2b=2.*b
-       c3bc=3.*b*c
-       c3b=3.*b
-       firstcal=.false.
-    ENDIF
     
 !!!! WARNING, verifier la formule originale de Louis!
@@ -106 +102 @@
   SUBROUTINE vdif_k(ngrid,nlay,   &
        ptimestep,pg,pzlev,pzlay,pz0,pu,pv,ph,pcdv,pkv,pkh)
-    ! FIXME : pkh :: pkv
+    ! FIXME : pkh := pkv
     USE planet
     INTEGER ngrid,nlay