Changeset 3641 for LMDZ6/trunk/libf

Timestamp:

Feb 25, 2020, 4:30:43 PM (5 years ago)

Author:

jyg

Message:

Wake.F90 : Reading some population dynamic parameters from .def files

File:

• LMDZ6/trunk/libf/phylmd/wake.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/wake.F90

@@ -317 +317 @@
 
 !!  DATA wapecut, sigmad, hwmin/5., .02, 10./
-  DATA wapecut, sigmad, hwmin/1., .02, 10./
+!!  DATA wapecut, sigmad, hwmin/1., .02, 10./
+  DATA sigmad, hwmin/.02, 10./
 !!  DATA wdensmin/1.e-12/
   DATA wdensmin/1.e-14/
@@ -323 +324 @@
   DATA sigmaw_max/0.4/
   DATA dens_rate/0.1/
-  DATA rzero /5000./
   ! cc
   ! Longueur de maille (en m)
@@ -360 +360 @@
   crep_sol = 1.0
 
-  aa0 = 3.14*rzero*rzero
-
-  tau_cv = 4000.
-
   ! cc nrlmd Lecture du fichier wake_param.data
   stark=0.33
@@ -379 +375 @@
   CALL getin_p('wdens_ref_l',wdens_ref(2))    !wake number per unit area ; land
 !>jyg
+!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!  Population dynamics parameters    !!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!------------------------------------------------------------------------ 
+
   iflag_wk_pop_dyn = 0
   CALL getin_p('iflag_wk_pop_dyn',iflag_wk_pop_dyn) ! switch between wdens prescribed 
@@ -386 +387 @@
                                             ! 1: act(:)=1.
                                             ! 2: act(:)=f(Wape)
+  wapecut = 1.
+  CALL getin_p('wapecut', wapecut)
+!
+  rzero = 5000.
+  CALL getin_p('rzero_wk', rzero)
+  aa0 = 3.14*rzero*rzero
+!
+  tau_cv = 4000.
+  CALL getin_p('tau_cv', tau_cv)
+
+!------------------------------------------------------------------------ 
+
   coefgw=4.
   CALL getin_p('coefgw',coefgw)