Skip to content
Snippets Groups Projects
Commit c4540393 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 12/02/2018: corrections for running on Ada

* corrected intent in READ_ALL_DATA_GRIB_CASE
* workaround for compiler bug (Intel 2013.1) in IO_WRITE_HEADER
* use own NetCDF (bug in default version of Ada (4.1.3))
parent 8a201189
No related branches found
No related tags found
No related merge requests found
...@@ -304,6 +304,7 @@ CONTAINS ...@@ -304,6 +304,7 @@ CONTAINS
CHARACTER(LEN=*),OPTIONAL,INTENT(IN) :: HDAD_NAME CHARACTER(LEN=*),OPTIONAL,INTENT(IN) :: HDAD_NAME
! !
CHARACTER(LEN=:),ALLOCATABLE :: YDAD_NAME CHARACTER(LEN=:),ALLOCATABLE :: YDAD_NAME
INTEGER :: ILEN
! !
CALL PRINT_MSG(NVERB_DEBUG,'IO','IO_WRITE_HEADER','called for file '//TRIM(TPFILE%CNAME)) CALL PRINT_MSG(NVERB_DEBUG,'IO','IO_WRITE_HEADER','called for file '//TRIM(TPFILE%CNAME))
! !
...@@ -327,7 +328,8 @@ CONTAINS ...@@ -327,7 +328,8 @@ CONTAINS
ALLOCATE(CHARACTER(LEN=MAX(NFILENAMELGTMAXLFI,LEN_TRIM(TPFILE%TDADFILE%CNAME))) :: YDAD_NAME) ALLOCATE(CHARACTER(LEN=MAX(NFILENAMELGTMAXLFI,LEN_TRIM(TPFILE%TDADFILE%CNAME))) :: YDAD_NAME)
YDAD_NAME(:) = TPFILE%TDADFILE%CNAME YDAD_NAME(:) = TPFILE%TDADFILE%CNAME
ELSE IF (PRESENT(HDAD_NAME)) THEN ELSE IF (PRESENT(HDAD_NAME)) THEN
ALLOCATE(CHARACTER(LEN=MAX(NFILENAMELGTMAXLFI,LEN_TRIM(HDAD_NAME))) :: YDAD_NAME) ILEN = LEN_TRIM(HDAD_NAME)
ALLOCATE(CHARACTER(LEN=MAX(NFILENAMELGTMAXLFI,ILEN)) :: YDAD_NAME)
YDAD_NAME(:) = HDAD_NAME YDAD_NAME(:) = HDAD_NAME
ELSE ELSE
CALL PRINT_MSG(NVERB_DEBUG,'IO','IO_WRITE_HEADER',TRIM(TPFILE%CNAME)// & CALL PRINT_MSG(NVERB_DEBUG,'IO','IO_WRITE_HEADER',TRIM(TPFILE%CNAME)// &
......
...@@ -18,7 +18,7 @@ SUBROUTINE READ_ALL_DATA_GRIB_CASE(HFILE,TPPRE_REAL1,HGRIB,TPPGDFILE, & ...@@ -18,7 +18,7 @@ SUBROUTINE READ_ALL_DATA_GRIB_CASE(HFILE,TPPRE_REAL1,HGRIB,TPPGDFILE, &
USE MODD_IO_ll, ONLY: TFILEDATA USE MODD_IO_ll, ONLY: TFILEDATA
! !
CHARACTER(LEN=4), INTENT(IN) :: HFILE ! which file ('ATM0','ATM1' or 'CHEM') CHARACTER(LEN=4), INTENT(IN) :: HFILE ! which file ('ATM0','ATM1' or 'CHEM')
TYPE(TFILEDATA),POINTER,INTENT(IN) :: TPPRE_REAL1 ! PRE_REAL1 file TYPE(TFILEDATA),POINTER,INTENT(INOUT) :: TPPRE_REAL1 ! PRE_REAL1 file
CHARACTER(LEN=28), INTENT(IN) :: HGRIB ! name of the GRIB file CHARACTER(LEN=28), INTENT(IN) :: HGRIB ! name of the GRIB file
TYPE(TFILEDATA), INTENT(IN) :: TPPGDFILE ! physiographic data file TYPE(TFILEDATA), INTENT(IN) :: TPPGDFILE ! physiographic data file
INTEGER, INTENT(IN) :: KVERB ! verbosity level INTEGER, INTENT(IN) :: KVERB ! verbosity level
...@@ -185,7 +185,7 @@ IMPLICIT NONE ...@@ -185,7 +185,7 @@ IMPLICIT NONE
! ------------------------ ! ------------------------
! !
CHARACTER(LEN=4), INTENT(IN) :: HFILE ! which file ('ATM0','ATM1' or 'CHEM') CHARACTER(LEN=4), INTENT(IN) :: HFILE ! which file ('ATM0','ATM1' or 'CHEM')
TYPE(TFILEDATA),POINTER,INTENT(IN) :: TPPRE_REAL1! PRE_REAL1 file TYPE(TFILEDATA),POINTER,INTENT(INOUT) :: TPPRE_REAL1! PRE_REAL1 file
CHARACTER(LEN=28), INTENT(IN) :: HGRIB ! name of the GRIB file CHARACTER(LEN=28), INTENT(IN) :: HGRIB ! name of the GRIB file
TYPE(TFILEDATA), INTENT(IN) :: TPPGDFILE ! physiographic data file TYPE(TFILEDATA), INTENT(IN) :: TPPGDFILE ! physiographic data file
INTEGER, INTENT(IN) :: KVERB ! verbosity level INTEGER, INTENT(IN) :: KVERB ! verbosity level
......
...@@ -163,6 +163,7 @@ module load ga/\${VER_GA} ...@@ -163,6 +163,7 @@ module load ga/\${VER_GA}
export VER_MPI=${VER_MPI:-MPIINTEL} export VER_MPI=${VER_MPI:-MPIINTEL}
export OPTLEVEL=${OPTLEVEL:-O2} export OPTLEVEL=${OPTLEVEL:-O2}
export MVWORK=${MVWORK:-YES} export MVWORK=${MVWORK:-YES}
export VER_CDF=${VER_CDF:-CDFAUTO}
export MNHENV=${MNHENV:-" export MNHENV=${MNHENV:-"
#export OBJDIR_PATH=$WORKDIR/DIR_OBJ_ADA #export OBJDIR_PATH=$WORKDIR/DIR_OBJ_ADA
export MP_MPILIB=pempi export MP_MPILIB=pempi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment