Changeset 1500

Timestamp:

Mar 15, 2011, 1:19:24 PM (14 years ago)

Author:

Laurent Fairhead

Message:

Modification to take into account precipitation over ice.
The ok_precip_fonte parameter needs to be put to .false. in one of
the *.def files to ensure that the model will give comparable results to
already submitted AR5 simulations

---

Modification pour prendre en compte les précipitations sur la glace.
Pour assurer la continuité avec les simulations AR5 déjà 'soumises', le
paramètre ok_precip_fonte doit être à .false.

Location:

LMDZ4/branches/LMDZ4_AR5/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (4 diffs)
• fonte_neige_mod.F90 (modified) (1 diff)

LMDZ4/branches/LMDZ4_AR5/libf/phylmd/clesphys.h

@@ -69 +69 @@
        LOGICAL :: ok_strato
        LOGICAL :: ok_hines
+       LOGICAL :: ok_precip_fonte
 
        COMMON/clesphys/cycle_diurne, soil_model, new_oliq,              &
@@ -88 +89 @@
      &     , ok_lic_melt, cvl_corr, aer_type                            &
      &     , qsol0, iflag_rrtm, ok_strato,ok_hines,ecrit_LES            &
-     &     , co2_ppm0
+     &     , co2_ppm0, ok_precip_fonte
      
 !$OMP THREADPRIVATE(/clesphys/)

LMDZ4/branches/LMDZ4_AR5/libf/phylmd/conf_phys.F90

@@ -160 +160 @@
   LOGICAL,SAVE      :: carbon_cycle_tr_omp
   LOGICAL,SAVE      :: carbon_cycle_cpl_omp
+  LOGICAL,SAVE :: ok_precip_fonte_omp
 
   integer, intent(out):: read_climoz ! read ozone climatology, OpenMP shared
@@ -1180 +1181 @@
   ok_hfCOSP_omp = .false.
   call getin('ok_hfCOSP',ok_hfCOSP_omp)
+
+!
+!Config Key  = ok_hfCOSP
+!Config Desc =
+!Config Def  = .false.
+!Config Help =
+!
+  ok_precip_fonte_omp = .false.
+  call getin('ok_precip_fonte',ok_precip_fonte_omp)
+
 
 !
@@ -1538 +1549 @@
     ok_journeCOSP = ok_journeCOSP_omp
     ok_hfCOSP = ok_hfCOSP_omp
+    ok_precip_fonte = ok_precip_fonte_omp
     seuil_inversion=seuil_inversion_omp
     lonmin_ins = lonmin_ins_omp
@@ -1691 +1703 @@
   write(numout,*)' ok_journeCOSP = ',ok_journeCOSP
   write(numout,*)' ok_hfCOSP =',ok_hfCOSP
+  write(numout,*)' ok_precip_fonte =',ok_precip_fonte
   write(numout,*)' solarlong0 = ', solarlong0
   write(numout,*)' qsol0 = ', qsol0

LMDZ4/branches/LMDZ4_AR5/libf/phylmd/fonte_neige_mod.F90

@@ -267 +267 @@
                (1. - coeff_rel) * run_off_lic_0(j)
           run_off_lic_0(j) = run_off_lic(i)
-          run_off_lic(i)   = run_off_lic(i) + fqfonte(i)/dtime
+          if (ok_precip_fonte) then
+            run_off_lic(i)   = run_off_lic(i) + fqfonte(i) + precip_rain(i)
+          else
+            run_off_lic(i)   = run_off_lic(i) + fqfonte(i)/dtime
+          endif
        END DO
     ENDIF