Changeset 171

Timestamp:

09/23/13 18:06:31 (11 years ago)

Author:

ymipsl

Message:

• XIOS integration -

Compiling with "-with_xios" option. Adapt path to find XIOS library (arch.path)
Retro-compatible with the old output. If xios is not present, dynamico will use the standard writefield function.
Need to have the iodef.xml configuration file in the exec directory

YM

Location:

codes/icosagcm/trunk

Files:

• arch/arch-X64_CURIE.env (modified) (1 diff)
• arch/arch-X64_CURIE.fcm (modified) (1 diff)
• arch/arch-X64_CURIE.path (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• make_icosa (modified) (4 diffs)
• src/caldyn_gcm.f90 (modified) (2 diffs)
• src/icosa_gcm.f90 (modified) (4 diffs)
• src/mpi_mod.F90 (modified) (1 diff)
• src/mpipara.F90 (modified) (2 diffs)
• src/output_field.f90 (added)
• src/timeloop_gcm.f90 (modified) (7 diffs)
• src/write_field.f90 (modified) (2 diffs)
• src/xios_mod.F90 (added)

codes/icosagcm/trunk/arch/arch-X64_CURIE.env

@@ -1 +1 @@
 module unload netcdf
 module unload hdf5
-module load netcdf/3.6.3
-module load hdf5
+module load netcdf/4.2_hdf5_parallel
+module load  hdf5/1.8.9_parallel
 module load vampir
 module load vampirtrace

codes/icosagcm/trunk/arch/arch-X64_CURIE.fcm

@@ -5 +5 @@
 %MAKE                gmake
 %FPP_FLAGS           -P
-%FPP_DEF             KEY_NONE
+%FPP_DEF             KEY_NONE CPP_NETCDF4
 %BASE_FFLAGS         -i4 -r8 -auto -align all -I${MKLROOT}/include
 %PROD_FFLAGS         -g -traceback -O3 -vec-report2

codes/icosagcm/trunk/arch/arch-X64_CURIE.path

@@ -10 +10 @@
 HDF5_LIBDIR="-Wl,-rpath=$HDF5_LIB_DIR -L$HDF5_LIB_DIR"
 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_LIB="-lxios -lstdc++"

codes/icosagcm/trunk/bld.cfg

@@ -37 +37 @@
 bld::excl_dep        use::omp_lib
 bld::excl_dep        inc::mpif.h
+bld::excl_dep        use::xios
 
 bld::tool::SHELL   /bin/bash

codes/icosagcm/trunk/make_icosa

@@ -8 +8 @@
 job=1
 full_defined="FALSE"
+with_xios_defined="FALSE"
 arch_defined="FALSE"
 parallel_defined="FALSE"
@@ -13 +14 @@
 parallel="none"
 CPP_KEY="CPP_NONE" 
+ICOSA_LIB=""
 
 while (($# > 0))
@@ -46 +48 @@
       "-full")
           full_defined="TRUE" ; shift ;;
+
+      "-with_xios")
+          with_xios_defined="TRUE" ; shift ;;
 
       *)
@@ -110 +115 @@
 fi
 
-ICOSA_LIB="$NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB"
+if [[ "$with_xios_defined" == "TRUE" ]]
+then
+  CPP_KEY="$CPP_KEY CPP_USING_XIOS"
+  COMPIL_FFLAGS="$COMPIL_FFLAGS $XIOS_INCDIR"
+  ICOSA_LIB="$ICOSA_LIB $XIOS_LIBDIR $XIOS_LIB"
+fi  
+
+ICOSA_LIB="$ICOSA_LIB $NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB"
 
 rm -f config.fcm

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -129 +129 @@
     USE trace
     USE omp_para
+    USE output_field_mod
     IMPLICIT NONE
     LOGICAL,INTENT(IN)    :: write_out
@@ -266 +267 @@
 !            f_buf_i, f_buf_v, f_buf_u3d, f_buf_ulon, f_buf_ulat, f_buf_s, f_buf_p)
 
-       CALL writefield("ps",f_ps)
-       CALL writefield("dps",f_dps)
-       CALL writefield("mass",f_mass)
-       CALL writefield("dmass",f_dmass)
-       CALL writefield("vort",f_qu)
-       CALL writefield("theta",f_theta)
-       CALL writefield("exner",f_pk)
-       CALL writefield("pv",f_qv)
-
+       CALL output_field("ps",f_ps)
+       CALL output_field("dps",f_dps)
+       CALL output_field("mass",f_mass)
+       CALL output_field("dmass",f_dmass)
+       CALL output_field("vort",f_qv)
+       CALL output_field("theta",f_theta)
+       CALL output_field("exner",f_pk)
+       CALL output_field("pv",f_qv)
+ 
     END IF
     

codes/icosagcm/trunk/src/icosa_gcm.f90

@@ -9 +9 @@
   USE vertical_interp_mod
   USE trace
+  USE output_field_mod
+  USE xios_mod
+  USE write_field
   IMPLICIT NONE
   
