Changeset 3703 for LMDZ6


Ignore:
Timestamp:
Jun 11, 2020, 11:01:18 AM (4 years ago)
Author:
adurocher
Message:

Fixed compilation errors

  • Fixed some OpenMP syntax errors for scorep
  • Fix issues with ifort -check all -warn all -O0
Location:
LMDZ6/branches/Optimisation_LMDZ/libf
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Optimisation_LMDZ/libf/dyn3dmem/gcm.F90

    r3579 r3703  
    454454
    455455  !!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
     456  !     Copy all threadprivate variables in temps_mod logic_mod
    456457  !$OMP PARALLEL DEFAULT(SHARED) &
    457   !     Copy all threadprivate variables in temps_mod
    458458  !$OMP COPYIN(dt,jD_ref,jH_ref,start_time,hour_ini,day_ini,day_end) &
    459459  !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend) &
    460   !     Copy all threadprivate variables from logic_mod
    461460  !$OMP COPYIN(purmats,forward,leapf,apphys,statcl,conser,apdiss,apdelq) &
    462461  !$OMP COPYIN(saison,ecripar,fxyhypb,ysinus,read_start,ok_guide) &

  • LMDZ6/branches/Optimisation_LMDZ/libf/dyn3dmem/vlsplt_loc.F

    r3435 r3703  
    10561056         ENDDO
    10571057       ENDDO
    1058 c$OMP END DO NO WAIT
     1058c$OMP END DO NOWAIT
    10591059
    10601060c Reindicage vertical en accumulant les flux sur
    … …  
    10901090         ENDDO
    10911091      ENDDO
    1092 c$OMP END DO NO WAIT
     1092c$OMP END DO NOWAIT
    10931093
    10941094      ENDDO ! WHILE (countcfl>=1)

  • LMDZ6/branches/Optimisation_LMDZ/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

    r3579 r3703  
    109109 
    110110!!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
    111 !$OMP PARALLEL DEFAULT(SHARED) &
    112111!       Copy all threadprivate variables in temps_mod
    113 !$OMP COPYIN(annee_ref, day_ini, day_ref, start_time)
     112!$OMP PARALLEL DEFAULT(SHARED) COPYIN(annee_ref,day_ini,day_ref,start_time)
    114113
    115114  ! Initialize physical constants in physics:

  • LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/cosp/dsd.F90

    r2428 r3703  
    1   subroutine dsd(Q,Re,Np,D,N,nsizes,dtype,rho_a,tk, &
     1  subroutine dsd(Q,Re_,Np,D,N,nsizes,dtype,rho_a,tk, &
    22             dmin,dmax,apm,bpm,rho_c,p1,p2,p3)
    33  use array_lib
    … …  
    5757  integer, intent(in) :: nsizes
    5858  integer, intent(in) :: dtype
    59   real*8, intent(in)  :: Q,Re,Np,D(nsizes)
     59  real*8, intent(in)  :: Q,Re_,Np,D(nsizes)
    6060  real*8, intent(in)  :: rho_a,tk,dmin,dmax,rho_c,p1,p2,p3
    6161   
    … …  
    7878  real*8 :: tmp1, tmp2
    7979  real*8 :: pi,rc,tc
     80  real*8 :: Re
    8081
    8182  integer k,lidx,uidx
     83
     84  Re = Re_
    8285
    8386  tc = tk - 273.15

  • LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/cosp/radar_simulator.F90

    r2428 r3703  
    9696  real*8, dimension(hp%nhclass,nprof,ngate), intent(in) :: hm_matrix
    9797  real*8, dimension(hp%nhclass,nprof,ngate), intent(inout) :: re_matrix
    98   real*8, dimension(hp%nhclass,nprof,ngate), intent(in)    :: Np_matrix
     98  real*8, dimension(hp%nhclass,nprof,ngate), intent(inout)    :: Np_matrix
    9999
    100100! ----- OUTPUTS -----

  • LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/mo_simple_plumes.F90

    r3531 r3703  
    280280
    281281    IF ((iweek > ntimes) .OR. (iweek < 1) .OR. (iyear > nyears) .OR. (iyear < 1)) THEN
    282       CALL abort_physic('set_time_weight','Time out of bounds')
     282      CALL abort_physic('set_time_weight','Time out of bounds',1)
    283283    ENDIF
    284284

  • LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/o3_chem_m.F90

    r2346 r3703  
    2424
    2525    integer, intent(in):: julien ! jour julien, 1 <= julien <= 360
    26     real, intent(in):: gmtime ! heure de la journée en fraction de jour
     26    real, intent(in):: gmtime ! heure de la journ�e en fraction de jour
    2727    real, intent(in):: t_seri(:, :) ! (klon, nbp_lev) temperature, in K
    2828
    … …  
    5959    real earth_long
    6060    ! (longitude vraie de la Terre dans son orbite solaire, par
    61     ! rapport au point vernal (21 mars), en degrés)
     61    ! rapport au point vernal (21 mars), en degr�s)
    6262
    6363    real pmu0(klon) ! mean of cosine of solar zenith angle during "pdtphys"
    … …  
    8585    ! Heterogeneous chemistry is only during daytime:
    8686    call orbite(real(julien), earth_long, trash1)
    87     call zenang(earth_long, gmtime, pdtphys, rlat, rlon, pmu0, trash2)
     87    call zenang(earth_long, gmtime, 0., pdtphys, rlat, rlon, pmu0, trash2)
    8888    forall (k = 1: nbp_lev)
    8989       where (pmu0 <= cos(87. / 180. * pi)) b(:, k) = 0.

  • LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/readaerosol_mod.F90

    r3440 r3703  
    1010!$OMP THREADPRIVATE(nbp_lat_src) 
    1111  REAL, ALLOCATABLE, SAVE    :: psurf_interp(:,:)
    12 !$OMP THREADPRIVATE(psurf_interp) 
    1312
    1413CONTAINS
    … …  
    692691        CALL xios_send_field("load_"//TRIM(varname)//"_in",load_glo2D)
    693692        CALL xios_recv_field("load_"//TRIM(varname)//"_out",load_out_mpi)
    694         IF (first) THEN
     693        IF (.not. allocated(psurf_interp)) THEN
     694         ! psurf_interp is a shared array
    695695          ALLOCATE(psurf_interp(klon_mpi,12))
    696696          CALL xios_send_field("psurf_aerosol_in",psurf_glo2D)

  • LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/rrtm/abor1.intfb.h

    r1990 r3703  
    11INTERFACE
    22SUBROUTINE ABOR1(CDTEXT)
    3 CHARACTER(LEN=*) :: CDTEXT
     3CHARACTER(LEN=*), INTENT(IN) :: CDTEXT
    44END SUBROUTINE ABOR1
    55END INTERFACE

  • LMDZ6/branches/Optimisation_LMDZ/libf/phylmd/rrtm/tpm_fft.F90

    r2010 r3703  
    77
    88TYPE FFT_TYPE
    9   REAL(KIND=JPRB)   ,POINTER :: TRIGS(:,:)
    10   INTEGER(KIND=JPIM),POINTER :: NFAX(:,:)
     9  REAL(KIND=JPRB)   ,ALLOCATABLE :: TRIGS(:,:)
     10  INTEGER(KIND=JPIM),ALLOCATABLE :: NFAX(:,:)
    1111END TYPE FFT_TYPE
    1212
Note: See TracChangeset for help on using the changeset viewer.