Changeset 3703 for LMDZ6/branches/Optimisation_LMDZ/libf/phylmd

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/phylmd

Files:

• cosp/dsd.F90 (modified) (3 diffs)
• cosp/radar_simulator.F90 (modified) (1 diff)
• mo_simple_plumes.F90 (modified) (1 diff)
• o3_chem_m.F90 (modified) (3 diffs)
• readaerosol_mod.F90 (modified) (2 diffs)
• rrtm/abor1.intfb.h (modified) (1 diff)
• rrtm/tpm_fft.F90 (modified) (1 diff)

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

@@ -1 @@
-  subroutine dsd(Q,Re,Np,D,N,nsizes,dtype,rho_a,tk, &
+  subroutine dsd(Q,Re_,Np,D,N,nsizes,dtype,rho_a,tk, &
              dmin,dmax,apm,bpm,rho_c,p1,p2,p3)
   use array_lib
@@ -57 +57 @@
   integer, intent(in) :: nsizes
   integer, intent(in) :: dtype
-  real*8, intent(in)  :: Q,Re,Np,D(nsizes)
+  real*8, intent(in)  :: Q,Re_,Np,D(nsizes)
   real*8, intent(in)  :: rho_a,tk,dmin,dmax,rho_c,p1,p2,p3
     
@@ -78 +78 @@
   real*8 :: tmp1, tmp2
   real*8 :: pi,rc,tc
+  real*8 :: Re
 
   integer k,lidx,uidx
+
+  Re = Re_
 
   tc = tk - 273.15

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

@@ -96 +96 @@
   real*8, dimension(hp%nhclass,nprof,ngate), intent(in) :: hm_matrix
   real*8, dimension(hp%nhclass,nprof,ngate), intent(inout) :: re_matrix
-  real*8, dimension(hp%nhclass,nprof,ngate), intent(in)    :: Np_matrix
+  real*8, dimension(hp%nhclass,nprof,ngate), intent(inout)    :: Np_matrix
 
 ! ----- OUTPUTS -----

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

@@ -280 +280 @@
 
     IF ((iweek > ntimes) .OR. (iweek < 1) .OR. (iyear > nyears) .OR. (iyear < 1)) THEN 
-      CALL abort_physic('set_time_weight','Time out of bounds')
+      CALL abort_physic('set_time_weight','Time out of bounds',1)
     ENDIF
 

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

@@ -24 +24 @@
 
     integer, intent(in):: julien ! jour julien, 1 <= julien <= 360
-    real, intent(in):: gmtime ! heure de la journée en fraction de jour
+    real, intent(in):: gmtime ! heure de la journ�e en fraction de jour
     real, intent(in):: t_seri(:, :) ! (klon, nbp_lev) temperature, in K
 
@@ -59 +59 @@
     real earth_long
     ! (longitude vraie de la Terre dans son orbite solaire, par
-    ! rapport au point vernal (21 mars), en degrés)
+    ! rapport au point vernal (21 mars), en degr�s)
 
     real pmu0(klon) ! mean of cosine of solar zenith angle during "pdtphys"
@@ -85 +85 @@
     ! Heterogeneous chemistry is only during daytime:
     call orbite(real(julien), earth_long, trash1)
-    call zenang(earth_long, gmtime, pdtphys, rlat, rlon, pmu0, trash2)
+    call zenang(earth_long, gmtime, 0., pdtphys, rlat, rlon, pmu0, trash2)
     forall (k = 1: nbp_lev)
        where (pmu0 <= cos(87. / 180. * pi)) b(:, k) = 0.

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

@@ -10 +10 @@
 !$OMP THREADPRIVATE(nbp_lat_src)  
   REAL, ALLOCATABLE, SAVE    :: psurf_interp(:,:)
-!$OMP THREADPRIVATE(psurf_interp)  
 
 CONTAINS
@@ -692 +691 @@
         CALL xios_send_field("load_"//TRIM(varname)//"_in",load_glo2D)
         CALL xios_recv_field("load_"//TRIM(varname)//"_out",load_out_mpi)
-        IF (first) THEN
+        IF (.not. allocated(psurf_interp)) THEN
+         ! psurf_interp is a shared array
           ALLOCATE(psurf_interp(klon_mpi,12))
           CALL xios_send_field("psurf_aerosol_in",psurf_glo2D)

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

@@ -1 +1 @@
 INTERFACE
 SUBROUTINE ABOR1(CDTEXT)
-CHARACTER(LEN=*) :: CDTEXT
+CHARACTER(LEN=*), INTENT(IN) :: CDTEXT
 END SUBROUTINE ABOR1
 END INTERFACE

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

@@ -7 +7 @@
 
 TYPE FFT_TYPE
-  REAL(KIND=JPRB)   ,POINTER :: TRIGS(:,:)
-  INTEGER(KIND=JPIM),POINTER :: NFAX(:,:)
+  REAL(KIND=JPRB)   ,ALLOCATABLE :: TRIGS(:,:)
+  INTEGER(KIND=JPIM),ALLOCATABLE :: NFAX(:,:)
 END TYPE FFT_TYPE