diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_diag b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_diag deleted file mode 100755 index 99b38adf624f08a03403fc4400186e0b5a1e00df..0000000000000000000000000000000000000000 --- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_diag +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -#SBATCH -J diag_fanny -#SBATCH -N 2 # nodes number (=NBP) -#SBATCH -n 256 # CPUs number (on all nodes) (=NBP*TPN) -#SBATCH -o diag_fanny.eo%j # -#SBATCH -e diag_fanny.eo%j # -#SBATCH -t 04:00:00 # time limit - -# Echo des commandes -ulimit -c 0 -ulimit -s unlimited -# Arrete du job des la premiere erreur -set -e -# Nom de la machine -hostname - - -. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2 - -export MPIRUN="Mpirun -np 256" - -set -x -set -e - - -ls -lrt - -for ECH in '025' -do - -cat > DIAG1.nam << EOF -&NAM_DIAG - CISO='PREVTK', - LVAR_RS=T, - NCONV_KF=-1, - LVAR_MRW=T, - LVAR_MRSV=F, - LTRAJ=T, - LTPZH=T, - LMOIST_V=T, LMOIST_E=T, - LMSLP=T, - LCLD_COV=F, - LVORT=T, - LVAR_PR=F, LTOTAL_PR=T, - NCAPE=1, - LRADAR=T, - LTHW=T, -/ -&NAM_CONFIO LCDF4=T LLFIREAD=F LLFIOUT=F / -&NAM_DIAG_SURFn N2M=1 -/ -&NAM_DIAG_FILE YSUFFIX = "d" -YINIFILE(1) = "FANNY.1.WENO5.${ECH}", -YINIFILEPGD(1)='PGD_2.5km_AR'/ -EOF -rm -f FANNY.1.WENO5.${ECH}d.??? -time ${MPIRUN} DIAG${XYZ} -mv OUTPUT_LISTING0 OUTPUT_LISTING0_diag.${ECH} -mv OUTPUT_LISTING1 OUTPUT_LISTING1_diag.${ECH} -ls -lrt - -done - - -rm -f file_for_xtransfer pipe_name - - -ls -lrt -rm -Rf OUTPUT -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_diag_one b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_diag_one deleted file mode 100755 index 6cb1a3d7e7c7bbc2ab8f3366207a25d6c70b6d73..0000000000000000000000000000000000000000 --- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_diag_one +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -#SBATCH -J diag_fanny -#SBATCH -N 1 # nodes number (=NBP) -#SBATCH -n 128 # CPUs number (on all nodes) (=NBP*TPN) -#SBATCH -o diag_fanny.eo%j # -#SBATCH -e diag_fanny.eo%j # -#SBATCH -t 00:10:00 # time limit - -# Echo des commandes -ulimit -c 0 -ulimit -s unlimited -# Arrete du job des la premiere erreur -set -e -# Nom de la machine -hostname - - -. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2 - -export MPIRUN="Mpirun -np 128" - -set -x -set -e - - -ls -lrt - -time ${MPIRUN} DIAG${XYZ} diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_LEFR/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_LEFR/run_mesonh index 97a73f0e4e620125f90c3c359fdccc23a4c2f5e9..6142bac580d05ae96c7786c277efcae151e10e90 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_LEFR/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_LEFR/run_mesonh @@ -22,22 +22,8 @@ export MPIRUN="Mpirun -np 256" set -x set -e - -ls -lrt - rm -f FIRE_.1.CEN4T.* time ${MPIRUN} MESONH${XYZ} -mv OUTPUT_LISTING0 OUTPUT_LISTING0_run -mv OUTPUT_LISTING1 OUTPUT_LISTING1_run -ls -lrt - rm -f file_for_xtransfer pipe_name PRESSURE REMAP* - -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh index 1b3fe0f4e5e46d3fd2beef3efa452f1a24aa3d63..6142bac580d05ae96c7786c277efcae151e10e90 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh @@ -22,14 +22,8 @@ export MPIRUN="Mpirun -np 256" set -x set -e - -ls -lrt - rm -f FIRE_.1.CEN4T.* time ${MPIRUN} MESONH${XYZ} -mv OUTPUT_LISTING0 OUTPUT_LISTING0_run -mv OUTPUT_LISTING1 OUTPUT_LISTING1_run -ls -lrt rm -f file_for_xtransfer pipe_name PRESSURE REMAP* ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh index e63e25a8b5c4673031a1743c601104585263b1cf..e66cbd1b66042e8c07f478948e265db75c5065f9 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh @@ -23,11 +23,7 @@ export MPIRUN="Mpirun -np 256" set -x set -e - -ls -lrt - rm -f FIRE_.1.CEN4T.* time ${MPIRUN} MESONH${XYZ} -mv OUTPUT_LISTING0 OUTPUT_LISTING0_run -mv OUTPUT_LISTING1 OUTPUT_LISTING1_run rm -f file_for_xtransfer pipe_name PRESSURE REMAP* +ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/WENO5/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/WENO5/run_mesonh index 97a73f0e4e620125f90c3c359fdccc23a4c2f5e9..2803d6b215bfb0bd4d94901e1c79eed8106021bb 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/WENO5/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/WENO5/run_mesonh @@ -22,22 +22,7 @@ export MPIRUN="Mpirun -np 256" set -x set -e - -ls -lrt - rm -f FIRE_.1.CEN4T.* time ${MPIRUN} MESONH${XYZ} -mv OUTPUT_LISTING0 OUTPUT_LISTING0_run -mv OUTPUT_LISTING1 OUTPUT_LISTING1_run -ls -lrt - rm -f file_for_xtransfer pipe_name PRESSURE REMAP* - -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. -ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_mesonh index 871462d4cdd8280bc515e7ffd2c2b5b5bb7f5ceb..0c14d656cf1fd2b4bbf793549873c769a8c539df 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_mesonh @@ -14,7 +14,7 @@ set -e # Nom de la machine hostname -. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-GABLS1 +. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2 export MPIRUN="Mpirun -np 1 " diff --git a/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_prep_ideal_case b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_prep_ideal_case index 28c5da38f30a40d1b586ecbbffbc4640ec91bc3d..a4e52d33a4e630137fcb66f7f07f4d18b69537ee 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_prep_ideal_case +++ b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/1D/run_prep_ideal_case @@ -17,7 +17,7 @@ hostname rm -f GABLS1* -. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-GABLS1 +. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2 export MPIRUN="Mpirun -np 1" diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/002_pgd2/run_pgd2 b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/002_pgd2/run_pgd2 index 2ffdb9f11873a9907d34978dee12dfc7debd7d0c..d7816c212fefe174adc691d90053768559ea2681 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/002_pgd2/run_pgd2 +++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/002_pgd2/run_pgd2 @@ -14,7 +14,7 @@ set -e # Profil utilisateur MesoNH (obligatoire) . ~/MNH-V5-7-0/conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-ECRAD140-MPIAUTO-O2-PANAME_FOR571 -ln -sf ../001_pgd1/PGD_1200m.nc . +ln -sf ../001_pgd1/PGD_1200m.* . ln -sf ~rodierq/SAVE/mesonh/PGD/sand_0-200cm* . ln -sf ~rodierq/SAVE/mesonh/PGD/clay_0-200cm* . diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/003_pgd3/run_pgd3 b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/003_pgd3/run_pgd3 index e7711f0dabde013b8297cde03df27985530bde30..2097ef0593d0624c7612a2ff673d97d9af3458c5 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/003_pgd3/run_pgd3 +++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/003_pgd3/run_pgd3 @@ -14,8 +14,8 @@ set -e # Profil utilisateur MesoNH (obligatoire) . ~/MNH-V5-7-0/conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-ECRAD140-MPIAUTO-O2-PANAME_FOR571 -ln -sf ../001_pgd1/PGD_1200m.nc . -ln -sf ../002_pgd2/PGD_300m.nc . +ln -sf ../001_pgd1/PGD_1200m.* . +ln -sf ../002_pgd2/PGD_300m.* . ln -sf ~rodierq/SAVE/mesonh/PGD/sand_0-200cm* . ln -sf ~rodierq/SAVE/mesonh/PGD/clay_0-200cm* . diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/004_nest_pgd/run_nest_pgd b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/004_nest_pgd/run_nest_pgd index d91bc92858a23b1dab88041221a8d6ac65a6625a..901c534549c42d25d7e5ec20e359663a060bbf2f 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/004_nest_pgd/run_nest_pgd +++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/004_nest_pgd/run_nest_pgd @@ -21,9 +21,9 @@ set -e -ln -sf ../001_pgd1/PGD_1200m.nc . -ln -sf ../002_pgd2/PGD_300m.nc . -ln -sf ../003_pgd3/PGD_100m.nc . +ln -sf ../001_pgd1/PGD_1200m.* . +ln -sf ../002_pgd2/PGD_300m.* . +ln -sf ../003_pgd3/PGD_100m.* . # Exécution (obligatoire) export MPIRUN="Mpirun -np 16 " diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/initial_guess.f90 b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/initial_guess.f90 index 5df784f2b09834c251406df9be03108d24524d1a..cdd6cc6ddefbae819f012622376cdf2841e41376 100644 --- a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/initial_guess.f90 +++ b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/initial_guess.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -125,7 +125,7 @@ END MODULE MODI_INITIAL_GUESS !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -207,13 +207,13 @@ INTEGER :: JIBEG,JIEND ! Loop indexes for the cooling area !------------------------------------------------------------------------------- ! !* 1. COMPUTES THE INVERSE OF THE APPLICABLE TIMESTEP -! ----------------------------------------------- +! ----------------------------------------------- ! ZINVTSTEP = 1./PTSTEP ! ! !* 2. COMPUTES THE FIRST SOURCE TERMS -! ------------------------------- +! ------------------------------- ! ! *** momentum ! forward-in-time time-marching scheme diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/read_exsegn.f90 b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/read_exsegn.f90 index f548f943e29dfde3ffec9ef0545f79652b85bb54..74c880827d46aa5e7623822f44506d21c2da628e 100644 --- a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/read_exsegn.f90 +++ b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/read_exsegn.f90 @@ -200,7 +200,7 @@ END MODULE MODI_READ_EXSEG_n !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -579,9 +579,9 @@ IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_EOL_ADR) CALL POSNAM( TPEXSEGFILE, 'NAM_EOL_ALM', GFOUND ) IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_EOL_ALM) CALL POSNAM( TPEXSEGFILE, 'NAM_PROFILERN', GFOUND ) -IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_PROFILERn) +IF (GFOUND) CALL READ_PROFILERN_NML() CALL POSNAM( TPEXSEGFILE, 'NAM_STATIONN', GFOUND ) -IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_STATIONn) +IF (GFOUND) CALL READ_STATIONN_NML() CALL POSNAM( TPEXSEGFILE, 'NAM_FIREN', GFOUND ) IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_FIREn) ! @@ -849,7 +849,11 @@ XUTRANS=-XDUMMY8 !!! SQUALL LINE COPT81 !------------------------------------------------------------------------------- ! +#ifndef MNH_MGSOLVER CALL TEST_NAM_VAR(ILUOUT,'CPRESOPT',CPRESOPT,'RICHA','CGRAD','CRESI','ZRESI') +#else +CALL TEST_NAM_VAR(ILUOUT,'CPRESOPT',CPRESOPT,'RICHA','CGRAD','CRESI','ZRESI','ZSOLV') +#endif ! CALL TEST_NAM_VAR(ILUOUT,'CUVW_ADV_SCHEME',CUVW_ADV_SCHEME, & 'CEN4TH','CEN2ND','WENO_K' ) @@ -886,6 +890,10 @@ CALL TEST_NAM_VAR(ILUOUT,'CLBCX(1)',CLBCX(1),'CYCL','WALL','OPEN') CALL TEST_NAM_VAR(ILUOUT,'CLBCX(2)',CLBCX(2),'CYCL','WALL','OPEN') CALL TEST_NAM_VAR(ILUOUT,'CLBCY(1)',CLBCY(1),'CYCL','WALL','OPEN') CALL TEST_NAM_VAR(ILUOUT,'CLBCY(2)',CLBCY(2),'CYCL','WALL','OPEN') +#ifdef MNH_OPENACC +IF ( CLBCX(1) /= 'OPEN' .OR. CLBCX(2) /= 'OPEN' .OR. CLBCY(1) /= 'OPEN' .OR. CLBCY(2) /= 'OPEN' ) & + CALL PRINT_MSG( NVERB_FATAL, 'GEN', 'READ_EXSEG_n', 'non OPEN boundary conditions not yet implemented with OpenACC') +#endif ! CALL TURBN_INIT(CPROGRAM, TPEXSEGFILE, .FALSE., ILUOUT, .FALSE., .FALSE., .TRUE., 0) CALL NEBN_INIT(CPROGRAM, TPEXSEGFILE, .FALSE., ILUOUT, .FALSE., .FALSE., .TRUE., 0) @@ -3112,4 +3120,21 @@ WRITE(UNIT=ILUOUT,FMT='(/)') ! !------------------------------------------------------------------------------- ! +CONTAINS + SUBROUTINE READ_PROFILERN_NML() + ! This intermediate subroutine is necessary to work around a bug in the gfortran compiler + ! (versions > 13: at least 14.1.0 and 14.2.0) + USE MODN_PROFILER_n + + READ(UNIT=ILUSEG,NML=NAM_PROFILERn) + END SUBROUTINE READ_PROFILERN_NML + + SUBROUTINE READ_STATIONN_NML() + ! This intermediate subroutine is necessary to work around a bug in the gfortran compiler + ! (versions > 13: at least 14.1.0 and 14.2.0) + USE MODN_STATION_n + + READ(UNIT=ILUSEG,NML=NAM_STATIONn) + END SUBROUTINE READ_STATIONN_NML + END SUBROUTINE READ_EXSEG_n diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_mask.f90 b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_mask.f90 index 0b18021637f6c1f035627678b64cd62fc787af52..8a493111f7f743980a34a3239b124f2c71ca0893 100644 --- a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_mask.f90 +++ b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_mask.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -43,7 +43,7 @@ !! !! AUTHOR !! ------ -!! J. Nicolau * Meteo France * +!! J. Nicolau * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -80,7 +80,7 @@ INTEGER :: IIE,IJE ! Upper bounds of the physical ! CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) ! -!* 2. DEFINITION OF THE MASK +!* 2. DEFINITION OF THE MASK ! ---------------------- ! initialization to FALSE on the extended subdomain LBU_MASK(:,:,:)=.FALSE. @@ -94,7 +94,7 @@ LBU_MASK(IIB:IIE,IJB:IJE,2)=XINPRR(IIB:IIE,IJB:IJE)<5.E-6/3.6 ! !============================================================================== ! -!* 3. INCREASE IN SURFACE ARRAY +!* 3. INCREASE IN SURFACE ARRAY ! ------------------------- ! WHERE (LBU_MASK(:,:,:)) diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_rsou.f90 b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_rsou.f90 index 1e6a3d95730685e9297eea6f0e91562037533e4f..796d9cd76f483380639efcf5e02ea3114bb3f9bd 100644 --- a/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_rsou.f90 +++ b/MY_RUN/INTEGRATION_CASES/LOCAL/COPT81/SOURCES/set_rsou.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -14,7 +14,7 @@ INTERFACE ! USE MODD_IO, ONLY : TFILEDATA ! -TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! outpput data file +TYPE(TFILEDATA), INTENT(INOUT) :: TPFILE ! outpput data file TYPE(TFILEDATA), INTENT(IN) :: TPEXPREFILE ! input data file CHARACTER(LEN=*), INTENT(IN) :: HFUNU ! type of variation of U ! in y direction @@ -229,7 +229,7 @@ END MODULE MODI_SET_RSOU !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -296,7 +296,7 @@ IMPLICIT NONE ! !* 0.1 Declarations of arguments : ! -TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! outpput data file +TYPE(TFILEDATA), INTENT(INOUT) :: TPFILE ! outpput data file TYPE(TFILEDATA), INTENT(IN) :: TPEXPREFILE ! input data file CHARACTER(LEN=*), INTENT(IN) :: HFUNU ! type of variation of U ! in y direction @@ -408,9 +408,9 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZOC_TAUX,ZOC_TAUY REAL :: ZJZTIME ! TIME(HOUR) READ in PRE_IDEA1.NAM !-------------------------------------------------------------------------------- ! -!* 1. PROLOGUE : INITIALIZE SOME CONSTANTS, RETRIEVE LOGICAL +!* 1. PROLOGUE : INITIALIZE SOME CONSTANTS, RETRIEVE LOGICAL ! UNIT NUMBERS AND READ KIND OF DATA IN EXPRE FILE -! ------------------------------------------------------- +! ------------------------------------------------------- ! CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) CALL GET_OR_ll('B',IXOR_ll,IYOR_ll) @@ -445,8 +445,8 @@ GUSERC=.FALSE. IF(LUSERC .AND. (YKIND == 'PUVTHDMR' .OR. YKIND == 'ZUVTHDMR')) GUSERC=.TRUE. !------------------------------------------------------------------------------- ! -!* 2. READ DATA AND CONVERT IN (height,U,V), (height,Thetav,r) -! -------------------------------------------------------- +!* 2. READ DATA AND CONVERT IN (height,U,V), (height,Thetav,r) +! -------------------------------------------------------- ! SELECT CASE(YKIND) ! @@ -1480,8 +1480,8 @@ ZU(:) = ZU(:)+XDUMMY8 ! !------------------------------------------------------------------------------- ! -!* 3. INTERPOLATE ON THE VERTICAL MIXED MODEL GRID -! --------------------------------------------------------- +!* 3. INTERPOLATE ON THE VERTICAL MIXED MODEL GRID +! --------------------------------------------------------- ! ! !