Changeset 2585 for LMDZ5/trunk/libf/phylmd

Timestamp:

Jul 1, 2016, 2:53:50 PM (9 years ago)

Author:

idelkadi

Message:

Corrections des erreurs pour l'implementation du simulateur AIRS

Location:

LMDZ5/trunk/libf/phylmd

Files:

• phys_output_var_mod.F90 (modified) (6 diffs)
• simu_airs.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_var_mod.F90

@@ -16 +16 @@
   INTEGER, SAVE, ALLOCATABLE ::  itau_con(:)       ! Nombre de pas ou rflag <= 1
   !$OMP THREADPRIVATE(itau_con)
-  REAL, ALLOCATABLE :: bils_ec(:) ! Contribution of energy conservation
-  REAL, ALLOCATABLE :: bils_ech(:) ! Contribution of energy conservation
-  REAL, ALLOCATABLE :: bils_tke(:) ! Contribution of energy conservation
-  REAL, ALLOCATABLE :: bils_diss(:) ! Contribution of energy conservation
-  REAL, ALLOCATABLE :: bils_kinetic(:) ! bilan de chaleur au sol, kinetic
-  REAL, ALLOCATABLE :: bils_enthalp(:) ! bilan de chaleur au sol
-  REAL, ALLOCATABLE :: bils_latent(:) ! bilan de chaleur au sol
+  REAL, SAVE, ALLOCATABLE :: bils_ec(:) ! Contribution of energy conservation
+  REAL, SAVE, ALLOCATABLE :: bils_ech(:) ! Contribution of energy conservation
+  REAL, SAVE, ALLOCATABLE :: bils_tke(:) ! Contribution of energy conservation
+  REAL, SAVE, ALLOCATABLE :: bils_diss(:) ! Contribution of energy conservation
+  REAL, SAVE, ALLOCATABLE :: bils_kinetic(:) ! bilan de chaleur au sol, kinetic
+  REAL, SAVE, ALLOCATABLE :: bils_enthalp(:) ! bilan de chaleur au sol
+  REAL, SAVE, ALLOCATABLE :: bils_latent(:) ! bilan de chaleur au sol
   !$OMP THREADPRIVATE(bils_ec,bils_ech,bils_tke,bils_diss,bils_kinetic,bils_enthalp,bils_latent)
 
@@ -28 +28 @@
 ! Variables de sortie du simulateur AIRS
 
