Changeset 171 for codes/icosagcm/trunk
- Timestamp:
- 09/23/13 18:06:31 (11 years ago)
- Location:
- codes/icosagcm/trunk
- Files:
-
- 2 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
codes/icosagcm/trunk/arch/arch-X64_CURIE.env
r143 r171 1 1 module unload netcdf 2 2 module unload hdf5 3 module load netcdf/ 3.6.34 module load hdf53 module load netcdf/4.2_hdf5_parallel 4 module load hdf5/1.8.9_parallel 5 5 module load vampir 6 6 module load vampirtrace -
codes/icosagcm/trunk/arch/arch-X64_CURIE.fcm
r152 r171 5 5 %MAKE gmake 6 6 %FPP_FLAGS -P 7 %FPP_DEF KEY_NONE 7 %FPP_DEF KEY_NONE CPP_NETCDF4 8 8 %BASE_FFLAGS -i4 -r8 -auto -align all -I${MKLROOT}/include 9 9 %PROD_FFLAGS -g -traceback -O3 -vec-report2 -
codes/icosagcm/trunk/arch/arch-X64_CURIE.path
r152 r171 10 10 HDF5_LIBDIR="-Wl,-rpath=$HDF5_LIB_DIR -L$HDF5_LIB_DIR" 11 11 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl" 12 13 XIOS_INCDIR="-I$WORKDIR/XIOS_COMMIT_V1.7/inc" 14 XIOS_LIBDIR="-L$WORKDIR/XIOS_COMMIT_V1.7/lib" 15 XIOS_LIB="-lxios -lstdc++" -
codes/icosagcm/trunk/bld.cfg
r152 r171 37 37 bld::excl_dep use::omp_lib 38 38 bld::excl_dep inc::mpif.h 39 bld::excl_dep use::xios 39 40 40 41 bld::tool::SHELL /bin/bash -
codes/icosagcm/trunk/make_icosa
r152 r171 8 8 job=1 9 9 full_defined="FALSE" 10 with_xios_defined="FALSE" 10 11 arch_defined="FALSE" 11 12 parallel_defined="FALSE" … … 13 14 parallel="none" 14 15 CPP_KEY="CPP_NONE" 16 ICOSA_LIB="" 15 17 16 18 while (($# > 0)) … … 46 48 "-full") 47 49 full_defined="TRUE" ; shift ;; 50 51 "-with_xios") 52 with_xios_defined="TRUE" ; shift ;; 48 53 49 54 *) … … 110 115 fi 111 116 112 ICOSA_LIB="$NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB" 117 if [[ "$with_xios_defined" == "TRUE" ]] 118 then 119 CPP_KEY="$CPP_KEY CPP_USING_XIOS" 120 COMPIL_FFLAGS="$COMPIL_FFLAGS $XIOS_INCDIR" 121 ICOSA_LIB="$ICOSA_LIB $XIOS_LIBDIR $XIOS_LIB" 122 fi 123 124 ICOSA_LIB="$ICOSA_LIB $NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB" 113 125 114 126 rm -f config.fcm -
codes/icosagcm/trunk/src/caldyn_gcm.f90
r167 r171 129 129 USE trace 130 130 USE omp_para 131 USE output_field_mod 131 132 IMPLICIT NONE 132 133 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) 267 268 268 CALL writefield("ps",f_ps)269 CALL writefield("dps",f_dps)270 CALL writefield("mass",f_mass)271 CALL writefield("dmass",f_dmass)272 CALL writefield("vort",f_qu)273 CALL writefield("theta",f_theta)274 CALL writefield("exner",f_pk)275 CALL writefield("pv",f_qv)276 269 CALL output_field("ps",f_ps) 270 CALL output_field("dps",f_dps) 271 CALL output_field("mass",f_mass) 272 CALL output_field("dmass",f_dmass) 273 CALL output_field("vort",f_qv) 274 CALL output_field("theta",f_theta) 275 CALL output_field("exner",f_pk) 276 CALL output_field("pv",f_qv) 277 277 278 END IF 278 279 -
codes/icosagcm/trunk/src/icosa_gcm.f90
r151 r171 9 9 USE vertical_interp_mod 10 10 USE trace 11 USE output_field_mod 12 USE xios_mod 13 USE write_field 11 14 IMPLICIT NONE 12 15 … … 21 24 22 25 CALL init_mpipara 26 CALL xios_init 23 27 CALL init_earth_const 24 28 CALL init_grid_param … … 67 71 CALL init_time 68 72 73 CALL output_field_init 69 74 CALL init_timeloop 70 75 … … 73 78 !$OMP END PARALLEL 74 79 80 CALL output_field_finalize 75 81 CALL close_files 76 82 CALL close_time_counter -
codes/icosagcm/trunk/src/mpi_mod.F90
r151 r171 11 11 INTEGER :: MPI_INFO_NULL 12 12 INTEGER :: MPI_STATUS_SIZE 13 INTEGER :: MPI_SUM 13 14 INTEGER,PARAMETER :: MPI_ADDRESS_KIND=KIND(INTEGER) 14 15 #endif -
codes/icosagcm/trunk/src/mpipara.F90
r151 r171 17 17 SUBROUTINE init_mpipara 18 18 USE mpi_mod 19 #ifdef CPP_USING_XIOS 20 USE xios 21 #endif 19 22 IMPLICIT NONE 20 23 … … 26 29 IF (using_mpi) THEN 27 30 CALL MPI_INIT(ierr) 28 comm_icosa=MPI_COMM_WORLD 31 32 #ifdef CPP_USING_XIOS 33 CALL xios_initialize("icosagcm",return_comm=comm_icosa) 34 #else 35 comm_icosa=MPI_COMM_WORLD 36 #endif 29 37 CALL MPI_COMM_SIZE(comm_icosa,mpi_size,ierr) 30 38 CALL MPI_COMM_RANK(comm_icosa,mpi_rank,ierr) -
codes/icosagcm/trunk/src/timeloop_gcm.f90
r170 r171 40 40 USE check_conserve_mod 41 41 USE ioipsl 42 USE output_field_mod 43 USE write_field 42 44 IMPLICIT NONE 43 45 … … 71 73 CALL getin('start_time',start_time) 72 74 75 73 76 write_period=0 74 77 CALL getin('write_period',write_period) … … 96 99 !---------------------------------------------------- 97 100 101 IF (xios_output) itau_out=1 98 102 99 103 ! Time-independant orography … … 203 207 USE transfert_mod 204 208 USE check_conserve_mod 209 USE xios_mod 210 USE output_field_mod 205 211 IMPLICIT NONE 206 212 REAL(rstd),POINTER :: q(:,:,:) … … 232 238 233 239 DO it=0,itaumax 240 241 CALL xios_update_calendar(it) 234 242 IF (MOD(it,itau_sync)==0) THEN 235 243 CALL send_message(f_ps,req_ps0) … … 247 255 ! IF (is_mpi_root) PRINT *,"It No :",It," t :",dt*It 248 256 IF (mod(it,itau_out)==0 ) THEN 249 CALL writefield("q",f_q)250 257 CALL update_time_counter(dt*it) 258 CALL output_field("q",f_q) 251 259 CALL check_conserve(f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it) 252 260 ENDIF … … 303 311 304 312 !---------------------------------------------------- 305 jD_cur = jD_ref + day_ini - day_ref + it/day_step306 jH_cur = jH_ref + start_time + mod(it,day_step)/float(day_step)307 jD_cur = jD_cur + int(jH_cur)308 jH_cur = jH_cur - int(jH_cur)313 ! jD_cur = jD_ref + day_ini - day_ref + it/day_step 314 ! jH_cur = jH_ref + start_time + mod(it,day_step)/float(day_step) 315 ! jD_cur = jD_cur + int(jH_cur) 316 ! jH_cur = jH_cur - int(jH_cur) 309 317 CALL physics(it,jD_cur,jH_cur,f_phis, f_ps, f_theta_rhodz, f_u, f_q) 310 318 ENDDO -
codes/icosagcm/trunk/src/write_field.f90
r161 r171 2 2 USE genmod 3 3 implicit none 4 4 PRIVATE 5 5 INTEGER,SAVE :: ncprec 6 6 … … 11 11 END TYPE ncvar 12 12 13 integer, parameter:: MaxWriteField = 100014 integer, dimension(MaxWriteField),save:: FieldId15 TYPE(ncvar), dimension(MaxWriteField), save:: FieldVarId16 integer, dimension(MaxWriteField),save:: FieldIndex17 character(len=255), dimension(MaxWriteField) :: FieldName13 INTEGER, PARAMETER :: MaxWriteField = 1000 14 INTEGER, DIMENSION(MaxWriteField),SAVE :: FieldId 15 TYPE(ncvar), dimension(MaxWriteField),SAVE :: FieldVarId 16 INTEGER, DIMENSION(MaxWriteField),SAVE :: FieldIndex 17 CHARACTER(len=255), DIMENSION(MaxWriteField) :: FieldName 18 18 19 integer,save:: NbField = 019 INTEGER,SAVE :: NbField = 0 20 20 21 contains 21 PUBLIC init_writeField, writefield, close_files 22 23 CONTAINS 22 24 23 25 SUBROUTINE init_writeField
Note: See TracChangeset
for help on using the changeset viewer.