@@ -21 +24 @@
  
   CALL init_mpipara
+  CALL xios_init
   CALL init_earth_const 
   CALL init_grid_param
@@ -67 +71 @@
   CALL init_time
 
+  CALL output_field_init
   CALL init_timeloop
 
@@ -73 +78 @@
 !$OMP END PARALLEL
 
+  CALL output_field_finalize
   CALL close_files
   CALL close_time_counter

codes/icosagcm/trunk/src/mpi_mod.F90

@@ -11 +11 @@
   INTEGER :: MPI_INFO_NULL
   INTEGER :: MPI_STATUS_SIZE 
+  INTEGER :: MPI_SUM
   INTEGER,PARAMETER :: MPI_ADDRESS_KIND=KIND(INTEGER)
 #endif

codes/icosagcm/trunk/src/mpipara.F90

@@ -17 +17 @@
   SUBROUTINE init_mpipara
   USE mpi_mod
+#ifdef CPP_USING_XIOS
+  USE xios
+#endif
   IMPLICIT NONE
 
@@ -26 +29 @@
     IF (using_mpi) THEN
       CALL MPI_INIT(ierr)
-      comm_icosa=MPI_COMM_WORLD
+
+#ifdef CPP_USING_XIOS
+      CALL xios_initialize("icosagcm",return_comm=comm_icosa)
+#else
+     comm_icosa=MPI_COMM_WORLD
+#endif
       CALL MPI_COMM_SIZE(comm_icosa,mpi_size,ierr)
       CALL MPI_COMM_RANK(comm_icosa,mpi_rank,ierr)

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -40 +40 @@
   USE check_conserve_mod
   USE ioipsl
+  USE output_field_mod
+  USE write_field
   IMPLICIT NONE
 
@@ -71 +73 @@
    CALL getin('start_time',start_time) 
 
+   
    write_period=0
    CALL getin('write_period',write_period)
@@ -96 +99 @@
 !----------------------------------------------------
 
+   IF (xios_output) itau_out=1
 
 ! Time-independant orography
@@ -203 +207 @@
   USE transfert_mod
   USE check_conserve_mod
+  USE xios_mod
+  USE output_field_mod
   IMPLICIT NONE  
     REAL(rstd),POINTER :: q(:,:,:)
@@ -232 +238 @@
 
   DO it=0,itaumax
+    
+    CALL xios_update_calendar(it)
     IF (MOD(it,itau_sync)==0) THEN
       CALL send_message(f_ps,req_ps0)
@@ -247 +255 @@
 !    IF (is_mpi_root) PRINT *,"It No :",It,"   t :",dt*It
     IF (mod(it,itau_out)==0 ) THEN
-      CALL writefield("q",f_q)
       CALL update_time_counter(dt*it)
+      CALL output_field("q",f_q)
       CALL check_conserve(f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)  
     ENDIF
@@ -303 +311 @@
 
 !----------------------------------------------------
-    jD_cur = jD_ref + day_ini - day_ref + it/day_step
-    jH_cur = jH_ref + start_time + mod(it,day_step)/float(day_step)
-    jD_cur = jD_cur + int(jH_cur)
-    jH_cur = jH_cur - int(jH_cur)
+!    jD_cur = jD_ref + day_ini - day_ref + it/day_step
+!    jH_cur = jH_ref + start_time + mod(it,day_step)/float(day_step)
+!    jD_cur = jD_cur + int(jH_cur)
+!    jH_cur = jH_cur - int(jH_cur)
     CALL physics(it,jD_cur,jH_cur,f_phis, f_ps, f_theta_rhodz, f_u, f_q)
     ENDDO

codes/icosagcm/trunk/src/write_field.f90

@@ -2 +2 @@
 USE genmod
 implicit none
-  
+  PRIVATE  
   INTEGER,SAVE :: ncprec
   
@@ -11 +11 @@
   END TYPE ncvar
 
-  integer, parameter :: MaxWriteField = 1000
-  integer, dimension(MaxWriteField),save :: FieldId
-  TYPE(ncvar), dimension(MaxWriteField),save :: FieldVarId
-  integer, dimension(MaxWriteField),save :: FieldIndex
-  character(len=255), dimension(MaxWriteField) ::  FieldName 
+  INTEGER, PARAMETER :: MaxWriteField = 1000
+  INTEGER, DIMENSION(MaxWriteField),SAVE :: FieldId
+  TYPE(ncvar), dimension(MaxWriteField),SAVE :: FieldVarId
+  INTEGER, DIMENSION(MaxWriteField),SAVE :: FieldIndex
+  CHARACTER(len=255), DIMENSION(MaxWriteField) ::  FieldName 
    
-  integer,save :: NbField = 0
+  INTEGER,SAVE :: NbField = 0
   
-  contains
+  PUBLIC init_writeField, writefield, close_files
+  
+  CONTAINS
   
     SUBROUTINE init_writeField