Changeset 4189

Timestamp:

Dec 19, 2019, 11:18:28 PM (5 years ago)

Author:

dubos

Message:

simple_physics : cleanup

Location:

dynamico_lmdz/simple_physics/phyparam

Files:

• param/iniphyparam.F (modified) (1 diff)
• param/paramdef.F (modified) (1 diff)
• physics/planet.F90 (modified) (1 diff)
• physics/vdif_mod.F90 (modified) (7 diffs)

dynamico_lmdz/simple_physics/phyparam/param/iniphyparam.F

@@ -11 +11 @@
       use comsaison
       USE geometry_mod, ONLY : longitude,latitude,cell_area
-      USE phys_const
-      USE planet
-
+      USE phys_const, ONLY : pi,rad,g,r,cpp,rcp,dtphys,unjours,mugaz
+      USE planet, ONLY : coefir, coefvis
+      USE planet, ONLY : aphelie, periheli, peri_day, obliquit, year_day
+      USE vdif_mod, ONLY : lmixmin, emin_turb 
       IMPLICIT NONE
 

dynamico_lmdz/simple_physics/phyparam/param/paramdef.F

@@ -1 +1 @@
       SUBROUTINE paramdef(ngrid,rnatur,albedo,inertie,emissiv,z0)
-      USE  comgeomfi, ONLY : lati,sinlat,coslat
-      USE planet
+      USE comgeomfi, ONLY : lati,sinlat,coslat
+      USE vdif_mod, ONLY : lmixmin, emin_turb
+      USE planet, ONLY : coefir, coefvis
+      USE planet, ONLY : aphelie, periheli, obliquit, peri_day, year_day
       IMPLICIT NONE
 c-----------------------------------------------------------------------

dynamico_lmdz/simple_physics/phyparam/physics/planet.F90

@@ -4 +4 @@
 
   REAL :: aphelie, periheli, year_day, peri_day, obliquit, &
-       coefvis, coefir, &
-       lmixmin=100., emin_turb=1e-8
+       coefvis, coefir
   
 END MODULE planet

dynamico_lmdz/simple_physics/phyparam/physics/vdif_mod.F90

@@ -5 +5 @@
   
   REAL, PARAMETER :: karman=0.4
-  
-  PUBLIC :: vdif
+  REAL :: lmixmin=100., emin_turb=1e-8  
+
+  PUBLIC :: vdif, lmixmin, emin_turb
   
 CONTAINS
   
-  SUBROUTINE vdif_cd( ngrid,pz0,pg,pz,pu,pv,pts,ph,pcdv,pcdh)
+  PURE SUBROUTINE vdif_cd( ngrid,pz0,pg,pz,pu,pv,pts,ph,pcdv,pcdh)
     !=======================================================================
     !
@@ -25 +26 @@
     !   ------
     !     ngrid            size of the horizontal grid
+    !     pz0(ngrid)       roughness length ?
     !     pg               gravity (m s -2)
     !     pz(ngrid)        height of the first atmospheric layer
@@ -46 +48 @@
     !   ----------
     
-    INTEGER ngrid,nlay
-    REAL pz0(ngrid)
-    REAL pg,pz(ngrid)
-    REAL pu(ngrid),pv(ngrid)
-    REAL pts(ngrid),ph(ngrid)
-    REAL pcdv(ngrid),pcdh(ngrid)
+    INTEGER, INTENT(IN) ::  ngrid
+    REAL, INTENT(IN)  ::  pg, pz0(ngrid), pz(ngrid), &
+         pu(ngrid),pv(ngrid), pts(ngrid),ph(ngrid)
+    REAL, INTENT(OUT) :: pcdv(ngrid),pcdh(ngrid)
     
     !   Local:
@@ -58 +58 @@
     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 zu2,z1,zri,zcd0,zz    
     
     !-----------------------------------------------------------------------
@@ -98 +95 @@
   END SUBROUTINE vdif_cd
   
-  
-  SUBROUTINE vdif_k(ngrid,nlay,   &
-       ptimestep,pg,pzlev,pzlay,pz0,pu,pv,ph,pcdv,pkv,pkh)
+  PURE SUBROUTINE vdif_k(ngrid,nlay,   &
+       ptimestep,pg,pzlev,pzlay,pz0,pu,pv,ph,pkv,pkh)
     ! FIXME : pkh := pkv
     USE planet
-    INTEGER ngrid,nlay
-    REAL ptimestep
-    REAL pzlay(ngrid,nlay),pzlev(ngrid,nlay+1)
-    REAL pz0(ngrid)
-    REAL pu(ngrid,nlay),pv(ngrid,nlay),ph(ngrid,nlay)
-    REAL pg,pcdv(ngrid)
-    REAL pkv(ngrid,nlay+1),pkh(ngrid,nlay+1)
+    INTEGER, INTENT(IN) :: ngrid,nlay
+    REAL, INTENT(IN) ::  ptimestep, pg, &
+         pzlay(ngrid,nlay),pzlev(ngrid,nlay+1), pz0(ngrid), &
+         pu(ngrid,nlay),pv(ngrid,nlay),ph(ngrid,nlay)
+    REAL, INTENT(OUT) :: pkv(ngrid,nlay+1),pkh(ngrid,nlay+1)
     
     INTEGER ig,il
     REAL zdu,zdv,zri,zdvodz2,zdz,z1,lmix
     
-    print*,'LMIXMIN',lmixmin
     DO ig=1,ngrid
        pkv(ig,1)=0.
@@ -285 +278 @@
     !
     CALL vdif_cd( ngrid,pz0,g,pzlay,pu,pv,ptsrf,ph,zcdv,zcdh)
-    CALL vdif_k(ngrid,nlay,ptimestep,g,pzlev,pzlay,pz0,pu,pv,ph,zcdv,zkv,zkh)
+    CALL vdif_k(ngrid,nlay,ptimestep,g,pzlev,pzlay,pz0,pu,pv,ph,zkv,zkh)
     
     DO ig=1,ngrid
@@ -296 +289 @@
        PRINT*
        PRINT*,'Diagnostique diffusion verticale'
+       print*,'LMIXMIN',lmixmin
        PRINT*,'coefficients Cd pour v et h'
        PRINT*,zcdv(ngrid/2+1),zcdh(ngrid/2+1)