Changeset 3043

Timestamp:

Oct 25, 2017, 2:01:57 PM (7 years ago)

Author:

Ehouarn Millour

Message:

Some fixes to enable compiling with the pgf compiler and updated arch files for pgf on Ciclad.
EM

Location:

LMDZ6/trunk

Files:

• arch/arch-pgf_CICLAD.env (added)
• arch/arch-pgf_CICLAD.fcm (moved) (moved from LMDZ6/trunk/arch/arch-AMD64_CICLAD.fcm) (1 diff)
• arch/arch-pgf_CICLAD.path (moved) (moved from LMDZ6/trunk/arch/arch-AMD64_CICLAD.path) (2 diffs)
• libf/dyn3dmem/dynetat0_loc.F90 (moved) (moved from LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.f90)
• libf/phylmd/cv3_enthalpmix.F90 (modified) (1 diff)
• libf/phylmd/cv3_estatmix.F90 (modified) (1 diff)
• libf/phylmd/infotrac_phy.F90 (modified) (1 diff)
• libf/phylmd/phytrac_mod.F90 (modified) (1 diff)
• libf/phylmd/regr_pr_comb_coefoz_m.F90 (modified) (1 diff)
• libf/phylmd/rrtm/susw15.F90 (modified) (1 diff)

LMDZ6/trunk/arch/arch-pgf_CICLAD.fcm

@@ -1 @@
-%COMPILER            /usr/lib64/openmpi/1.2.8-pgf/bin/mpif90
-%LINK                /usr/lib64/openmpi/1.2.8-pgf/bin/mpif90
+%COMPILER            $MPI_BIN/mpif90
+%LINK                $MPI_BIN/mpif90
 %AR                  ar
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM 
-%BASE_FFLAGS         -i4 -r8
+%BASE_FFLAGS         -i4 -r8 -Mdalign 
 %PROD_FFLAGS         -O2 -Munroll -Mnoframe -Mautoinline -Mcache_align
-%DEV_FFLAGS          -Mbounds
-%DEBUG_FFLAGS        -g -traceback -Mbounds -Mchkfpstk -Mchkstk -Ktrap=denorm,divz,ovf,unf
+%DEV_FFLAGS          -O2 -traceback -Mbounds
+%DEBUG_FFLAGS        -O2 -g -traceback -Mbounds -Mchkfpstk -Mchkstk -Ktrap=denorm,divz,ovf,unf
 %MPI_FFLAGS
 %OMP_FFLAGS          -mp
-%BASE_LD             -lblas
-%MPI_LD              -L/usr/lib64/openmpi/1.2.8-pgf/lib
+%BASE_LD             -L${PGI_HOME}/lib -lblas -Wl,-rpath=$NETCDF_HOME/lib
+%MPI_LD              -L${MPI_LIB}
 %OMP_LD              -mp

LMDZ6/trunk/arch/arch-pgf_CICLAD.path

@@ -1 @@
-NETCDF_LIBDIR="-L/opt/netcdf/pgf/lib -lnetcdf"
-NETCDF_INCDIR=-I/opt/netcdf/pgf/include
+NETCDF_LIBDIR="-L${NETCDF_HOME}/lib -lnetcdf -lnetcdff"
+NETCDF_INCDIR=-I${NETCDF_HOME}/include
 IOIPSL_INCDIR=$LMDGCM/../../lib
 IOIPSL_LIBDIR=$LMDGCM/../../lib
@@ -9 +9 @@
 INCA_LIBDIR=$LMDGCM/../INCA/config/lib
 INCA_INCDIR=$LMDGCM/../INCA/config/lib
+XIOS_INCDIR=$LMDGCM/../XIOS/inc
+XIOS_LIBDIR=$LMDGCM/../XIOS/lib

LMDZ6/trunk/libf/phylmd/cv3_enthalpmix.F90

@@ -50 +50 @@
   REAL                                      :: cpn
   REAL                                      :: x, y, p0, p0m1, zdelta, zcor
-  REAL                                      :: dpmin=1.
+  REAL, SAVE                                :: dpmin=1.
 !$OMP THREADPRIVATE(dpmin)
   REAL, DIMENSION(len)                      :: plim2p  ! = min(plim2(:),plim1(:)-dpmin)

LMDZ6/trunk/libf/phylmd/cv3_estatmix.F90

@@ -53 +53 @@
   REAL                                      :: cpn
   REAL                                      :: x, y, p0, zdelta, zcor
-  REAL                                      :: dpmin=1.
+  REAL, SAVE                                :: dpmin=1.
 !$OMP THREADPRIVATE(dpmin)
   REAL, DIMENSION(len)                      :: plim2p  ! = min(plim2(:),plim1(:)-dpmin)

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -43 +43 @@
   INTEGER, ALLOCATABLE, DIMENSION(:,:), SAVE    :: iqfils
   INTEGER, ALLOCATABLE, DIMENSION(:), SAVE    :: iqpere
-!$OMP THREADPRIVATE(nqfils,nqdesc,nqdesc_tot,iqfils,iqpers)
+!$OMP THREADPRIVATE(nqfils,nqdesc,nqdesc_tot,iqfils,iqpere)
 
 ! conv_flg(it)=0 : convection desactivated for tracer number it 

LMDZ6/trunk/libf/phylmd/phytrac_mod.F90

@@ -49 +49 @@
 !$OMP THREADPRIVATE(d_tr_trsp,d_tr_sscav,d_tr_sat,d_tr_uscav,qPr,qDi)
 !$OMP THREADPRIVATE(d_tr_insc,d_tr_bcscav,d_tr_evapls,d_tr_ls,qPrls)
-!$OMP THREADPRIVATE(d_tr,d_tr_cl,d_tr_dry,flux_tr_dry,d_tr_dec,d_tr_cv)
+!$OMP THREADPRIVATE(d_tr_cl,d_tr_dry,flux_tr_dry,d_tr_dec,d_tr_cv)
 
 

LMDZ6/trunk/libf/phylmd/regr_pr_comb_coefoz_m.F90

@@ -128 +128 @@
     !$omp end master
 
-    call regr_pr_time_av(ncid, (/"a2       ", "a4       ", "a6       ", &
-         "P_net_Mob", "r_Mob    ", "temp_Mob ", "R_Het    "/), REAL(julien-1), &
+    call regr_pr_time_av(ncid, (/"a2           ", "a4           ", "a6           ", &
+         "P_net_Mob    ", "r_Mob        ", "temp_Mob     ", "R_Het        "/), REAL(julien-1), &
          press_in_edg, paprs, coefoz)
     a2 = coefoz(:, :, 1)

LMDZ6/trunk/libf/phylmd/rrtm/susw15.F90

@@ -58 +58 @@
 
 IMPLICIT NONE
-REAL(KIND=JPRB)   :: ZPDH2O=0.8_JPRB
-REAL(KIND=JPRB)   :: ZPDUMG=0.75_JPRB
-REAL(KIND=JPRB)   :: ZPRH2O=30000._JPRB
-REAL(KIND=JPRB)   :: ZPRUMG=30000._JPRB
+REAL(KIND=JPRB),SAVE   :: ZPDH2O=0.8_JPRB
+REAL(KIND=JPRB),SAVE   :: ZPDUMG=0.75_JPRB
+REAL(KIND=JPRB),SAVE   :: ZPRH2O=30000._JPRB
+REAL(KIND=JPRB),SAVE   :: ZPRUMG=30000._JPRB
 
 !$OMP THREADPRIVATE(zpdh2o,zpdumg,zprh2o,zprumg)