Changeset 1669 for LMDZ5/branches/testing/libf/phylmd/conf_phys.F90

Timestamp:

Oct 16, 2012, 2:41:50 PM (12 years ago)

Author:

Laurent Fairhead

Message:

Version testing basée sur la r1668

http://lmdz.lmd.jussieu.fr/utilisateurs/distribution-du-modele/versions-intermediaires

---

Testing release based on r1668

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys.F90 (modified) (7 diffs)

LMDZ5/branches/testing/libf/phylmd/conf_phys.F90

@@ -110 +110 @@
   integer,SAVE :: iflag_thermals_omp,nsplit_thermals_omp
   real,save :: tau_thermals_omp,alp_bl_k_omp
+!!! nrlmd le 10/04/2012
+  integer,SAVE :: iflag_trig_bl_omp,iflag_clos_bl_omp
+  integer,SAVE :: tau_trig_shallow_omp,tau_trig_deep_omp
+  real,SAVE    :: s_trig_omp
+!!! fin nrlmd le 10/04/2012
   real :: alp_offset
   REAL, SAVE :: alp_offset_omp
@@ -282 +287 @@
 !Config Help = Used in physiq.F
 !
+! - flag_aerosol=0 => no aerosol
 ! - flag_aerosol=1 => so4 only (defaut) 
 ! - flag_aerosol=2 => bc  only 
@@ -289 +295 @@
 ! - flag_aerosol=6 => all aerosol
 
-  flag_aerosol_omp = 1
+  flag_aerosol_omp = 0
   CALL getin('flag_aerosol',flag_aerosol_omp)
 
@@ -1083 +1089 @@
   alp_bl_k_omp = 1.
   call getin('alp_bl_k',alp_bl_k_omp)
+
+!!! nrlmd le 10/04/2012
+
+!Config Key  = iflag_trig_bl
+!Config Desc =  
+!Config Def  = 0
+!Config Help = 
+!
+  iflag_trig_bl_omp = 0
+  call getin('iflag_trig_bl',iflag_trig_bl_omp)
+
+!Config Key  = s_trig_bl
+!Config Desc =  
+!Config Def  = 0
+!Config Help = 
+!
+  s_trig_omp = 2e7
+  call getin('s_trig',s_trig_omp)
+
+!Config Key  = tau_trig_shallow
+!Config Desc =  
+!Config Def  = 0
+!Config Help = 
+!
+  tau_trig_shallow_omp = 600
+  call getin('tau_trig_shallow',tau_trig_shallow_omp)
+
+!Config Key  = tau_trig_deep
+!Config Desc =  
+!Config Def  = 0
+!Config Help = 
+!
+  tau_trig_deep_omp = 1800
+  call getin('tau_trig_deep',tau_trig_deep_omp)
+
+!Config Key  = iflag_clos_bl
+!Config Desc =  
+!Config Def  = 0
+!Config Help = 
+!
+  iflag_clos_bl_omp = 0
+  call getin('iflag_clos_bl',iflag_clos_bl_omp)
+
+!!! fin nrlmd le 10/04/2012
 
 !
@@ -1650 +1700 @@
     tau_thermals = tau_thermals_omp
     alp_bl_k = alp_bl_k_omp
+!!! nrlmd le 10/04/2012
+    iflag_trig_bl = iflag_trig_bl_omp
+    s_trig = s_trig_omp
+    tau_trig_shallow = tau_trig_shallow_omp
+    tau_trig_deep = tau_trig_deep_omp
+    iflag_clos_bl = iflag_clos_bl_omp
+!!! fin nrlmd le 10/04/2012
     iflag_coupl = iflag_coupl_omp
     iflag_clos = iflag_clos_omp
@@ -1710 +1767 @@
 ! il n'est utilisable que lors du couplage avec le SO4 seul 
     IF (ok_ade .OR. ok_aie) THEN 
+       IF ( flag_aerosol .EQ. 0 ) THEN
+          CALL abort_gcm('conf_phys','flag_aerosol=0 not compatible avec ok_ade ou ok_aie=.TRUE.',1)
+       END IF
        IF ( .NOT. new_aod .AND.  flag_aerosol .NE. 1) THEN
           CALL abort_gcm('conf_phys','new_aod=.FALSE. not compatible avec flag_aerosol=1',1)
@@ -1839 +1899 @@
   write(lunout,*)' iflag_wake = ', iflag_wake
   write(lunout,*)' alp_offset = ', alp_offset
+!!! nrlmd le 10/04/2012
+  write(lunout,*)' iflag_trig_bl = ', iflag_trig_bl
+  write(lunout,*)' s_trig = ', s_trig
+  write(lunout,*)' tau_trig_shallow = ', tau_trig_shallow
+  write(lunout,*)' tau_trig_deep = ', tau_trig_deep
+  write(lunout,*)' iflag_clos_bl = ', iflag_clos_bl
+!!! fin nrlmd le 10/04/2012
 
   write(lunout,*)' lonmin lonmax latmin latmax bilKP_ins =',&