Changeset 1406 for LMDZ4

Timestamp:

Jul 5, 2010, 11:32:26 AM (14 years ago)

Author:

Laurent Fairhead

Message:

Modifications to the etat0_netcdf routines from r1370 and r1379 were not
taken into account by the recent merge between the trunk and the dev branch

---

Des modification aux routines etat0_netcdf venant des révisions r1370 et r1379
n'ont pas été prises en compte par la dernière fusion entre le tronc et la
branche de développement

LG

Location:

LMDZ4/trunk/libf

Files:

• dyn3d/etat0_netcdf.F90 (modified) (5 diffs)
• dyn3dpar/etat0_netcdf.F90 (modified) (4 diffs)

LMDZ4/trunk/libf/dyn3d/etat0_netcdf.F90

@@ -23 +23 @@
   USE regr_lat_time_climoz_m, ONLY: regr_lat_time_climoz
   USE conf_phys_m,            ONLY: conf_phys
+! For parameterization of ozone chemistry:
+  use regr_lat_time_coefoz_m, only: regr_lat_time_coefoz
+  use press_coefoz_m, only: press_coefoz
+  use regr_pr_o3_m, only: regr_pr_o3
   USE netcdf, ONLY : NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR
 #endif
@@ -102 +106 @@
   INTEGER :: iflag_thermals_ed, iflag_thermals_optflux
   REAL    :: tau_thermals, solarlong0,  seuil_inversion
-  INTEGER :: read_climoz ! read ozone climatology
-  REAL    :: alp_offset
+  INTEGER :: read_climoz ! read ozone climatology 
 !  Allowed values are 0, 1 and 2
 !     0: do not read an ozone climatology
@@ -110 +113 @@
 !     climatology and the daylight climatology
 !-------------------------------------------------------------------------------
+  REAL    :: alp_offset
+  logical found
+
 !--- Constants
   pi     = 4. * ATAN(1.)
@@ -285 +291 @@
   q3d(:,:,:,:) = 0.0 ; q3d(:,:,:,1) = qd(:,:,:)
 
+!     Parameterization of ozone chemistry:
+!     Look for ozone tracer:
+      i = 1
+      DO
+         found = tname(i)=="O3" .OR. tname(i)=="o3"
+         if (found .or. i == nqtot) exit
+         i = i + 1
+      end do
+      if (found) then
+         call regr_lat_time_coefoz
+         call press_coefoz
+         call regr_pr_o3(p3d, q3d(:, :, :, i))
+!     Convert from mole fraction to mass fraction:
+         q3d(:, :, :, i) = q3d(:, :, :, i)  * 48. / 29.
+      end if
+
 !--- OZONE CLIMATOLOGY
   IF(read_climoz>=1) CALL regr_lat_time_climoz(read_climoz)
@@ -483 +505 @@
   wake_cstar(:) = 0.
   wake_fip(:) = 0.
+  wake_pe = 0.
+  fm_therm = 0.
+  entr_therm = 0.
+  detr_therm = 0.
+
   CALL fonte_neige_init(run_off_lic_0)
   CALL pbl_surface_init( qsol, fder, snsrf, qsolsrf, evap, frugs, agesno, tsoil )

LMDZ4/trunk/libf/dyn3dpar/etat0_netcdf.F90

@@ -22 +22 @@
   USE regr_lat_time_climoz_m, ONLY: regr_lat_time_climoz
   USE conf_phys_m,            ONLY: conf_phys
+! For parameterization of ozone chemistry:
+  use regr_lat_time_coefoz_m, only: regr_lat_time_coefoz
+  use press_coefoz_m, only: press_coefoz
+  use regr_pr_o3_m, only: regr_pr_o3
   USE netcdf, ONLY : NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR
 #endif
@@ -103 +107 @@
   REAL    :: tau_thermals, solarlong0,  seuil_inversion
   INTEGER :: read_climoz ! read ozone climatology
-  REAL    :: alp_offset
 !  Allowed values are 0, 1 and 2
 !     0: do not read an ozone climatology
@@ -110 +113 @@
 !     climatology and the daylight climatology
 !-------------------------------------------------------------------------------
+  REAL    :: alp_offset
+  LOGICAL found
+
 !--- Constants
   pi     = 4. * ATAN(1.)
@@ -285 +291 @@
   q3d(:,:,:,:) = 0.0 ; q3d(:,:,:,1) = qd(:,:,:)
 
+! Parameterization of ozone chemistry:
+! Look for ozone tracer:
+  i = 1
+  DO
+    found = tname(i)=="O3" .OR. tname(i)=="o3"
+    if (found .or. i == nqtot) exit
+    i = i + 1
+  end do
+  if (found) then
+    call regr_lat_time_coefoz
+    call press_coefoz
+    call regr_pr_o3(p3d, q3d(:, :, :, i))
+!   Convert from mole fraction to mass fraction:
+    q3d(:, :, :, i) = q3d(:, :, :, i)  * 48. / 29.
+  end if
+
 !--- OZONE CLIMATOLOGY
   IF(read_climoz>=1) CALL regr_lat_time_climoz(read_climoz)