Changeset 253 for codes/icosagcm/branches

Timestamp:

07/23/14 17:57:17 (10 years ago)

Author:

ymipsl

Message:

Adding xios output functionnalities

YM

Location:

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf

Files:

• dyn3dpar/initialize_physics.F90 (modified) (6 diffs)
• phystd/comgeomphy.F90 (modified) (2 diffs)
• phystd/physiq.F90 (modified) (3 diffs)
• phystd/writediagfi.F (modified) (1 diff)
• phystd/xios_output.F90 (added)

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/dyn3dpar/initialize_physics.F90

@@ -1 +1 @@
 SUBROUTINE initialize_unstructured_physics(nbp, nlayer, communicator, nb_proc, distrib, &
-                                           punjours, pdayref,ptimestep, lat,lon,area, &
+                                           punjours, pdayref,ptimestep,                  &
+                                           nb_vertex, lat, lon, area, bounds_lon, bounds_lat, &
                                            prad,pg,pr,pcpp, preff,ap,bp )
 USE mod_phys_lmdz_para
@@ -6 +7 @@
 USE dimphy
 USE comgeomphy, only :   initcomgeomphy, &
+                         nvertex,        &
                          airephy, & ! physics grid area (m2)
                          rlond, & ! longitudes
-                         rlatd ! latitudes
+                         rlatd,  & ! latitudes
+                         rbounds_lon,    &
+                         rbounds_lat
 USE infotrac, only : nqtot ! number of advected tracers
 USE planete_mod, only: ini_planete_mod
+USE xios_output_mod
+
 IMPLICIT NONE
 
@@ -24 +30 @@
     REAL,INTENT(in)    :: pcpp ! specific heat Cp
     REAL,INTENT(in)    :: punjours ! length (in s) of a standard day
+    INTEGER            :: nb_vertex
     REAL,INTENT(in)    :: lat(nbp) ! latitudes of the physics grid
     REAL,INTENT(in)    :: lon(nbp) ! longitudes of the physics grid
     REAL,INTENT(in)    :: area(nbp) ! area (m2)
+    REAL,INTENT(in)    :: bounds_lon(nbp,nb_vertex) ! longitude boundaries of cell
+    REAL,INTENT(in)    :: bounds_lat(nbp,nb_vertex) ! latitude boundaries of cell
     INTEGER,INTENT(in) :: pdayref ! reference day of for the simulation
     REAL,INTENT(in)    :: ptimestep ! physics time step (s)
@@ -34 +43 @@
 
     INTEGER :: offset
-    REAL,SAVE,ALLOCATABLE    :: plat(:) ! latitudes of the physics grid
-    REAL,SAVE,ALLOCATABLE    :: plon(:) ! longitudes of the physics grid
-    REAL,SAVE,ALLOCATABLE    :: parea(:) ! area (m2)
+    REAL,SAVE,ALLOCATABLE    :: shared_lat(:) ! latitudes of the physics grid
+    REAL,SAVE,ALLOCATABLE    :: shared_lon(:) ! longitudes of the physics grid
+    REAL,SAVE,ALLOCATABLE    :: shared_area(:) ! area (m2)
+    REAL,SAVE,ALLOCATABLE    :: shared_bounds_lon(:,:) ! area (m2)
+    REAL,SAVE,ALLOCATABLE    :: shared_bounds_lat(:,:) ! area (m2)
 
-    ALLOCATE(plat(nbp),plon(nbp),parea(nbp))
-    plat(:)=lat(:)
-    plon(:)=lon(:)
-    parea(:)=area(:)
+    ALLOCATE(shared_lat(nbp),shared_lon(nbp),shared_area(nbp), shared_bounds_lat(nbp,nb_vertex), shared_bounds_lon(nbp,nb_vertex))
+    shared_lat(:)=lat(:)
+    shared_lon(:)=lon(:)
+    shared_area(:)=area(:)
+    shared_bounds_lat(:,:) = bounds_lat(:,:)
+    shared_bounds_lon(:,:) = bounds_lon(:,:)
     
     CALL init_grid_phy_lmdz(nbp,1,sum(distrib),nlayer)
     CALL init_phys_lmdz_para(nbp,1,communicator,nb_proc,distrib)
 
