Index: LMDZ6/branches/DYNAMICO-conv/libf/dynphy_lonlat/inigeomphy_mod.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/dynphy_lonlat/inigeomphy_mod.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/dynphy_lonlat/inigeomphy_mod.F90 (revision 3049) @@ -76,5 +76,6 @@ REAL,ALLOCATABLE,SAVE :: boundslonfi(:,:) REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:) -!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi) + INTEGER,ALLOCATABLE,SAVE :: ind_cell_glo_fi(:) +!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi,ind_cell_glo_fi) ! Initialize Physics distibution and parameters and interface with dynamics @@ -93,6 +94,6 @@ DO i=1,iim + boundslon_reg(i,east)=rlonu(i+1) boundslon_reg(i,west)=rlonu(i) - boundslon_reg(i,east)=rlonu(i+1) ENDDO @@ -204,4 +205,5 @@ ALLOCATE(boundslonfi(klon_omp,4)) ALLOCATE(boundslatfi(klon_omp,4)) + ALLOCATE(ind_cell_glo_fi(klon_omp)) @@ -214,8 +216,9 @@ boundslonfi(1:klon_omp,:) = boundslonfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:) boundslatfi(1:klon_omp,:) = boundslatfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:) + ind_cell_glo_fi(1:klon_omp)=(/ (i,i=offset+klon_omp_begin,offset+klon_omp_end) /) ! copy over local grid longitudes and latitudes CALL init_geometry(klon_omp,lonfi,latfi,boundslonfi,boundslatfi, & - airefi,cufi,cvfi) + airefi,ind_cell_glo_fi,cufi,cvfi) ! copy over preff , ap(), bp(), etc Index: LMDZ6/branches/DYNAMICO-conv/libf/phy_common/geometry_mod.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phy_common/geometry_mod.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/phy_common/geometry_mod.F90 (revision 3049) @@ -30,4 +30,6 @@ !$OMP THREADPRIVATE(cell_area) + INTEGER,SAVE,ALLOCATABLE :: ind_cell_glo(:) ! global indice of a local cell +!$OMP THREADPRIVATE(ind_cell_glo) CONTAINS @@ -35,5 +37,5 @@ SUBROUTINE init_geometry(klon,longitude_,latitude_, & boundslon_,boundslat_, & - cell_area_,dx_,dy_) + cell_area_,ind_cell_glo_,dx_,dy_) USE mod_grid_phy_lmdz, ONLY: nvertex USE nrtype, ONLY : PI @@ -45,4 +47,5 @@ REAL,INTENT(IN) :: boundslat_(klon,nvertex) REAL,INTENT(IN) :: cell_area_(klon) + INTEGER,OPTIONAL,INTENT(IN) :: ind_cell_glo_(klon) REAL,OPTIONAL,INTENT(IN) :: dx_(klon) REAL,OPTIONAL,INTENT(IN) :: dy_(klon) @@ -55,4 +58,5 @@ ALLOCATE(boundslat(klon,nvertex)) ALLOCATE(cell_area(klon)) + IF (PRESENT(ind_cell_glo_)) ALLOCATE(ind_cell_glo(klon)) IF (PRESENT(dx_)) ALLOCATE(dx(klon)) IF (PRESENT(dy_))ALLOCATE(dy(klon)) @@ -65,4 +69,5 @@ boundslat(:,:) = boundslat_(:,:) cell_area(:) = cell_area_(:) + IF (PRESENT(ind_cell_glo_)) ind_cell_glo(:) = ind_cell_glo_(:) IF (PRESENT(dx_)) dx(:) = dx_(:) IF (PRESENT(dy_)) dy(:) = dy_(:) Index: LMDZ6/branches/DYNAMICO-conv/libf/phy_common/init_print_control_mod.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phy_common/init_print_control_mod.F90 (revision 3049) +++ LMDZ6/branches/DYNAMICO-conv/libf/phy_common/init_print_control_mod.F90 (revision 3049) @@ -0,0 +1,67 @@ +MODULE init_print_control_mod + +! init_print_control to initialize print_control_mod variables +! not included there because of circular dependecy issues + +CONTAINS + + SUBROUTINE init_print_control + USE print_control_mod, ONLY : set_print_control + USE ioipsl_getin_p_mod, ONLY : getin_p + USE mod_phys_lmdz_para, ONLY: is_omp_root, is_master + IMPLICIT NONE + + INTEGER :: lunout ! default output file identifier (6==screen) + INTEGER :: prt_level ! Output level + LOGICAL :: debug ! flag to specify if in "debug mode" + LOGICAL :: opened + INTEGER :: number + + !Config Key = prt_level + !Config Desc = niveau d'impressions de débogage + !Config Def = 0 + !Config Help = Niveau d'impression pour le débogage + !Config (0 = minimum d'impression) + prt_level = 0 + CALL getin_p('prt_level',prt_level) + + !Config Key = lunout + !Config Desc = unite de fichier pour les impressions + !Config Def = 6 + !Config Help = unite de fichier pour les impressions + !Config (defaut sortie standard = 6) + lunout=6 + CALL getin_p('lunout', lunout) + + IF (is_omp_root) THEN + IF (lunout /= 5 .and. lunout /= 6) THEN + INQUIRE(FILE='lmdz.out_0000',OPENED=opened,NUMBER=number) + IF (opened) THEN + lunout=number + ELSE + OPEN(UNIT=lunout,FILE='lmdz.out_0000',ACTION='write', & + STATUS='unknown',FORM='formatted') + ENDIF + ENDIF + ENDIF + + !Config Key = debug + !Config Desc = mode debogage + !Config Def = false + !Config Help = positionne le mode debogage + + debug = .FALSE. + CALL getin_p('debug',debug) + + IF (is_master) THEN + WRITE(lunout,*)"init_print_control: prt_level=",prt_level + WRITE(lunout,*)"init_print_control: lunout=",lunout + WRITE(lunout,*)"init_print_control: debug=",debug + ENDIF + + CALL set_print_control(lunout,prt_level,debug) + + END SUBROUTINE init_print_control + +END MODULE init_print_control_mod + Index: LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_mpi_data.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_mpi_data.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_mpi_data.F90 (revision 3049) @@ -3,5 +3,4 @@ ! MODULE mod_phys_lmdz_mpi_data -! USE mod_const_mpi INTEGER,SAVE :: ii_begin @@ -36,11 +35,8 @@ INTEGER,SAVE :: mpi_size INTEGER,SAVE :: mpi_master -! INTEGER,SAVE :: mpi_root LOGICAL,SAVE :: is_mpi_root LOGICAL,SAVE :: is_using_mpi -! LOGICAL,SAVE :: is_north_pole -! LOGICAL,SAVE :: is_south_pole LOGICAL,SAVE :: is_north_pole_dyn LOGICAL,SAVE :: is_south_pole_dyn @@ -50,15 +46,13 @@ CONTAINS -! SUBROUTINE Init_phys_lmdz_mpi_data(iim,jjp1,nb_proc,distrib) SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, communicator) -! USE mod_const_mpi, ONLY : COMM_LMDZ IMPLICIT NONE #ifdef CPP_MPI INCLUDE 'mpif.h' #endif - INTEGER,INTENT(in) :: nbp - INTEGER,INTENT(in) :: nbp_lon - INTEGER,INTENT(in) :: nbp_lat - INTEGER,INTENT(in) :: communicator + INTEGER,INTENT(IN) :: nbp + INTEGER,INTENT(IN) :: nbp_lon + INTEGER,INTENT(IN) :: nbp_lat + INTEGER,INTENT(IN) :: communicator INTEGER,ALLOCATABLE :: distrib(:) @@ -189,7 +183,7 @@ SUBROUTINE print_module_data -! USE print_control_mod, ONLY: lunout + USE print_control_mod, ONLY: lunout IMPLICIT NONE - INCLUDE "iniprint.h" +! INCLUDE "iniprint.h" WRITE(lunout,*) 'ii_begin =', ii_begin Index: LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_omp_data.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_omp_data.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_omp_data.F90 (revision 3049) @@ -7,4 +7,5 @@ INTEGER,SAVE :: omp_rank LOGICAL,SAVE :: is_omp_root + LOGICAL,SAVE :: is_omp_master ! alias of is_omp_root LOGICAL,SAVE :: is_using_omp LOGICAL,SAVE :: is_north_pole_phy, is_south_pole_phy @@ -17,5 +18,5 @@ INTEGER,SAVE :: klon_omp_begin INTEGER,SAVE :: klon_omp_end -!$OMP THREADPRIVATE(omp_rank,klon_omp,is_omp_root,klon_omp_begin,klon_omp_end) +!$OMP THREADPRIVATE(omp_rank,klon_omp,is_omp_root,is_omp_master,klon_omp_begin,klon_omp_end) !$OMP THREADPRIVATE(is_north_pole_phy, is_south_pole_phy) @@ -63,5 +64,5 @@ ENDIF !$OMP END MASTER - + is_omp_master=is_omp_root !$OMP MASTER @@ -106,6 +107,7 @@ SUBROUTINE Print_module_data + USE print_control_mod, ONLY: lunout IMPLICIT NONE - INCLUDE "iniprint.h" +! INCLUDE "iniprint.h" !$OMP CRITICAL Index: LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_para.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_para.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/phy_common/mod_phys_lmdz_para.F90 (revision 3049) @@ -49,6 +49,7 @@ SUBROUTINE Test_transfert USE mod_grid_phy_lmdz + USE print_control_mod, ONLY: lunout IMPLICIT NONE - INCLUDE "iniprint.h" +! INCLUDE "iniprint.h" REAL :: Test_Field1d_glo(klon_glo,nbp_lev) Index: LMDZ6/branches/DYNAMICO-conv/libf/phy_common/print_control_mod.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phy_common/print_control_mod.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/phy_common/print_control_mod.F90 (revision 3049) @@ -7,57 +7,21 @@ !$OMP THREADPRIVATE(lunout,prt_level,debug) + ! NB: Module variable Initializations done by set_print_control + ! routine from init_print_control_mod to avoid circular + ! module dependencies + CONTAINS - SUBROUTINE init_print_control - USE ioipsl_getin_p_mod, ONLY : getin_p - USE mod_phys_lmdz_para, ONLY: is_omp_root, is_master + SUBROUTINE set_print_control(lunout_,prt_level_,debug_) IMPLICIT NONE - - LOGICAL :: opened - INTEGER :: number + INTEGER :: lunout_ + INTEGER :: prt_level_ + LOGICAL :: debug_ + + lunout = lunout_ + prt_level = prt_level_ + debug = debug_ - !Config Key = prt_level - !Config Desc = niveau d'impressions de débogage - !Config Def = 0 - !Config Help = Niveau d'impression pour le débogage - !Config (0 = minimum d'impression) - prt_level = 0 - CALL getin_p('prt_level',prt_level) - - !Config Key = lunout - !Config Desc = unite de fichier pour les impressions - !Config Def = 6 - !Config Help = unite de fichier pour les impressions - !Config (defaut sortie standard = 6) - lunout=6 - CALL getin_p('lunout', lunout) - - IF (is_omp_root) THEN - IF (lunout /= 5 .and. lunout /= 6) THEN - INQUIRE(FILE='lmdz.out_0000',OPENED=opened,NUMBER=number) - IF (opened) THEN - lunout=number - ELSE - OPEN(UNIT=lunout,FILE='lmdz.out_0000',ACTION='write', & - STATUS='unknown',FORM='formatted') - ENDIF - ENDIF - ENDIF - - !Config Key = debug - !Config Desc = mode debogage - !Config Def = false - !Config Help = positionne le mode debogage - - debug = .FALSE. - CALL getin_p('debug',debug) - - IF (is_master) THEN - WRITE(lunout,*)"init_print_control: prt_level=",prt_level - WRITE(lunout,*)"init_print_control: lunout=",lunout - WRITE(lunout,*)"init_print_control: debug=",debug - ENDIF - - END SUBROUTINE init_print_control + END SUBROUTINE set_print_control END MODULE print_control_mod Index: LMDZ6/branches/DYNAMICO-conv/libf/phydev/inifis_mod.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phydev/inifis_mod.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/phydev/inifis_mod.F90 (revision 3049) @@ -1,3 +1,3 @@ -! $Id: $ +! $Id$ MODULE inifis_mod @@ -6,5 +6,5 @@ SUBROUTINE inifis(prad, pg, pr, pcpp) ! Initialize some physical constants and settings - USE print_control_mod, ONLY: init_print_control + USE init_print_control_mod, ONLY: init_print_control USE comcstphy, ONLY: rradius, & ! planet radius (m) rr, & ! recuced gas constant: R/molar mass of atm Index: LMDZ6/branches/DYNAMICO-conv/libf/phylmd/inifis_mod.F90 =================================================================== --- LMDZ6/branches/DYNAMICO-conv/libf/phylmd/inifis_mod.F90 (revision 3030) +++ LMDZ6/branches/DYNAMICO-conv/libf/phylmd/inifis_mod.F90 (revision 3049) @@ -6,5 +6,6 @@ SUBROUTINE inifis(punjours, prad, pg, pr, pcpp) ! Initialize some physical constants and settings - USE print_control_mod, ONLY: init_print_control, lunout + USE init_print_control_mod, ONLY : init_print_control + USE print_control_mod, ONLY: lunout IMPLICIT NONE