Index: /trunk/ARCH/arch-X64_ADA.env =================================================================== --- /trunk/ARCH/arch-X64_ADA.env (revision 1696) +++ /trunk/ARCH/arch-X64_ADA.env (revision 1696) @@ -0,0 +1,11 @@ +module unload compilerwrappers +module unload netcdf +module unload hdf5 + +module load netcdf/mpi/4.1.3 +#module load hdf5/mpi/1.8.9 + +export NETCDF_INC_DIR=/smplocal/pub/NetCDF/4.1.3/mpi/include +export NETCDF_LIB_DIR=/smplocal/pub/NetCDF/4.1.3/mpi/lib +export HDF5_INC_DIR=/smplocal/pub/HDF5/1.8.9/par/include +export HDF5_LIB_DIR=/smplocal/pub/HDF5/1.8.9/par/lib Index: /trunk/ARCH/arch-X64_ADA.path =================================================================== --- /trunk/ARCH/arch-X64_ADA.path (revision 1696) +++ /trunk/ARCH/arch-X64_ADA.path (revision 1696) @@ -0,0 +1,24 @@ +ROOT=$PWD +NETCDF_INCDIR="-I $NETCDF_INC_DIR" +#NETCDF_LIBDIR="-L $NETCDF_LIB_DIR" +#NETCDF_LIB="-lnetcdff -lnetcdf" + +MPI_INCDIR="" +MPI_LIBDIR="" +MPI_LIB="" + +#HDF5_INCDIR="-I $HDF5_INC_DIR" +#HDF5_LIBDIR="-L $HDF5_LIB_DIR" +#HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz" + +XIOS_INCDIR="-I$ROOT/../XIOS/inc" +XIOS_LIBDIR="-L$ROOT/../XIOS/lib" +XIOS_LIB="-lxios -lstdc++" + +ORCHIDEE_INCDIR="-I$ROOT/../ORCHIDEE/lib" +ORCHIDEE_LIBDIR="-L$ROOT/../ORCHIDEE/lib" +ORCHIDEE_LIB="-lorchidee " + +IOIPSL_INCDIR="-I$ROOT/../IOIPSL/inc" +IOIPSL_LIBDIR="-L$ROOT/../IOIPSL/lib" +IOIPSL_LIB="-lioipsl" Index: /trunk/ARCH/arch-X64_OCCIGEN.env =================================================================== --- /trunk/ARCH/arch-X64_OCCIGEN.env (revision 1696) +++ /trunk/ARCH/arch-X64_OCCIGEN.env (revision 1696) @@ -0,0 +1,6 @@ +module unload netcdf hdf5 intempi openmpi intel + +module load intel/17.0 +module load intelmpi/2017.0.098 +module load hdf5/1.8.17 +module load netcdf/4.4.0_fortran-4.4.2 Index: /trunk/ARCH/arch-X64_OCCIGEN.path =================================================================== --- /trunk/ARCH/arch-X64_OCCIGEN.path (revision 1696) +++ /trunk/ARCH/arch-X64_OCCIGEN.path (revision 1696) @@ -0,0 +1,24 @@ +ROOT=$PWD +NETCDF_INCDIR="-I $NETCDF_INC_DIR" +#NETCDF_LIBDIR="-L $NETCDF_LIB_DIR" +#NETCDF_LIB="-lnetcdff -lnetcdf" + +MPI_INCDIR="" +MPI_LIBDIR="" +MPI_LIB="" + +#HDF5_INCDIR="-I $HDF5_INC_DIR" +#HDF5_LIBDIR="-L $HDF5_LIB_DIR" +#HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz" + +XIOS_INCDIR="-I$ROOT/../XIOS/inc" +XIOS_LIBDIR="-L$ROOT/../XIOS/lib" +XIOS_LIB="-lxios -lstdc++" + +ORCHIDEE_INCDIR="-I$ROOT/../ORCHIDEE/lib" +ORCHIDEE_LIBDIR="-L$ROOT/../ORCHIDEE/lib" +ORCHIDEE_LIB="-lorchidee " + +IOIPSL_INCDIR="-I$ROOT/../IOIPSL/inc" +IOIPSL_LIBDIR="-L$ROOT/../IOIPSL/lib" +IOIPSL_LIB="-lioipsl" Index: /trunk/DOC/chantiers/commit_importants.log =================================================================== --- /trunk/DOC/chantiers/commit_importants.log (revision 1695) +++ /trunk/DOC/chantiers/commit_importants.log (revision 1696) @@ -2026,2 +2026,11 @@ SOMELIBRARY_INCDIR"-I/path/to/the/library/incdir -I/possible/other/required/include/path" +********************** +**** commit_v1696 **** +********************** +Introducing an interface between Dynamico and LMDZ.COMMON physics packages: +directory ICOSA_LMDZ (and related ARCH directory). Compiling with Dynamico +requires having directories ICOSAGCM (dynamico dynamical core) and +IOIPSL alongside ICOSA_LMDZ. +Still quite experimental (and so far only tested on Ada with phystd physics) + Index: /trunk/ICOSA_LMDZ/arch/arch-X64_ADA.fcm =================================================================== --- /trunk/ICOSA_LMDZ/arch/arch-X64_ADA.fcm (revision 1696) +++ /trunk/ICOSA_LMDZ/arch/arch-X64_ADA.fcm (revision 1696) @@ -0,0 +1,16 @@ +%COMPILER mpiifort +%LINK mpiifort +%FPP mpiifort -E +%AR ar +%MAKE gmake +%FPP_FLAGS -P +%FPP_DEF KEY_NONE CPP_NETCDF4 +%BASE_FFLAGS -i4 -r8 -auto -align all -I${MKLROOT}/include +%PROD_FFLAGS -g -traceback -O3 -vec-report2 +%DEV_FFLAGS -g -O1 -traceback +%DEBUG_FFLAGS -g -check bounds -fp-model strict +%MPI_FFLAGS +%OMP_FFLAGS -openmp -openmp-threadprivate=compat +%BASE_LD -i4 -r8 -auto -L${MKL_ROOT}/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core +%MPI_LD +%OMP_LD -openmp -openmp-threadprivate=compat Index: /trunk/ICOSA_LMDZ/arch/arch-X64_OCCIGEN.fcm =================================================================== --- /trunk/ICOSA_LMDZ/arch/arch-X64_OCCIGEN.fcm (revision 1696) +++ /trunk/ICOSA_LMDZ/arch/arch-X64_OCCIGEN.fcm (revision 1696) @@ -0,0 +1,16 @@ +%COMPILER mpif90 +%LINK mpif90 +%FPP mpif90 -E +%AR ar +%MAKE gmake +%FPP_FLAGS -P +%FPP_DEF KEY_NONE CPP_NETCDF4 +%BASE_FFLAGS -i4 -r8 -auto -align all -I${MKLROOT}/include +%PROD_FFLAGS -g -traceback -O3 -vec-report2 +%DEV_FFLAGS -g -O1 -traceback +%DEBUG_FFLAGS -g -check bounds -fp-model strict +%MPI_FFLAGS +%OMP_FFLAGS -openmp -openmp-threadprivate=compat +%BASE_LD -i4 -r8 -auto $MKL_LIBS +%MPI_LD +%OMP_LD -openmp -openmp-threadprivate=compat Index: /trunk/ICOSA_LMDZ/bld.cfg =================================================================== --- /trunk/ICOSA_LMDZ/bld.cfg (revision 1696) +++ /trunk/ICOSA_LMDZ/bld.cfg (revision 1696) @@ -0,0 +1,73 @@ +# ----------------------- FCM extract configuration file ----------------------- +cfg::type bld +cfg::version 1.0 + + +# ------------------------------------------------------------------------------ +# Build information +# ------------------------------------------------------------------------------ + +inc arch.fcm +inc config.fcm + +%FFLAGS %BASE_FFLAGS %COMPIL_FFLAGS + +dir::root $PWD + +src::src src +src::phys src/%PHYS +search_src false +bld::lib icosa_lmdz +bld::target libicosa_lmdz.a icosa_lmdz.exe +bld::exe_dep + +bld::tool::fc %COMPILER +bld::tool::ld %LINK +bld::tool::ldflags %LD_FLAGS -Wl,--start-group -L../lib -licosa_lmdz -L $PWD/../ICOSAGCM/lib -licosa -Wl,--end-group -L $PWD/../LMDZ.COMMON/config/lib -llmdz %LIB +bld::tool::fflags %FFLAGS -I $PWD/../ICOSAGCM/inc -I$PWD/../LMDZ.COMMON/config/inc -I $PWD/../XIOS/inc +bld::tool::fppkeys %CPP_KEY %FPP_DEF +bld::tool::fpp %FPP +bld::tool::fppflags %FPP_FLAGS + +# Pre-process code before analysing dependencies +bld::pp false + +bld::excl_dep use::netcdf +bld::excl_dep use::omp_lib +bld::excl_dep inc::mpif.h +bld::excl_dep use::xios +bld::excl_dep use::icosa_init_mod +bld::excl_dep use::mod_phys_lmdz_omp_data +bld::excl_dep use::mod_grid_phy_lmdz +bld::excl_dep use::field_mod +bld::excl_dep use::domain_mod +bld::excl_dep use::dimensions +bld::excl_dep use::icosa +bld::excl_dep use::disvert_mod +bld::excl_dep use::mpi_mod +bld::excl_dep use::mpipara +bld::excl_dep use::transfert_mod +bld::excl_dep use::xios_mod +bld::excl_dep use::time_mod +bld::excl_dep use::mod_phys_lmdz_omp_data +bld::excl_dep use::time_phylmdz_mod +bld::excl_dep use::pression_mod +bld::excl_dep use::exner_mod +bld::excl_dep use::theta2theta_rhodz_mod +bld::excl_dep use::geopotential_mod +bld::excl_dep use::wind_mod +bld::excl_dep use::omp_para +bld::excl_dep use::physics_external_mod +bld::excl_dep use::trace +bld::excl_dep use::physics_distribution_mod +bld::excl_dep use::dimphy +bld::excl_dep use::geometry_mod +bld::excl_dep use::vertical_layers_mod +bld::excl_dep use::planete_mod +bld::excl_dep use::inifis_mod +bld::excl_dep use::physiq_mod +bld::excl_dep use::wxios +bld::excl_dep use::write_field_mod +bld::excl_dep use::checksum_mod + +bld::tool::SHELL /bin/bash Index: /trunk/ICOSA_LMDZ/build =================================================================== --- /trunk/ICOSA_LMDZ/build (revision 1696) +++ /trunk/ICOSA_LMDZ/build (revision 1696) @@ -0,0 +1,4 @@ +#!/bin/bash + +export PATH=$PWD/../ICOSAGCM/tools/FCM/bin:$PATH +fcm build $* Index: /trunk/ICOSA_LMDZ/clean =================================================================== --- /trunk/ICOSA_LMDZ/clean (revision 1696) +++ /trunk/ICOSA_LMDZ/clean (revision 1696) @@ -0,0 +1,11 @@ +rm -rf ./obj +rm -rf ./done +rm -rf ./inc +rm -rf ./flags +rm -rf ./ppsrc +rm -rf ./bld +rm -rf ./etc +rm -rf ./lib +rm -rf ./bin + + Index: /trunk/ICOSA_LMDZ/compile_ada =================================================================== --- /trunk/ICOSA_LMDZ/compile_ada (revision 1696) +++ /trunk/ICOSA_LMDZ/compile_ada (revision 1696) @@ -0,0 +1,2 @@ +make_icosa_lmdz -p std -p_opt "-b 23x25 -s 1" -debug -parallel mpi_omp -arch X64_ADA -arch_path ../ARCH -job 8 + Index: /trunk/ICOSA_LMDZ/compile_occigen =================================================================== --- /trunk/ICOSA_LMDZ/compile_occigen (revision 1696) +++ /trunk/ICOSA_LMDZ/compile_occigen (revision 1696) @@ -0,0 +1,2 @@ +make_icosa_lmdz -p std -p_opt "-b 23x25 -s 1" -debug -parallel mpi_omp -arch X64_OCCIGEN -arch_path ../ARCH -job 8 + Index: /trunk/ICOSA_LMDZ/make_icosa_lmdz =================================================================== --- /trunk/ICOSA_LMDZ/make_icosa_lmdz (revision 1696) +++ /trunk/ICOSA_LMDZ/make_icosa_lmdz (revision 1696) @@ -0,0 +1,231 @@ +#!/bin/bash +export PATH=$PWD/tools/FCM/bin:$PATH + +export ROOT=$PWD +set -x +echo $0 $* > rebuild_all +chmod a+x rebuild_all + +compil_mode_defined="FALSE" +compil_mode="prod" + +job=1 +full_defined="FALSE" +with_xios_defined="TRUE" +with_orchidee_defined="FALSE" +arch_defined="FALSE" +parallel_defined="FALSE" +arch_path="../ARCH" +arch_default_path="arch" +parallel="none" +physics="none" +build_deps="TRUE" +CPP_KEY="CPP_NONE" +ICOSA_LIB="" + +while (($# > 0)) + do + case $1 in + "-h") cat < .void_file +rm -rf .void_dir +mkdir .void_dir + +if [[ "$arch_defined" == "TRUE" ]] +then + rm -f arch.path + rm -f arch.fcm + rm -f arch.env + + if test -f $arch_path/arch-${arch}.path + then + ln -s $arch_path/arch-${arch}.path arch.path + elif test -f $arch_default_path/arch-${arch}.path + then + ln -s $arch_default_path/arch-${arch}.path arch.path + fi + + if test -f $arch_path/arch-${arch}.fcm + then + ln -s $arch_path/arch-${arch}.fcm arch.fcm + elif test -f $arch_default_path/arch-${arch}.fcm + then + ln -s $arch_default_path/arch-${arch}.fcm arch.fcm + fi + + if test -f $arch_path/arch-${arch}.env + then + ln -s $arch_path/arch-${arch}.env arch.env + elif test -f $arch_default_path/arch-${arch}.env + then + ln -s $arch_default_path/arch-${arch}.env arch.env + else + ln -s .void_file arch.env + fi + source arch.env + source arch.path +else + echo "Please define a target architecture" + exit 1 +fi + +LD_FLAGS="%BASE_LD" + +if [[ "$compil_mode" == "prod" ]] +then + COMPIL_FFLAGS="%PROD_FFLAGS" +elif [[ "$compil_mode" == "dev" ]] +then + COMPIL_FFLAGS="%DEV_FFLAGS" +elif [[ "$compil_mode" == "debug" ]] +then + COMPIL_FFLAGS="%DEBUG_FFLAGS" +fi + +if [[ "$parallel" == "mpi" ]] +then + CPP_KEY="$CPP_KEY CPP_USING_MPI" +elif [[ "$parallel" == "omp" ]] +then + CPP_KEY="$CPP_KEY CPP_USING_OMP" + COMPIL_FFLAGS="$COMPIL_FFLAGS %OMP_FFLAGS" + LD_FLAGS="$LD_FLAGS %OMP_LD" +elif [[ "$parallel" == "mpi_omp" ]] +then + CPP_KEY="$CPP_KEY CPP_USING_MPI CPP_USING_OMP" + COMPIL_FFLAGS="$COMPIL_FFLAGS %OMP_FFLAGS" + LD_FLAGS="$LD_FLAGS %OMP_LD" +elif [[ "$parallel" == "none" ]] +then + parallel="none" +else + echo "-parallel value $parallel is invalid, only permited , , or " + exit 1 +fi + +if [[ "$with_orchidee_defined" == "TRUE" ]] +then + ICOSA_LIB="$ICOSA_LIB $ORCHIDEE_LIBDIR $ORCHIDEE_LIB" +fi + +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 $IOIPSL_LIBDIR $IOIPSL_LIB $NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB" + +rm bin/* + +if [[ "$full_defined" == "TRUE" ]] +then + full_flag="-full" + full_flag2="--full" +else + full_flag="" + full_flag2="" +fi + +rm -f config.fcm + +echo "%COMPIL_FFLAGS $COMPIL_FFLAGS $NETCDF_INCDIR" >> config.fcm +echo "%LD_FLAGS $LD_FLAGS" >> config.fcm +echo "%CPP_KEY $CPP_KEY" >> config.fcm +echo "%PHYS phy$phy" >> config.fcm +echo "%LIB $ICOSA_LIB">> config.fcm + +if [[ "$build_deps" == "TRUE" ]] +then + + cd ../IOIPSL + ./makeioipsl_fcm -$compil_mode -parallel -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1 + cd - + + cd ../XIOS + ./make_xios --$compil_mode --arch $arch --arch_path $arch_path --job $job $full_flag2 || exit 1 + cd - + + if [[ "$with_orchidee_defined" == "TRUE" ]] + then + cd ../ORCHIDEE + ./makeorchidee_fcm -$compil_mode -parallel $parallel -xios2 -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1 + cd - + fi + +# cd ../LMDZ5 +# lmdz_veget="false" +# if [[ "$with_orchidee_defined" == "TRUE" ]] +# then +# lmdz_veget="orchidee2.0" +# fi +# ./makelmdz_fcm gcm -$compil_mode -mem -parallel $parallel -nodyn -io xios -v $lmdz_veget -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1 +# cd - + + cd ../LMDZ.COMMON + ./makelmdz_fcm -p $phys $phys_opt -$compil_mode -parallel $parallel -libphy -io xios -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1 + cd - + + cd ../ICOSAGCM + ./make_icosa -$compil_mode -parallel $parallel -external_ioipsl -with_xios -arch $arch -arch_path $arch_path -job $job $full_flag || exit 1 + cd - +fi + +./build --job $job $full_flag2 Index: /trunk/ICOSA_LMDZ/src/distrib_icosa_lmdz.f90 =================================================================== --- /trunk/ICOSA_LMDZ/src/distrib_icosa_lmdz.f90 (revision 1696) +++ /trunk/ICOSA_LMDZ/src/distrib_icosa_lmdz.f90 (revision 1696) @@ -0,0 +1,234 @@ +MODULE distrib_icosa_lmdz_mod + + TYPE t_distrib_physic + INTEGER,POINTER :: index(:) ! list of index used for thread entering in lmdz physic + INTEGER :: nindex ! number of index used + INTEGER :: domain_ind ! index of the related domain + END TYPE t_distrib_physic + + INTEGER, SAVE :: ndomain_distrib ! number of domain needed for thread data +!$OMP THREADPRIVATE(ndomain_distrib) + + TYPE(t_distrib_physic),ALLOCATABLE, SAVE :: distrib_physic(:) +!$OMP THREADPRIVATE(distrib_physic) + + + INTERFACE transfer_icosa_to_lmdz + MODULE PROCEDURE transfer_icosa_to_lmdz1d,transfer_icosa_to_lmdz2d,transfer_icosa_to_lmdz3d + END INTERFACE transfer_icosa_to_lmdz + + INTERFACE transfer_lmdz_to_icosa + MODULE PROCEDURE transfer_lmdz1d_to_icosa,transfer_lmdz2d_to_icosa,transfer_lmdz3d_to_icosa + END INTERFACE transfer_lmdz_to_icosa + +CONTAINS + + + SUBROUTINE init_distrib_icosa_lmdz + USE mod_phys_lmdz_omp_data, ONLY: klon_omp_begin, klon_omp_end + USE domain_mod + USE dimensions + IMPLICIT NONE + INTEGER :: pos,pos_tmp,nindex + INTEGER :: ind, i,j,ij + + ALLOCATE(distrib_physic(ndomain)) + + ndomain_distrib=0 + pos=0 + DO ind=1,ndomain + CALL swap_dimensions(ind) + +! first guess to determine number of indices for this domain + pos_tmp=pos + nindex=0 + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + IF (domain(ind)%own(i,j)) THEN + pos_tmp=pos_tmp+1 + IF (pos_tmp >= klon_omp_begin .AND. pos_tmp <= klon_omp_end) nindex=nindex+1 + ENDIF + ENDDO + ENDDO + +! fill the index array + + IF (nindex>0) THEN + ndomain_distrib=ndomain_distrib+1 + ALLOCATE(distrib_physic(ndomain_distrib)%index(nindex)) + distrib_physic(ndomain_distrib)%nindex=nindex + distrib_physic(ndomain_distrib)%domain_ind=ind + + nindex=0 + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + IF (domain(ind)%own(i,j)) THEN + pos=pos+1 + IF (pos >= klon_omp_begin .AND. pos <= klon_omp_end) THEN + nindex=nindex+1 + distrib_physic(ndomain_distrib)%index(nindex)=ij + ENDIF + ENDIF + ENDDO + ENDDO + ELSE + pos=pos_tmp + ENDIF + + ENDDO + + END SUBROUTINE init_distrib_icosa_lmdz + + SUBROUTINE transfer_icosa_to_lmdz1d(f_field_icosa, field_lmdz) + USE field_mod + IMPLICIT NONE + TYPE(t_field),POINTER :: f_field_icosa(:) + REAL(rstd) :: field_lmdz(:) + REAL(rstd),POINTER :: field_icosa(:) + INTEGER :: pos, nindex,ind,i + INTEGER,POINTER :: index(:) + + pos=0 + DO ind=1,ndomain_distrib + field_icosa=f_field_icosa(distrib_physic(ind)%domain_ind) + index=>distrib_physic(ind)%index + nindex=distrib_physic(ind)%nindex + DO i=1,nindex + pos=pos+1 + field_lmdz(pos)=field_icosa(index(i)) + ENDDO + ENDDO + + END SUBROUTINE transfer_icosa_to_lmdz1d + + SUBROUTINE transfer_icosa_to_lmdz2d(f_field_icosa, field_lmdz) + USE field_mod + IMPLICIT NONE + TYPE(t_field),POINTER :: f_field_icosa(:) + REAL(rstd) :: field_lmdz(:,:) + + REAL(rstd),POINTER :: field_icosa(:,:) + INTEGER :: pos, nindex,ind,i + INTEGER,POINTER :: index(:) + INTEGER :: l + + DO l=1,size(field_lmdz,2) + pos=0 + DO ind=1,ndomain_distrib + field_icosa=f_field_icosa(distrib_physic(ind)%domain_ind) + index=>distrib_physic(ind)%index + nindex=distrib_physic(ind)%nindex + DO i=1,nindex + pos=pos+1 + field_lmdz(pos,l)=field_icosa(index(i),l) + ENDDO + ENDDO + ENDDO + + END SUBROUTINE transfer_icosa_to_lmdz2d + + + + SUBROUTINE transfer_icosa_to_lmdz3d(f_field_icosa, field_lmdz) + USE field_mod + IMPLICIT NONE + TYPE(t_field),POINTER :: f_field_icosa(:) + REAL(rstd) :: field_lmdz(:,:,:) + REAL(rstd),POINTER :: field_icosa(:,:,:) + INTEGER :: pos, nindex,ind,i + INTEGER,POINTER :: index(:) + INTEGER :: l,q + + DO q=1,size(field_lmdz,3) + DO l=1,size(field_lmdz,2) + pos=0 + DO ind=1,ndomain_distrib + field_icosa=f_field_icosa(distrib_physic(ind)%domain_ind) + index=>distrib_physic(ind)%index + nindex=distrib_physic(ind)%nindex + DO i=1,nindex + pos=pos+1 + field_lmdz(pos,l,q)=field_icosa(index(i),l,q) + ENDDO + ENDDO + ENDDO + ENDDO + + END SUBROUTINE transfer_icosa_to_lmdz3d + + SUBROUTINE transfer_lmdz1d_to_icosa(field_lmdz,f_field_icosa) + USE field_mod + IMPLICIT NONE + REAL(rstd) :: field_lmdz(:) + TYPE(t_field),POINTER :: f_field_icosa(:) + REAL(rstd),POINTER :: field_icosa(:) + INTEGER :: pos, nindex,ind,i + INTEGER,POINTER :: index(:) + + pos=0 + DO ind=1,ndomain_distrib + field_icosa=f_field_icosa(distrib_physic(ind)%domain_ind) + index=>distrib_physic(ind)%index + nindex=distrib_physic(ind)%nindex + DO i=1,nindex + pos=pos+1 + field_icosa(index(i))=field_lmdz(pos) + ENDDO + ENDDO + END SUBROUTINE transfer_lmdz1d_to_icosa + + SUBROUTINE transfer_lmdz2d_to_icosa(field_lmdz,f_field_icosa) + USE field_mod + IMPLICIT NONE + REAL(rstd) :: field_lmdz(:,:) + TYPE(t_field),POINTER :: f_field_icosa(:) + REAL(rstd),POINTER :: field_icosa(:,:) + INTEGER :: pos, nindex,ind,i + INTEGER,POINTER :: index(:) + INTEGER :: l + + DO l=1,size(field_lmdz,2) + pos=0 + DO ind=1,ndomain_distrib + field_icosa=f_field_icosa(distrib_physic(ind)%domain_ind) + index=>distrib_physic(ind)%index + nindex=distrib_physic(ind)%nindex + DO i=1,nindex + pos=pos+1 + field_icosa(index(i),l)=field_lmdz(pos,l) + ENDDO + ENDDO + ENDDO + + END SUBROUTINE transfer_lmdz2d_to_icosa + + + SUBROUTINE transfer_lmdz3d_to_icosa(field_lmdz,f_field_icosa) + USE field_mod + IMPLICIT NONE + REAL(rstd) :: field_lmdz(:,:,:) + TYPE(t_field),POINTER :: f_field_icosa(:) + REAL(rstd),POINTER :: field_icosa(:,:,:) + INTEGER :: pos, nindex,ind,i + INTEGER,POINTER :: index(:) + INTEGER :: l,q + + DO q=1,size(field_lmdz,3) + DO l=1,size(field_lmdz,2) + pos=0 + DO ind=1,ndomain_distrib + field_icosa=f_field_icosa(distrib_physic(ind)%domain_ind) + index=>distrib_physic(ind)%index + nindex=distrib_physic(ind)%nindex + DO i=1,nindex + pos=pos+1 + field_icosa(index(i),l,q)=field_lmdz(pos,l,q) + ENDDO + ENDDO + ENDDO + ENDDO + + END SUBROUTINE transfer_lmdz3d_to_icosa + +END MODULE distrib_icosa_lmdz_mod Index: /trunk/ICOSA_LMDZ/src/icosa_lmdz.f90 =================================================================== --- /trunk/ICOSA_LMDZ/src/icosa_lmdz.f90 (revision 1696) +++ /trunk/ICOSA_LMDZ/src/icosa_lmdz.f90 (revision 1696) @@ -0,0 +1,6 @@ +PROGRAM icosa_lmdz + USE icosa_init_mod + + CALL icosa_init + +END PROGRAM icosa_lmdz Index: /trunk/ICOSA_LMDZ/src/phystd/interface_icosa_lmdz.f90 =================================================================== --- /trunk/ICOSA_LMDZ/src/phystd/interface_icosa_lmdz.f90 (revision 1696) +++ /trunk/ICOSA_LMDZ/src/phystd/interface_icosa_lmdz.f90 (revision 1696) @@ -0,0 +1,918 @@ +MODULE interface_icosa_lmdz_mod + + USE field_mod, ONLY: t_field + USE transfert_mod, ONLY: t_message + + + TYPE(t_message),SAVE :: req_u + TYPE(t_message),SAVE :: req_dps0, req_dulon0, req_dulat0, req_dTemp0, req_dq0 + + TYPE(t_field),POINTER,SAVE :: f_p(:) + TYPE(t_field),POINTER,SAVE :: f_pks(:) + TYPE(t_field),POINTER,SAVE :: f_pk(:) + TYPE(t_field),POINTER,SAVE :: f_p_layer(:) + TYPE(t_field),POINTER,SAVE :: f_theta(:) + TYPE(t_field),POINTER,SAVE :: f_phi(:) + TYPE(t_field),POINTER,SAVE :: f_Temp(:) + TYPE(t_field),POINTER,SAVE :: f_ulon(:) + TYPE(t_field),POINTER,SAVE :: f_ulat(:) + TYPE(t_field),POINTER,SAVE :: f_dulon(:) + TYPE(t_field),POINTER,SAVE :: f_dulat(:) + TYPE(t_field),POINTER,SAVE :: f_dTemp(:) + TYPE(t_field),POINTER,SAVE :: f_dq(:) + TYPE(t_field),POINTER,SAVE :: f_dps(:) + TYPE(t_field),POINTER,SAVE :: f_duc(:) + TYPE(t_field),POINTER,SAVE :: f_bounds_lon(:) + TYPE(t_field),POINTER,SAVE :: f_bounds_lat(:) + + INTEGER,SAVE :: start_clock + INTEGER,SAVE :: stop_clock + INTEGER,SAVE :: count_clock=0 + + REAL,SAVE :: day_length ! length of a day (s) + REAL,SAVE :: year_length ! length of a year (s) + INTEGER,SAVE :: start_day ! reference sol value at beginning of the run wrt Ls=0 + + INTEGER,SAVE :: nbp_phys + INTEGER,SAVE :: nbp_phys_glo + + CHARACTER(len=20),SAVE,ALLOCATABLE :: tname(:) ! tracer names + REAL,SAVE :: pday ! number of ellapsed sols since Ls=0 + REAL,SAVE :: ptime ! "universal time" as fraction of sol (e.g. 0.5 for noon) + + +CONTAINS + + SUBROUTINE initialize_physics + USE distrib_icosa_lmdz_mod, ONLY : init_distrib_icosa_lmdz, transfer_icosa_to_lmdz +! from dynamico + USE domain_mod + USE dimensions + USE mpi_mod + USE mpipara + USE disvert_mod + USE xios_mod + USE time_mod , init_time_icosa=> init_time + USE transfert_mod + +! from LMDZ + USE mod_grid_phy_lmdz, ONLY : unstructured + USE mod_phys_lmdz_omp_data, ONLY: klon_omp +! USE time_phylmdz_mod, ONLY: init_time_lmdz => init_time + USE transfert_mod + USE physics_distribution_mod, ONLY : init_physics_distribution +! USE geometry_mod, ONLY : init_geometry +! USE vertical_layers_mod, ONLY : init_vertical_layers +! USE infotrac_phy, ONLY : init_infotrac_phy +! USE inifis_mod, ONLY : inifis +! USE phyaqua_mod, ONLY : iniaqua + + + IMPLICIT NONE + INTEGER :: ind,i,j,ij,pos + REAL(rstd),POINTER :: bounds_lon(:,:) + REAL(rstd),POINTER :: bounds_lat(:,:) + + REAL(rstd),ALLOCATABLE :: latfi(:) + REAL(rstd),ALLOCATABLE :: lonfi(:) + REAL(rstd),ALLOCATABLE :: airefi(:) + REAL(rstd),ALLOCATABLE :: bounds_latfi(:,:) + REAL(rstd),ALLOCATABLE :: bounds_lonfi(:,:) + REAL(rstd) :: pseudoalt(llm) + + INTEGER :: run_length + INTEGER :: annee_ref + INTEGER :: day_ref + INTEGER :: day_ini + REAL :: start_time + REAL :: physics_timestep + + + INTEGER :: nqo, nbtr + CHARACTER(len=4) :: type_trac + CHARACTER(len=20),ALLOCATABLE :: tname(:) ! tracer short name for restart and diagnostics + CHARACTER(len=23),ALLOCATABLE :: ttext(:) ! tracer long name for diagnostics + INTEGER,ALLOCATABLE :: niadv(:) ! equivalent dyn / physique + INTEGER,ALLOCATABLE :: conv_flg(:) ! conv_flg(it)=0 : convection desactivated for tracer number it + INTEGER,ALLOCATABLE :: pbl_flg(:) ! pbl_flg(it)=0 : boundary layer diffusion desactivaded for tracer number it + CHARACTER(len=8),ALLOCATABLE :: solsym(:) ! tracer name from inca + + INTEGER :: iflag_phys + INTEGER :: nbp_phys, nbp_phys_glo + +!$OMP PARALLEL + CALL allocate_field(f_bounds_lon,field_t,type_real,6) + CALL allocate_field(f_bounds_lat,field_t,type_real,6) + CALL allocate_field(f_p,field_t,type_real,llm+1,name="p_in") + CALL allocate_field(f_pks,field_t,type_real) + CALL allocate_field(f_pk,field_t,type_real,llm) + CALL allocate_field(f_p_layer,field_t,type_real,llm,name="p_layer_in") + CALL allocate_field(f_theta,field_t,type_real,llm) + CALL allocate_field(f_phi,field_t,type_real,llm,name="phi_in") + CALL allocate_field(f_Temp,field_t,type_real,llm,name="Temp_in") + CALL allocate_field(f_ulon,field_t,type_real,llm,name="ulon_in") + CALL allocate_field(f_ulat,field_t,type_real,llm,name="ulat_in") + CALL allocate_field(f_dulon,field_t,type_real,llm,name="dulon_out") + CALL allocate_field(f_dulat,field_t,type_real,llm,name="dulat_out") + CALL allocate_field(f_dTemp,field_t,type_real,llm,name="dTemp_out") + CALL allocate_field(f_dq,field_t,type_real,llm,nqtot,name="dq_out") + CALL allocate_field(f_dps,field_t,type_real,name="dps_out") + CALL allocate_field(f_duc,field_t,type_real,3,llm) + + CALL init_message(f_dps,req_i0,req_dps0) + CALL init_message(f_dulon,req_i0,req_dulon0) + CALL init_message(f_dulat,req_i0,req_dulat0) + CALL init_message(f_dTemp,req_i0,req_dTemp0) + CALL init_message(f_dq,req_i0,req_dq0) +!$OMP END PARALLEL + + nbp_phys=0 + DO ind=1,ndomain + CALL swap_dimensions(ind) + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + IF (domain(ind)%own(i,j)) nbp_phys=nbp_phys+1 + ENDDO + ENDDO + ENDDO + + +!initialize LMDZ5 physic mpi decomposition + CALL MPI_ALLREDUCE(nbp_phys,nbp_phys_glo,1,MPI_INTEGER,MPI_SUM,comm_icosa,ierr) + CALL init_physics_distribution(unstructured, 6, nbp_phys, 1, nbp_phys_glo, llm, comm_icosa) + + DO ind=1,ndomain + CALL swap_dimensions(ind) + CALL swap_geometry(ind) + bounds_lon=f_bounds_lon(ind) + bounds_lat=f_bounds_lat(ind) + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + CALL xyz2lonlat(xyz_v(ij+z_rup,:), bounds_lon(ij,1), bounds_lat(ij,1)) + CALL xyz2lonlat(xyz_v(ij+z_up,:), bounds_lon(ij,2), bounds_lat(ij,2)) + CALL xyz2lonlat(xyz_v(ij+z_lup,:), bounds_lon(ij,3), bounds_lat(ij,3)) + CALL xyz2lonlat(xyz_v(ij+z_ldown,:), bounds_lon(ij,4), bounds_lat(ij,4)) + CALL xyz2lonlat(xyz_v(ij+z_down,:), bounds_lon(ij,5), bounds_lat(ij,5)) + CALL xyz2lonlat(xyz_v(ij+z_rdown,:), bounds_lon(ij,6), bounds_lat(ij,6)) + ENDDO + ENDDO + ENDDO + +!$OMP PARALLEL + CALL initialize_physics_omp +!$OMP END PARALLEL + + CALL xios_set_context + + + + + END SUBROUTINE initialize_physics + + + SUBROUTINE initialize_physics_omp + USE distrib_icosa_lmdz_mod, ONLY : init_distrib_icosa_lmdz, transfer_icosa_to_lmdz +! from dynamico + USE domain_mod + USE dimensions + USE mpi_mod + USE mpipara + USE disvert_mod + USE xios_mod + USE time_mod , ONLY: init_time_icosa=> init_time, dt, itaumax, itau_physics + USE omp_para + +! from LMDZ + USE mod_grid_phy_lmdz, ONLY : unstructured + USE mod_phys_lmdz_omp_data, ONLY: klon_omp + USE time_phylmdz_mod, ONLY: init_time_lmdz => init_time + USE transfert_mod + USE physics_distribution_mod, ONLY : init_physics_distribution + USE dimphy, ONLY: init_dimphy + USE geometry_mod, ONLY : init_geometry + USE vertical_layers_mod, ONLY : init_vertical_layers + USE planete_mod, ONLY: ini_planete_mod +! USE infotrac_phy, ONLY : init_infotrac_phy + USE inifis_mod, ONLY : inifis +! USE phyaqua_mod, ONLY : iniaqua + + + IMPLICIT NONE + + + + INTEGER :: ind,i,j,ij,pos + REAL(rstd),POINTER :: bounds_lon(:,:) + REAL(rstd),POINTER :: bounds_lat(:,:) + + REAL(rstd),ALLOCATABLE :: latfi(:) + REAL(rstd),ALLOCATABLE :: lonfi(:) + REAL(rstd),ALLOCATABLE :: airefi(:) + REAL(rstd),ALLOCATABLE :: bounds_latfi(:,:) + REAL(rstd),ALLOCATABLE :: bounds_lonfi(:,:) + REAL(rstd),ALLOCATABLE :: ind_cell_glo(:) + + REAL(rstd) :: pseudoalt(llm) + REAL(rstd) :: aps(llm) + REAL(rstd) :: bps(llm) + real(rstd) :: scaleheight + + INTEGER :: run_length + INTEGER :: annee_ref + INTEGER :: day_ref + INTEGER :: day_ini + REAL :: start_time + REAL :: physics_timestep + + +! INTEGER :: nqo, nbtr + CHARACTER(len=4) :: type_trac +! CHARACTER(len=20),ALLOCATABLE :: tname(:) ! tracer short name for restart and diagnostics +! CHARACTER(len=23),ALLOCATABLE :: ttext(:) ! tracer long name for diagnostics +! INTEGER,ALLOCATABLE :: niadv(:) ! equivalent dyn / physique +! INTEGER,ALLOCATABLE :: conv_flg(:) ! conv_flg(it)=0 : convection desactivated for tracer number it +! INTEGER,ALLOCATABLE :: pbl_flg(:) ! pbl_flg(it)=0 : boundary layer diffusion desactivaded for tracer number it +! CHARACTER(len=8),ALLOCATABLE :: solsym(:) ! tracer name from inca + TYPE(t_field),POINTER,SAVE :: f_ind_cell_glo(:) + + INTEGER :: iflag_phys + INTEGER :: nq + + CALL init_distrib_icosa_lmdz + + ALLOCATE(latfi(klon_omp)) + ALLOCATE(lonfi(klon_omp)) + ALLOCATE(airefi(klon_omp)) + ALLOCATE(bounds_latfi(klon_omp,6)) + ALLOCATE(bounds_lonfi(klon_omp,6)) + ALLOCATE(ind_cell_glo(klon_omp)) + + CALL transfer_icosa_to_lmdz(geom%lat_i,latfi) + CALL transfer_icosa_to_lmdz(geom%lon_i,lonfi) + CALL transfer_icosa_to_lmdz(f_bounds_lat,bounds_latfi) + CALL transfer_icosa_to_lmdz(f_bounds_lon,bounds_lonfi) + CALL transfer_icosa_to_lmdz(geom%Ai,airefi) + + CALL allocate_field(f_ind_cell_glo,field_t,type_real) + + DO ind=1,ndomain + IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master ) CYCLE + CALL swap_dimensions(ind) + CALL swap_geometry(ind) + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + f_ind_cell_glo(ind)%rval2d(ij)=domain(ind)%assign_cell_glo(i,j) + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + + CALL transfer_icosa_to_lmdz(f_ind_cell_glo,ind_cell_glo) + CALL deallocate_field(f_ind_cell_glo) + + + ! Initialize dimphy module + CALL init_dimphy(klon_omp,llm) + + CALL init_geometry(klon_omp, lonfi, latfi, bounds_lonfi, bounds_latfi, airefi, INT(ind_cell_glo)) + + scaleheight=scale_height/1000. ! Atmospheric scale height (km) + aps(1:llm)=0.5*(ap(1:llm)+ap(2:llm+1)) + bps(1:llm)=0.5*(bp(1:llm)+bp(2:llm+1)) + pseudoalt(:)=0 + CALL init_vertical_layers(llm,preff,scaleheight,ap,bp,aps,bps,presnivs,pseudoalt) + + ! Initialize planet_mod (quite redundant wrt vertical_levels...) + CALL ini_planete_mod(llm,preff,ap,bp) + + ! Initialize tracer names, numbers, etc. for physics +!$OMP MASTER + !Config Key = type_trac + !Config Desc = Choix de couplage avec model de chimie INCA ou REPROBUS + !Config Def = lmdz + !Config Help = + !Config 'lmdz' = pas de couplage, pur LMDZ + !Config 'inca' = model de chime INCA + !Config 'repr' = model de chime REPROBUS + type_trac = 'lmdz' + CALL getin('type_trac',type_trac) + +! init model for standard lmdz case +! nqo=2 +! nbtr=2 + ALLOCATE(tname(nqtot)) +! ALLOCATE(ttext(nqtot)) +! ALLOCATE(niadv(nqtot)) +! ALLOCATE(conv_flg(nbtr)) +! ALLOCATE(pbl_flg(nbtr)) +! ALLOCATE(solsym(nbtr)) + + +! read tname() from traceur.def file + OPEN(unit=42,file="traceur.def",form="formatted",status="old",iostat=ierr) + IF (ierr==0) THEN + READ(42,*) nq ! should be the same as nqtot + IF (nq /= nqtot) THEN + WRITE(*,*) "Error: number of tracers in tracer.def should match nqtot!" + WRITE(*,*) " will just use nqtot=",nqtot," tracers" + ENDIF + DO i=1,nqtot + READ(42,*) tname(i) + ENDDO + CLOSE(42) + ENDIF +!$OMP END MASTER +!$OMP BARRIER + +! CALL init_infotrac_phy(nqtot,nqo,nbtr,tname,ttext,type_trac,& +! niadv,conv_flg,pbl_flg,solsym) + + ! Initialize physical constant +! day_length=86400 +! CALL getin('day_length',day_length) +! CALL inifis(day_length,radius,g,kappa*cpp,cpp) + + ! Initialize physical constant +! CALL inifis(klon_omp,nlayer,nqtot,pdayref,punjours,nday,ptimestep, & +! latitude,longitude,cell_area,prad,pg,pr,pcpp) + start_day=0 + CALL getin('start_day',start_day) + day_length=86400 + CALL getin('day_length',day_length) + ndays=nint(itaumax*(dt/day_length))! number of days to run + physics_timestep=dt*itau_physics + CALL inifis(klon_omp,llm,nqtot,start_day,day_length,ndays,physics_timestep, & + latfi,lonfi,airefi,radius,g,kappa*cpp,cpp) + + + ! init time +! annee_ref=2015 +! CALL getin("anneeref",annee_ref) + +! day_ref=1 +! CALL getin("dayref",day_ref) + +! physics_timestep=dt*itau_physics +! run_length=itaumax*dt +! ndays=NINT(run_length/day_length) + +! day_ini=INT(itau0*dt/day_length)+day_ref +! start_time= itau0*dt/day_length-INT(itau0*dt/day_length) + +! CALL init_time_lmdz(annee_ref, day_ref, day_ini, start_time, ndays, physics_timestep) + +! Additional initializations for aquaplanets +! CALL getin("iflag_phys",iflag_phys) +! IF (iflag_phys>=100) THEN +! CALL iniaqua(klon_omp, iflag_phys) +! END IF + + ! Initialize "calendar" +!$OMP MASTER + day_length=86400 + CALL getin('day_length',day_length) + year_length = 31557600 ! 365.25 * 86400 + CALL getin('year_length',year_length) + start_day = 0 + CALL getin('start_day',start_day) + ! initialize pday and ptime + pday = start_day + ptime = 0 ! assume we start at midnight ... +!$OMP END MASTER +!$OMP BARRIER + + END SUBROUTINE initialize_physics_omp + + + + + SUBROUTINE physics + USE icosa + USE time_mod + USE disvert_mod + USE transfert_mod + USE mpipara + USE xios_mod + USE wxios + USE trace + USE distrib_icosa_lmdz_mod, ONLY : transfer_icosa_to_lmdz, transfer_lmdz_to_icosa + USE physics_external_mod, ONLY : it, f_phis, f_ps, f_theta_rhodz, f_u, f_wflux, f_q + USE write_field_mod + USE checksum_mod +! from LMDZ + USE mod_phys_lmdz_omp_data, ONLY: klon_omp + USE geometry_mod, ONLY : cell_area + USE physiq_mod, ONLY: physiq + IMPLICIT NONE + + REAL(rstd),POINTER :: phis(:) + REAL(rstd),POINTER :: ps(:) + REAL(rstd),POINTER :: theta_rhodz(:,:,:) + REAL(rstd),POINTER :: u(:,:) + REAL(rstd),POINTER :: wflux(:,:) + REAL(rstd),POINTER :: q(:,:,:) + REAL(rstd),POINTER :: p(:,:) + REAL(rstd),POINTER :: pks(:) + REAL(rstd),POINTER :: pk(:,:) + REAL(rstd),POINTER :: p_layer(:,:) + REAL(rstd),POINTER :: theta(:,:) + REAL(rstd),POINTER :: phi(:,:) + REAL(rstd),POINTER :: Temp(:,:) + REAL(rstd),POINTER :: ulon(:,:) + REAL(rstd),POINTER :: ulat(:,:) + REAL(rstd),POINTER :: dulon(:,:) + REAL(rstd),POINTER :: dulat(:,:) + REAL(rstd),POINTER :: dTemp(:,:) + REAL(rstd),POINTER :: dq(:,:,:) + REAL(rstd),POINTER :: dps(:) + REAL(rstd),POINTER :: duc(:,:,:) + + + INTEGER :: ind,l + + REAL(rstd),ALLOCATABLE,SAVE :: ps_phy(:) +!$OMP THREADPRIVATE(ps_phy) + REAL(rstd),ALLOCATABLE,SAVE :: p_phy(:,:) +!$OMP THREADPRIVATE(p_phy) + REAL(rstd),ALLOCATABLE,SAVE :: p_layer_phy(:,:) +!$OMP THREADPRIVATE(p_layer_phy) + REAL(rstd),ALLOCATABLE,SAVE :: Temp_phy(:,:) +!$OMP THREADPRIVATE(Temp_phy) + REAL(rstd),ALLOCATABLE,SAVE :: phis_phy(:) +!$OMP THREADPRIVATE(phis_phy) + REAL(rstd),ALLOCATABLE,SAVE :: phi_phy(:,:) +!$OMP THREADPRIVATE(phi_phy) + REAL(rstd),ALLOCATABLE,SAVE :: ulon_phy(:,:) +!$OMP THREADPRIVATE(ulon_phy) + REAL(rstd),ALLOCATABLE,SAVE :: ulat_phy(:,:) +!$OMP THREADPRIVATE(ulat_phy) + REAL(rstd),ALLOCATABLE,SAVE :: q_phy(:,:,:) +!$OMP THREADPRIVATE(q_phy) + REAL(rstd),ALLOCATABLE,SAVE :: wflux_phy(:,:) +!$OMP THREADPRIVATE(wflux_phy) + REAL(rstd),ALLOCATABLE,SAVE :: dulon_phy(:,:) +!$OMP THREADPRIVATE(dulon_phy) + REAL(rstd),ALLOCATABLE,SAVE :: dulat_phy(:,:) +!$OMP THREADPRIVATE(dulat_phy) + REAL(rstd),ALLOCATABLE,SAVE :: dTemp_phy(:,:) +!$OMP THREADPRIVATE(dTemp_phy) + REAL(rstd),ALLOCATABLE,SAVE :: dq_phy(:,:,:) +!$OMP THREADPRIVATE(dq_phy) + REAL(rstd),ALLOCATABLE,SAVE :: dps_phy(:) +!$OMP THREADPRIVATE(dps_phy) + REAL(rstd) :: dtphy + LOGICAL :: debut + LOGICAL :: lafin + LOGICAL,SAVE :: first=.TRUE. +!$OMP THREADPRIVATE(first) + + + IF(first) THEN + debut=.TRUE. + ELSE + debut=.FALSE. + ENDIF + + + IF(it-itau0>=itaumax) THEN + lafin=.TRUE. + ELSE + lafin=.FALSE. + ENDIF + + IF (first) THEN + first=.FALSE. + CALL init_message(f_u,req_e1_vect,req_u) + ALLOCATE(ps_phy(klon_omp)) + ALLOCATE(p_phy(klon_omp,llm+1)) + ALLOCATE(p_layer_phy(klon_omp,llm)) + ALLOCATE(Temp_phy(klon_omp,llm)) + ALLOCATE(phis_phy(klon_omp)) + ALLOCATE(phi_phy(klon_omp,llm)) + ALLOCATE(ulon_phy(klon_omp,llm)) + ALLOCATE(ulat_phy(klon_omp,llm)) + ALLOCATE(q_phy(klon_omp,llm,nqtot)) + ALLOCATE(wflux_phy(klon_omp,llm)) + ALLOCATE(dulon_phy(klon_omp,llm)) + ALLOCATE(dulat_phy(klon_omp,llm)) + ALLOCATE(dTemp_phy(klon_omp,llm)) + ALLOCATE(dq_phy(klon_omp,llm,nqtot)) + ALLOCATE(dps_phy(klon_omp)) +!$OMP BARRIER + ENDIF + + +!$OMP MASTER +! CALL update_calendar(it) +!$OMP END MASTER +!$OMP BARRIER + dtphy=itau_physics*dt + + + + CALL transfert_message(f_u,req_u) + + DO ind=1,ndomain + CALL swap_dimensions(ind) + IF (assigned_domain(ind)) THEN + CALL swap_geometry(ind) + + phis=f_phis(ind) + ps=f_ps(ind) + theta_rhodz=f_theta_rhodz(ind) + u=f_u(ind) + q=f_q(ind) + wflux=f_wflux(ind) + p=f_p(ind) + pks=f_pks(ind) + pk=f_pk(ind) + p_layer=f_p_layer(ind) + theta=f_theta(ind) + phi=f_phi(ind) + Temp=f_Temp(ind) + ulon=f_ulon(ind) + ulat=f_ulat(ind) + + CALL grid_icosa_to_physics + + ENDIF + ENDDO + +!$OMP BARRIER +!$OMP MASTER + CALL SYSTEM_CLOCK(start_clock) +!$OMP END MASTER + CALL trace_start("physic") +! CALL trace_off() + + +! CALL writeField("p_in",f_p) +! CALL writeField("p_layer_in",f_p_layer) +! CALL writeField("phi_in",f_phi) +! CALL writeField("phis_in",f_phis) +! CALL writeField("ulon_in",f_ulon) +! CALL writeField("ulat_in",f_ulat) +! CALL writeField("Temp_in",f_Temp) +! CALL writeField("q_in",f_q) +! CALL writeField("wflux_in",f_wflux) + +! CALL checksum(f_p) +! CALL checksum(f_p_layer) +! CALL checksum(f_phi) +! CALL checksum(f_phis) +! CALL checksum(f_ulon) +! CALL checksum(f_ulat) +! CALL checksum(f_Temp) +! CALL checksum(f_q) +! CALL checksum(f_wflux) + + CALL transfer_icosa_to_lmdz(f_p , p_phy) + CALL transfer_icosa_to_lmdz(f_p_layer, p_layer_phy) + CALL transfer_icosa_to_lmdz(f_phi , phi_phy) + CALL transfer_icosa_to_lmdz(f_phis , phis_phy ) + CALL transfer_icosa_to_lmdz(f_ulon , ulon_phy ) + CALL transfer_icosa_to_lmdz(f_ulat , ulat_phy) + CALL transfer_icosa_to_lmdz(f_Temp , Temp_phy) + CALL transfer_icosa_to_lmdz(f_q , q_phy) + CALL transfer_icosa_to_lmdz(f_wflux , wflux_phy) + + DO l=1,llm + wflux_phy(:,l)=wflux_phy(:,l)*cell_area(:) + phi_phy(:,l)=phi_phy(:,l)-phis_phy(:) + ENDDO + + CALL wxios_set_context() + + ! Update pday and ptime to send to physics +!$OMP MASTER + ptime=ptime+dtphy/day_length + IF (ptime >= 1.) THEN + ptime=ptime-1 + pday=pday+1 + ENDIF +!$OMP END MASTER +!$OMP BARRIER + CALL physiq(klon_omp, llm, nqtot, & + tname, & + debut, lafin, & + pday, ptime, dtphy, & + p_phy, p_layer_phy, phi_phy, & + ulon_phy, ulat_phy, Temp_phy, q_phy, & + wflux_phy, & + dulon_phy, dulat_phy, dTemp_phy, dq_phy, dps_phy) + + CALL transfer_lmdz_to_icosa(dulon_phy, f_dulon ) + CALL transfer_lmdz_to_icosa(dulat_phy, f_dulat ) + CALL transfer_lmdz_to_icosa(dTemp_phy, f_dTemp ) + CALL transfer_lmdz_to_icosa(dq_phy , f_dq ) + CALL transfer_lmdz_to_icosa(dps_phy , f_dps ) + +! CALL writeField("dulon_out",f_dulon) +! CALL writeField("dulat_out",f_dulat) +! CALL writeField("dTemp_out",f_dTemp) +! CALL writeField("dq_out",f_dq) +! CALL writeField("dps_out",f_dps) + +! CALL checksum(f_dulon) +! CALL checksum(f_dulat) +! CALL checksum(f_dTemp) +! CALL checksum(f_dq) +! CALL checksum(f_dps) + + CALL send_message(f_dps,req_dps0) + CALL send_message(f_dulon,req_dulon0) + CALL send_message(f_dulat,req_dulat0) + CALL send_message(f_dTemp,req_dTemp0) + CALL send_message(f_dq,req_dq0) + + CALL wait_message(req_dps0) + CALL wait_message(req_dulon0) + CALL wait_message(req_dulat0) + CALL wait_message(req_dTemp0) + CALL wait_message(req_dq0) + + +! CALL trace_on() + CALL trace_end("physic") +!$OMP MASTER + CALL SYSTEM_CLOCK(stop_clock) + count_clock=count_clock+stop_clock-start_clock +!$OMP END MASTER + +!$OMP BARRIER + + DO ind=1,ndomain + CALL swap_dimensions(ind) + IF (assigned_domain(ind)) THEN + CALL swap_geometry(ind) + + theta_rhodz=f_theta_rhodz(ind) + u=f_u(ind) + q=f_q(ind) + ps=f_ps(ind) + dulon=f_dulon(ind) + dulat=f_dulat(ind) + Temp=f_temp(ind) + dTemp=f_dTemp(ind) + dq=f_dq(ind) + dps=f_dps(ind) + duc=f_duc(ind) + p=f_p(ind) + pks=f_pks(ind) + pk=f_pk(ind) + + CALL grid_physics_to_icosa + ENDIF + ENDDO + +!$OMP BARRIER + CALL xios_set_context + + + CONTAINS + + SUBROUTINE grid_icosa_to_physics + USE pression_mod + USE exner_mod + USE theta2theta_rhodz_mod + USE geopotential_mod + USE wind_mod + USE omp_para + IMPLICIT NONE + + REAL(rstd) :: uc(3) + INTEGER :: i,j,ij,l + + +! compute pression + + DO l = ll_begin,ll_endp1 + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + p(ij,l) = ap(l) + bp(l) * ps(ij) + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + +! compute exner + + IF (is_omp_first_level) THEN + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + pks(ij) = cpp * ( ps(ij)/preff ) ** kappa + ENDDO + ENDDO + ENDIF + + ! 3D : pk + DO l = ll_begin,ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + pk(ij,l) = cpp * ((.5/preff)*(p(ij,l)+p(ij,l+1))) ** kappa + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + +! compute theta, temperature and pression at layer + DO l = ll_begin, ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + theta(ij,l) = theta_rhodz(ij,l,1) / ((p(ij,l)-p(ij,l+1))/g) + Temp(ij,l) = theta(ij,l) * pk(ij,l) / cpp + p_layer(ij,l)=preff*(pk(ij,l)/cpp)**(1./kappa) + ENDDO + ENDDO + ENDDO + + +!!! Compute geopotential + + ! for first layer + IF (is_omp_first_level) THEN + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + phi( ij,1 ) = phis( ij ) + theta(ij,1) * ( pks(ij) - pk(ij,1) ) + ENDDO + ENDDO + ENDIF +!!-> implicit flush on phi(:,1) + + ! for other layers + DO l = ll_beginp1, ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + phi(ij,l) = 0.5 * ( theta(ij,l) + theta(ij,l-1) ) & + * ( pk(ij,l-1) - pk(ij,l) ) + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + + + IF (is_omp_first_level) THEN + DO l = 2, llm + DO j=jj_begin,jj_end +! ---> Bug compilo intel ici en openmp +! ---> Couper la boucle + IF (j==jj_end+1) PRINT*,"this message must not be printed" + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + phi(ij,l) = phi(ij,l)+ phi(ij,l-1) + ENDDO + ENDDO + ENDDO +! --> IMPLICIT FLUSH on phi --> non + ENDIF + +! compute wind centered lon lat compound + DO l=ll_begin,ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + uc(:)=1/Ai(ij)* & + ( ne(ij,right)*u(ij+u_right,l)*le(ij+u_right)*((xyz_v(ij+z_rdown,:)+xyz_v(ij+z_rup,:))/2-centroid(ij,:)) & + + ne(ij,rup)*u(ij+u_rup,l)*le(ij+u_rup)*((xyz_v(ij+z_rup,:)+xyz_v(ij+z_up,:))/2-centroid(ij,:)) & + + ne(ij,lup)*u(ij+u_lup,l)*le(ij+u_lup)*((xyz_v(ij+z_up,:)+xyz_v(ij+z_lup,:))/2-centroid(ij,:)) & + + ne(ij,left)*u(ij+u_left,l)*le(ij+u_left)*((xyz_v(ij+z_lup,:)+xyz_v(ij+z_ldown,:))/2-centroid(ij,:)) & + + ne(ij,ldown)*u(ij+u_ldown,l)*le(ij+u_ldown)*((xyz_v(ij+z_ldown,:)+xyz_v(ij+z_down,:))/2-centroid(ij,:))& + + ne(ij,rdown)*u(ij+u_rdown,l)*le(ij+u_rdown)*((xyz_v(ij+z_down,:)+xyz_v(ij+z_rdown,:))/2-centroid(ij,:))) + ulon(ij,l)=sum(uc(:)*elon_i(ij,:)) + ulat(ij,l)=sum(uc(:)*elat_i(ij,:)) + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + END SUBROUTINE grid_icosa_to_physics + + + SUBROUTINE grid_physics_to_icosa + USE theta2theta_rhodz_mod + USE omp_para + IMPLICIT NONE + INTEGER :: i,j,ij,l,iq + + DO l=ll_begin,ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + duc(ij,:,l)=dulon(ij,l)*elon_i(ij,:)+dulat(ij,l)*elat_i(ij,:) + ENDDO + ENDDO + ENDDO + + DO l=ll_begin,ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + u(ij+u_right,l) = u(ij+u_right,l) + dtphy * sum( 0.5*(duc(ij,:,l) + duc(ij+t_right,:,l))*ep_e(ij+u_right,:) ) + u(ij+u_lup,l) = u(ij+u_lup,l) + dtphy * sum( 0.5*(duc(ij,:,l) + duc(ij+t_lup,:,l))*ep_e(ij+u_lup,:) ) + u(ij+u_ldown,l) = u(ij+u_ldown,l) + dtphy*sum( 0.5*(duc(ij,:,l) + duc(ij+t_ldown,:,l))*ep_e(ij+u_ldown,:) ) + ENDDO + ENDDO + ENDDO + + DO l=ll_begin,ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + Temp(ij,l)=Temp(ij,l)+ dtphy * dTemp(ij,l) + ENDDO + ENDDO + ENDDO + + DO iq=1,nqtot + DO l=ll_begin,ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + q(ij,l,iq)=q(ij,l,iq)+ dtphy * dq(ij,l,iq) + ENDDO + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + + IF (is_omp_first_level) THEN + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + ps(ij)=ps(ij)+ dtphy * dps(ij) + ENDDO + ENDDO + ENDIF + +! CALL compute_temperature2theta_rhodz(ps,Temp,theta_rhodz,0) + +! compute pression +!$OMP BARRIER + DO l = ll_begin,ll_endp1 + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + p(ij,l) = ap(l) + bp(l) * ps(ij) + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + +! compute exner + + IF (is_omp_first_level) THEN + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + pks(ij) = cpp * ( ps(ij)/preff ) ** kappa + ENDDO + ENDDO + ENDIF + + ! 3D : pk + DO l = ll_begin,ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + pk(ij,l) = cpp * ((.5/preff)*(p(ij,l)+p(ij,l+1))) ** kappa + ENDDO + ENDDO + ENDDO + +!$OMP BARRIER + +! compute theta, temperature and pression at layer + DO l = ll_begin, ll_end + DO j=jj_begin,jj_end + DO i=ii_begin,ii_end + ij=(j-1)*iim+i + theta_rhodz(ij,l,1) = temp(ij,l) * ((p(ij,l)-p(ij,l+1))/g) / (pk(ij,l) / cpp ) + ENDDO + ENDDO + ENDDO + + END SUBROUTINE grid_physics_to_icosa + + + + END SUBROUTINE physics + + + + + +END MODULE interface_icosa_lmdz_mod Index: /trunk/ICOSA_LMDZ/src/wrapper.f90 =================================================================== --- /trunk/ICOSA_LMDZ/src/wrapper.f90 (revision 1696) +++ /trunk/ICOSA_LMDZ/src/wrapper.f90 (revision 1696) @@ -0,0 +1,16 @@ +SUBROUTINE initialize_external_physics + USE interface_icosa_lmdz_mod, ONLY: initialize_physics + IMPLICIT NONE + + CALL initialize_physics + +END SUBROUTINE initialize_external_physics + + +SUBROUTINE external_physics + USE interface_icosa_lmdz_mod, ONLY: physics + IMPLICIT NONE + + CALL physics + +END SUBROUTINE external_physics