Changeset 699 for LMDZ4/trunk

Timestamp:

May 9, 2006, 11:46:14 AM (19 years ago)

Author:

Laurent Fairhead

Message:

En fait le bug sur l'ozone n'en etait pas un! on revient a la situation precedente MPL/JLD
LF

Location:

LMDZ4/trunk/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (2 diffs)
• ozonecm.F (modified) (1 diff)
• radlwsw.F (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/clesphys.h

@@ -6 +6 @@
        LOGICAL cycle_diurne,soil_model,new_oliq,ok_orodr,ok_orolf 
        LOGICAL ok_limitvrai
-       LOGICAL bug_ozone
        INTEGER nbapp_rad, iflag_con
        REAL co2_ppm, solaire
@@ -41 +40 @@
      S     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins
      S     , ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day
-     S     , ecrit_mth, ecrit_tra, ecrit_reg, bug_ozone
+     S     , ecrit_mth, ecrit_tra, ecrit_reg
      S     , freqin_isccp, freqout_isccp, ip_ebil_phy
      S     , ok_slab_sicOBS

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -666 +666 @@
   call getin('ecrit_reg',ecrit_reg)
 !
-!
-!
-!Config Key  = bug_ozone
-!Config Desc = Pour retrouver le bug de l'ozone (IPCC), mettre a true
-!Config Def  = false
-!Config Help =
-!
-  bug_ozone = .false.
-  call getin('bug_ozone',bug_ozone)
 !
 !
@@ -744 +735 @@
   write(numout,*)' ecrit_ hf, day, mth, reg',&
  & ecrit_hf, ecrit_day, ecrit_mth, ecrit_reg
-  write(numout,*)' bug_ozone = ', bug_ozone
   return
 

LMDZ4/trunk/libf/phylmd/ozonecm.F

@@ -81 +81 @@
         DO i = 1, klon
           o3(i,k) = field(i,k) - field(i,k+1)
-          IF (.not. bug_ozone) then
-c         convert o3 into kg/kg         
-            o3(i,k)=MAX(o3(i,k),1.0e-12)*RG/46.6968
-     .               /(paprs(i,k)-paprs(i,k+1))
-          ENDIF
         ENDDO
       ENDDO

LMDZ4/trunk/libf/phylmd/radlwsw.F

@@ -238 +238 @@
 c wo:    cm.atm (epaisseur en cm dans la situation standard)
 c POZON: kg/kg
-         IF (bug_ozone) then
-           POZON(i,k) = MAX(wo(iof+i,k),1.0e-12)*RG/46.6968
+         POZON(i,k) = MAX(wo(iof+i,k),1.0e-12)*RG/46.6968
      .               /(paprs(iof+i,k)-paprs(iof+i,k+1))
      .               *(paprs(iof+i,1)/101325.0)
-         ELSE
-c le calcul qui suit est maintenant fait dans ozonecm (MPL)
-           POZON(i,k) = wo(i,k)
-         ENDIF
          PCLDLD(i,k) = cldfra(iof+i,k)*cldemi(iof+i,k)
          PCLDLU(i,k) = cldfra(iof+i,k)*cldemi(iof+i,k)
@@ -555 +550 @@
       DO JL = 1, KDLON
          ZCLDSW0(JL,JK) = 0.0
-         IF (bug_ozone) then
-           ZOZ(JL,JK) = POZON(JL,JK)*46.6968/RG
+         ZOZ(JL,JK) = POZON(JL,JK)*46.6968/RG
      .               *PDP(JL,JK)*(101325.0/PPSOL(JL))
-         ELSE
-c        Correction MPL 100505
-           ZOZ(JL,JK) = POZON(JL,JK)*RMD/RMO3*46.6968/RG*PDP(JL,JK)
-         ENDIF           
       ENDDO
       ENDDO