-
+    nvertex = nb_vertex
 !$OMP PARALLEL
     CALL init_dimphy(klon_omp,nbp_lev)
@@ -52 +65 @@
     
     offset=0
-    airephy(1:klon_omp)=parea(offset+klon_omp_begin:offset+klon_omp_end)
-    rlond(1:klon_omp)=plon(offset+klon_omp_begin:offset+klon_omp_end)
-    rlatd(1:klon_omp)=plat(offset+klon_omp_begin:offset+klon_omp_end)
+    airephy(1:klon_omp)=shared_area(offset+klon_omp_begin:offset+klon_omp_end)
+    rlond(1:klon_omp)=shared_lon(offset+klon_omp_begin:offset+klon_omp_end)
+    rlatd(1:klon_omp)=shared_lat(offset+klon_omp_begin:offset+klon_omp_end)
+    rbounds_lon(1:klon_omp,:)=shared_bounds_lon(offset+klon_omp_begin:offset+klon_omp_end,:)
+    rbounds_lat(1:klon_omp,:)=shared_bounds_lat(offset+klon_omp_begin:offset+klon_omp_end,:)
 
 ! copy over preff , ap() and bp() 
@@ -63 +78 @@
     CALL inifis(klon_omp,nlayer,nqtot,pdayref,punjours,ptimestep, &
                 rlatd,rlond,airephy,prad,pg,pr,pcpp)
-            
+                
+    CALL initialize_xios_output        
 !$OMP END PARALLEL
 

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/comgeomphy.F90

@@ -1 +1 @@
 module comgeomphy
+   integer,save             :: nvertex=0
    real,save,allocatable :: airephy(:)
    real,save,allocatable :: rlatd(:)
    real,save,allocatable :: rlond(:)
-!$OMP THREADPRIVATE(airephy,cuphy,cvphy,rlatd,rlond)
+   real,save,allocatable :: rbounds_lon(:,:)
+   real,save,allocatable :: rbounds_lat(:,:)
+!$OMP THREADPRIVATE(airephy,cuphy,cvphy,rlatd,rlond,rbounds_lon,rbounds_lat)
 contains
   
@@ -14 +17 @@
     allocate(rlatd(klon_omp))
     allocate(rlond(klon_omp))
+    allocate(rbounds_lon(klon_omp,nvertex))
+    allocate(rbounds_lat(klon_omp,nvertex))
 
   end subroutine initcomgeomphy

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/physiq.F90

@@ -35 +35 @@
                             obliquit, nres, z0
 
+      use xios_output_mod 
       implicit none
 
@@ -471 +472 @@
 
 
+
+      CALL update_xios_timestep
+
+
 !=======================================================================
 
@@ -2219 +2224 @@
       icount=icount+1
 
+!!!!!!!!!!!!!!!! section for XIOS output !!!!!!!!!!!!!!!      
+      CALL write_xios_field("tsurf",tsurf)
+      CALL write_xios_field("ps",ps)
+      CALL write_xios_field("phisinit",phisfi)
+      CALL write_xios_field("aire",area)
+      CALL write_xios_field("temp",zt)
+      CALL write_xios_field("u",zu)
+      CALL write_xios_field("v",zv)
+      CALL write_xios_field("p",pplay)
+      CALL write_xios_field("ISR",fluxtop_dn)
+      CALL write_xios_field("ASR",fluxabs_sw)
+      CALL write_xios_field("OLR",fluxtop_lw)
+
       if (lastcall) then
 

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/writediagfi.F

@@ -115 +115 @@
       real phisfi_glo(ngrid) ! surface geopotential on global physics grid
 #endif
-
+     
+      RETURN
 !***************************************************************
 !Sortie des variables au rythme voulu