-  REAL, ALLOCATABLE :: map_prop_hc(:),map_prop_hist(:)
-  REAL, ALLOCATABLE :: alt_tropo(:)
-  REAL, ALLOCATABLE :: &
-     & map_emis_hc(:),map_iwp_hc(:),map_deltaz_hc(:),&
-     & map_pcld_hc(:),map_tcld_hc(:)
-  REAL, ALLOCATABLE :: map_emis_hist(:),map_iwp_hist(:),map_deltaz_hist(:),&
-     & map_rad_hist(:)
-  REAL, ALLOCATABLE :: map_ntot(:),map_hc(:),map_hist(:)
-  REAL, ALLOCATABLE :: map_Cb(:),map_ThCi(:),map_Anv(:)
-  REAL, ALLOCATABLE :: map_emis_Cb(:),map_pcld_Cb(:),map_tcld_Cb(:)
-  REAL, ALLOCATABLE :: map_emis_ThCi(:),map_pcld_ThCi(:),map_tcld_ThCi(:)
-  REAL, ALLOCATABLE :: map_emis_Anv(:),map_pcld_Anv(:),map_tcld_Anv(:)
-
+  REAL, SAVE, ALLOCATABLE :: map_prop_hc(:),map_prop_hist(:),alt_tropo(:)
+  !$OMP THREADPRIVATE(map_prop_hc,map_prop_hist,alt_tropo)
+  REAL, SAVE, ALLOCATABLE :: map_emis_hc(:),map_iwp_hc(:),map_deltaz_hc(:), &
+                       map_pcld_hc(:),map_tcld_hc(:)
+  !$OMP THREADPRIVATE(map_emis_hc,map_iwp_hc,map_deltaz_hc,map_pcld_hc,map_tcld_hc)
+  REAL, SAVE, ALLOCATABLE :: map_emis_hist(:),map_iwp_hist(:),map_deltaz_hist(:),map_rad_hist(:)         
+  !$OMP THREADPRIVATE(map_emis_hist,map_iwp_hist,map_deltaz_hist,map_rad_hist)
+  REAL, SAVE, ALLOCATABLE :: map_ntot(:),map_hc(:),map_hist(:)
+  REAL, SAVE, ALLOCATABLE :: map_Cb(:),map_ThCi(:),map_Anv(:)
+  !$OMP THREADPRIVATE(map_ntot,map_hc,map_hist,map_Cb,map_ThCi,map_Anv)
+  REAL, SAVE, ALLOCATABLE :: map_emis_Cb(:),map_pcld_Cb(:),map_tcld_Cb(:)
+  REAL, SAVE, ALLOCATABLE :: map_emis_ThCi(:),map_pcld_ThCi(:),map_tcld_ThCi(:)
+  !$OMP THREADPRIVATE(map_emis_Cb,map_pcld_Cb,map_tcld_Cb,map_emis_ThCi)
+  REAL, SAVE, ALLOCATABLE :: map_emis_Anv(:),map_pcld_Anv(:),map_tcld_Anv(:)
+  !$OMP THREADPRIVATE(map_pcld_ThCi,map_tcld_ThCi,map_emis_Anv,map_pcld_Anv,map_tcld_Anv)              
+   
 
   ! ug Plein de variables venues de phys_output_mod
@@ -122 +125 @@
 ! Variables de sortie simulateur AIRS
 
-     if (ok_airs) then
+!     if (ok_airs) then
       allocate (map_prop_hc(klon),map_prop_hist(klon))
       allocate (alt_tropo(klon))
@@ -134 +137 @@
       allocate (map_emis_ThCi(klon),map_pcld_ThCi(klon),map_tcld_ThCi(klon))
       allocate (map_emis_Anv(klon),map_pcld_Anv(klon),map_tcld_Anv(klon))
-     endif
+!     endif
 
     IF (ok_hines) allocate(zustr_gwd_hines(klon), zvstr_gwd_hines(klon))
@@ -156 +159 @@
 ! Variables de sortie simulateur AIRS
 
-     if (ok_airs) then
+ !    if (ok_airs) then
       deallocate (map_prop_hc,map_prop_hist)
       deallocate (alt_tropo)
@@ -168 +171 @@
       deallocate (map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi)
       deallocate (map_emis_Anv,map_pcld_Anv,map_tcld_Anv)
-     endif
+  !   endif
 
   END SUBROUTINE phys_output_var_end

LMDZ5/trunk/libf/phylmd/simu_airs.F90

@@ -1164 +1164 @@
         real, dimension(klon),intent(out) :: map_deltaz_hc, map_pcld_hc
         real, dimension(klon),intent(out) :: map_tcld_hc
-        real, dimension(klon),intent(out) :: map_emis_Cb,map_pcld_Cb,map_tcld_Cb
+        real, dimension(klon),intent(out) :: map_emis_Cb,map_pcld_Cb,map_tcld_Cb 
         real, dimension(klon),intent(out) :: &
      & map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi
@@ -1172 +1172 @@
      & map_emis_hist,map_iwp_hist,map_deltaz_hist,&
      & map_rad_hist
-        real, dimension(klon),intent(out) :: map_ntot,map_hc,map_hist
-        real, dimension(klon),intent(out) :: map_Cb,map_ThCi,map_Anv
+       real, dimension(klon),intent(out) :: map_ntot,map_hc,map_hist
+       real, dimension(klon),intent(out) :: map_Cb,map_ThCi,map_Anv