Changeset 1204 for LMDZ4/branches

Timestamp:

Jul 7, 2009, 5:04:03 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Nettoyage du contrôle des coefficients de frottement en surface séparément
sur terre et sur océan (disparition de f_cdrag_stable)
PasB

Location:

LMDZ4/branches/LMDZ4-dev/libf/phylmd

Files:

• clcdrag.F90 (modified) (2 diffs)
• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (4 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/clcdrag.F90

@@ +1 @@
+!
+!$Id$
 !
 SUBROUTINE clcdrag(knon, nsrf, paprs, pplay,&
@@ -93 +95 @@
            FRIH = AMAX1(1./ (1.+3.*CB*zri(i)*ZSCF), 0.1 )
 !!$  PB          zcfh1(i) = zcdn(i) * FRIH
-           zcfh1(i) = f_cdrag_stable * zcdn(i) * FRIH
+!!$ PB           zcfh1(i) = f_cdrag_stable * zcdn(i) * FRIH
+           zcfh1(i) = f_cdrag_ter * zcdn(i) * FRIH
+           IF(nsrf.EQ.is_oce) zcfh1(i) = f_cdrag_oce * zcdn(i) * FRIH
+!!$ PB
            pcfm(i) = zcfm1(i)
            pcfh(i) = zcfh1(i)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/clesphys.h

@@ -36 +36 @@
            REAL qsol0
 ! Frottement au sol (Cdrag)
-       Real f_cdrag_stable,f_cdrag_ter,f_cdrag_oce
+       Real f_cdrag_ter,f_cdrag_oce
 ! Rugoro
        Real f_rugoro
@@ -63 +63 @@
      &     , top_height, overlap, cdmmax, cdhmax, ksta, ksta_ter        &
      &     , ok_kzmin, fmagic, pmagic                                   &
-     &     , f_cdrag_stable,f_cdrag_ter,f_cdrag_oce,f_rugoro            &
+     &     , f_cdrag_ter,f_cdrag_oce,f_rugoro                           &
      &     , lev_histhf, lev_histday, lev_histmth                       &
      &     , type_run, ok_isccp, ok_regdyn                              &

LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90

@@ -85 +85 @@
   integer,SAVE        :: iflag_ratqs_omp
 
-  Real,SAVE           :: f_cdrag_stable_omp,f_cdrag_ter_omp,f_cdrag_oce_omp
+  Real,SAVE           :: f_cdrag_ter_omp,f_cdrag_oce_omp
   Real,SAVE           :: f_rugoro_omp   
 
@@ -1115 +1115 @@
 !
 ! PARAMETRES CDRAG
-!
-!Config Key  = f_cdrag_stable
-!Config Desc =
-!Config Def  = 0.8
-!Config Help =
-!
-  f_cdrag_stable_omp = 0.8
-  call getin('f_cdrag_stable',f_cdrag_stable_omp)
 !
 !Config Key  = f_cdrag_ter
@@ -1385 +1377 @@
     cvl_corr = cvl_corr_omp
     ok_lic_melt = ok_lic_melt_omp
-    f_cdrag_stable=f_cdrag_stable_omp
     f_cdrag_ter=f_cdrag_ter_omp
     f_cdrag_oce=f_cdrag_oce_omp
@@ -1512 +1503 @@
   write(numout,*)' inertie_ice = ', inertie_ice
   write(numout,*)' inertie_sno = ', inertie_sno
-  write(numout,*)' f_cdrag_stable = ',f_cdrag_stable
   write(numout,*)' f_cdrag_ter = ',f_cdrag_ter
   write(numout,*)' f_cdrag_oce = ',f_cdrag_oce