Changeset 254 for codes/icosagcm/branches

Timestamp:

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

Author:

ymipsl

Message:

Adding xios output functionnalities

YM

Location:

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM

Files:

• arch/arch-X64_CURIE.fcm (modified) (1 diff)
• arch/arch-X64_CURIE.path (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• compile_curie (modified) (1 diff)
• src/physics_lmdz_generic.f90 (modified) (7 diffs)
• src/xios_mod.F90 (modified) (2 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/arch/arch-X64_CURIE.fcm

@@ -12 +12 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp -openmp-threadprivate compat
-%BASE_LD             -i4 -r8 -auto $MKL_LIBS -L../../LMDZ.COMMON/lib -llmdz
+%BASE_LD             -i4 -r8 -auto $MKL_LIBS
 %MPI_LD
 %OMP_LD              -openmp

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/arch/arch-X64_CURIE.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
 
-XIOS_INCDIR="-I$WORKDIR/XIOS_COMMIT_V1.7/inc"
-XIOS_LIBDIR="-L$WORKDIR/XIOS_COMMIT_V1.7/lib"
+XIOS_INCDIR="-I../../XIOS/inc"
+XIOS_LIBDIR="-L../../XIOS/lib"
 XIOS_LIB="-lxios -lstdc++"

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/bld.cfg

@@ -25 +25 @@
 bld::tool::fc        %COMPILER
 bld::tool::ld        %LINK
-bld::tool::ldflags   %LD_FLAGS %LIB 
+bld::tool::ldflags   %LD_FLAGS  -L../../LMDZ.COMMON/lib -llmdz %LIB 
 bld::tool::fflags    %FFLAGS 
 bld::tool::fppkeys   %CPP_KEY %FPP_DEF

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/compile_curie

@@ -1 @@
-./make_icosa -debug -parallel mpi_omp -arch X64_CURIE -job 8  
+./make_icosa -prod -parallel mpi_omp -with_xios -arch X64_CURIE -job 8  
 #./make_icosa -prod -arch X64_CURIE  -job 8 
 

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/physics_lmdz_generic.f90

@@ -43 +43 @@
   USE mpipara
   USE disvert_mod
+  USE xios_mod
   
   IMPLICIT NONE
@@ -51 +52 @@
   REAL(rstd),ALLOCATABLE :: lonfi(:)
   REAL(rstd),ALLOCATABLE :: airefi(:)
+  REAL(rstd),ALLOCATABLE :: bounds_latfi(:,:)
+  REAL(rstd),ALLOCATABLE :: bounds_lonfi(:,:)
 
     start_day=0
@@ -94 +97 @@
     ALLOCATE(lonfi(nbp_phys))
     ALLOCATE(airefi(nbp_phys))
+    ALLOCATE(bounds_latfi(nbp_phys,6))
+    ALLOCATE(bounds_lonfi(nbp_phys,6))
     
     pos=0
@@ -104 +109 @@
           pos=pos+1
           CALL xyz2lonlat(xyz_i(ij,:),lonfi(pos),latfi(pos))
+          CALL xyz2lonlat(xyz_v(ij+z_rup,:), bounds_lonfi(pos,1), bounds_latfi(pos,1))
+          CALL xyz2lonlat(xyz_v(ij+z_up,:), bounds_lonfi(pos,2), bounds_latfi(pos,2))
+          CALL xyz2lonlat(xyz_v(ij+z_lup,:), bounds_lonfi(pos,3), bounds_latfi(pos,3))
+          CALL xyz2lonlat(xyz_v(ij+z_ldown,:), bounds_lonfi(pos,4), bounds_latfi(pos,4))
+          CALL xyz2lonlat(xyz_v(ij+z_down,:), bounds_lonfi(pos,5), bounds_latfi(pos,5))
+          CALL xyz2lonlat(xyz_v(ij+z_rdown,:), bounds_lonfi(pos,6), bounds_latfi(pos,6))
           airefi(pos)=Ai(ij)  
         ENDDO
@@ -112 +123 @@
     CALL initialize_unstructured_physics(nbp_phys,llm, comm_icosa, mpi_size,distrib,            &
                                          day_length,start_day,itau_physics*dt,                  &
-                                         latfi,lonfi,airefi,radius,g, gas_constant/mu, cpp,     &
+                                         6,latfi,lonfi,airefi,bounds_lonfi,bounds_latfi,         &
+                                         radius,g, gas_constant/mu, cpp,                        &
                                          preff, ap, bp)                                         
     
-    
+    CALL xios_set_context    
     
 !    CALL init_phys_lmdz(128,97,llm, comm_icosa, mpi_size, distrib)
@@ -135 +147 @@
   USE transfert_mod
   USE mpipara
+  USE xios_mod
   IMPLICIT NONE
     INTEGER,INTENT(IN)    :: it
@@ -305 +318 @@
 
 !$OMP BARRIER
+    CALL xios_set_context    
      
   CONTAINS

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/xios_mod.F90

@@ -420 +420 @@
 
  END SUBROUTINE xios_write_field_finalize
-   
+
+ SUBROUTINE xios_set_context
+ IMPLICIT NONE   
+  TYPE(xios_context) :: ctx_hdl
+
+!$OMP MASTER 
+   CALL xios_get_handle("icosagcm",ctx_hdl)
+   CALL xios_set_current_context(ctx_hdl)
+!$OMP END MASTER
+
+  END SUBROUTINE xios_set_context
 #else
   
@@ -447 +457 @@
   SUBROUTINE xios_init_write_field
   END SUBROUTINE xios_init_write_field  
+  
+  SUBROUTINE xios_set_context
+  END SUBROUTINE xios_set_context
+  
+
 #endif