Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (15 diffs)

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

@@ -86 +86 @@
     logical,SAVE              :: ok_snow_omp
     logical,SAVE              :: ok_newmicro_omp
+    logical,SAVE              :: ok_all_xml_omp
     logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
     logical,SAVE        :: ok_LES_omp   
@@ -99 +100 @@
     real,SAVE           :: ratqshaut_omp
     real,SAVE           :: tau_ratqs_omp
+    REAL, SAVE          :: t_coupl_omp
     integer,SAVE        :: iflag_radia_omp
     integer,SAVE        :: iflag_rrtm_omp
@@ -158 +160 @@
     REAL,SAVE :: solarlong0_omp
     INTEGER,SAVE :: top_height_omp,overlap_omp
-    REAL,SAVE :: cdmmax_omp,cdhmax_omp,ksta_omp,ksta_ter_omp
+    REAL,SAVE :: cdmmax_omp,cdhmax_omp,ksta_omp,ksta_ter_omp,f_ri_cd_min_omp
     LOGICAL,SAVE :: ok_kzmin_omp
     REAL, SAVE ::  fmagic_omp, pmagic_omp
@@ -186 +188 @@
     LOGICAL,SAVE :: ok_strato_omp
     LOGICAL,SAVE :: ok_hines_omp, ok_gwd_rando_omp
-    real, SAVE:: RUWMAX_omp, sat_omp
+    real, SAVE:: GWD_RANDO_RUWMAX_omp, gwd_rando_sat_omp
+    LOGICAL,SAVE :: ok_qch4_omp
     LOGICAL,SAVE      :: carbon_cycle_tr_omp
     LOGICAL,SAVE      :: carbon_cycle_cpl_omp
@@ -229 +232 @@
        CALL abort_gcm('conf_phys','Variable OCEAN no longer existing, use variable name type_ocean',1)
     END IF
+
+    !Config Key  = t_coupl
+    !Config Desc = Pas de temps du couplage atm/oce en sec.
+    !Config Def  = 86400
+    !Config Help = This is only for testing purpose
+    !
+    t_coupl_omp = 86400.
+    call getin('t_coupl', t_coupl_omp)
+    IF (t_coupl_omp == 0) THEN
+       WRITE(lunout,*)'ERROR! Timestep of coupling between atmosphere and ocean'
+       WRITE(lunout,*)'cannot be zero.'
+       CALL abort_gcm('conf_phys','t_coupl = 0.',1)
+    END IF
+
+    !
+    !Config Key  = ok_all_xml 
+    !Config Desc = utiliser les xml pourles définitions des champs pour xios
+    !Config Def  = .false.
+    !Config Help = 
+    !
+    ok_all_xml_omp = .false.
+    call getin('ok_all_xml', ok_all_xml_omp)
+    !
 
     !
@@ -1118 +1144 @@
     call getin('ksta_ter',ksta_ter_omp)
 
+    !Config Key  = f_ri_cd_min
+    !Config Desc =
+    !Config Def  = 0.1
+    !Config Help =
+    !
+    f_ri_cd_min_omp = 0.1
+    call getin('f_ri_cd_min',f_ri_cd_min_omp)
+
     !
     !Config Key  = ok_kzmin
@@ -1668 +1702 @@
     !Config  Desc = activation de la version strato
     !Config  Def  = .FALSE.
-    !Config  Help = active la version stratosphérique de LMDZ de F. Lott
+    !Config  Help = active la version stratosph\'erique de LMDZ de F. Lott
 
     ok_strato_omp=.FALSE.
@@ -1687 +1721 @@
     CALL getin('ok_gwd_rando', ok_gwd_rando_omp)
 
-    RUWMAX_omp = 0.01
-    CALL getin('ruwmax', RUWMAX_omp)
-
-    sat_omp = 0.25
-    CALL getin('sat', sat_omp)
+    GWD_RANDO_RUWMAX_omp = 0.01
+    CALL getin('gwd_rando_ruwmax', GWD_RANDO_RUWMAX_omp)
+
+    gwd_rando_sat_omp = 0.25
+    CALL getin('gwd_rando_sat', gwd_rando_sat_omp)
+
+    !Config  key = ok_qch4
+    !Config  Desc = activation de la parametrisation du methane
+    !Config  Def  = .FALSE.
+    !Config  Help = Clef controlant l'activation de la parametrisation
+    !               de l'humidite due a oxydation+photolyse du methane strato
+
+    ok_qch4_omp=.FALSE.
+    CALL getin('ok_qch4',ok_qch4_omp)
 
     !Config Key  = OK_LES                                               
@@ -1806 +1849 @@
     ksta = ksta_omp
     ksta_ter = ksta_ter_omp
+    f_ri_cd_min = f_ri_cd_min_omp
     ok_kzmin = ok_kzmin_omp
     fmagic = fmagic_omp
@@ -1823 +1867 @@
     type_ocean = type_ocean_omp
     version_ocean = version_ocean_omp
+    t_coupl = t_coupl_omp
 
     ok_veget=.true.
@@ -1834 +1879 @@
     ! Martin
 
+    ok_all_xml = ok_all_xml_omp
     ok_newmicro = ok_newmicro_omp
     ok_journe = ok_journe_omp
@@ -1917 +1963 @@
     ok_hines = ok_hines_omp
     ok_gwd_rando = ok_gwd_rando_omp
-    RUWMAX = RUWMAX_omp
-    sat = sat_omp
+    GWD_RANDO_RUWMAX = GWD_RANDO_RUWMAX_omp
+    gwd_rando_sat = gwd_rando_sat_omp
+    ok_qch4 = ok_qch4_omp
     ok_LES = ok_LES_omp
     callstats = callstats_omp
@@ -1963 +2010 @@
     write(lunout,*)' Config veget = ', ok_veget,type_veget
     write(lunout,*)' Snow model SISVAT : ok_snow = ', ok_snow
+    write(lunout,*)' Config xml pour XIOS : ok_all_xml = ', ok_all_xml
     write(lunout,*)' Sortie journaliere = ', ok_journe
     write(lunout,*)' Sortie haute frequence = ', ok_hf
@@ -2038 +2086 @@
     write(lunout,*)' ksta = ',ksta 
     write(lunout,*)' ksta_ter = ',ksta_ter 
+    write(lunout,*)' f_ri_cd_min = ',f_ri_cd_min 
     write(lunout,*)' ok_kzmin = ',ok_kzmin 
     write(lunout,*)' fmagic = ',fmagic
@@ -2109 +2158 @@
     write(lunout,*) 'ok_hines = ',  ok_hines
     write(lunout,*) 'ok_gwd_rando = ',  ok_gwd_rando
-    write(lunout,*) 'RUWMAX = ', RUWMAX
-    write(lunout,*) 'sat = ', sat
+    write(lunout,*) 'ok_qch4 = ',  ok_qch4
+    write(lunout,*) 'GWD_RANDO_RUWMAX = ', GWD_RANDO_RUWMAX
+    write(lunout,*) 'gwd_rando_sat = ', gwd_rando_sat
     write(lunout,*) 'read_climoz = ', read_climoz
     write(lunout,*) 'carbon_cycle_tr = ', carbon_cycle_tr