From 63ba418c6ae3beb09fe523fa10e3cba1f70a54c6 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Tue, 13 Jun 2017 08:45:28 +0200 Subject: [PATCH] Philippe 12/06/2017: IO: removed HFIPRI argument in IO_WRITE_FIELD and other IO subroutines --- src/LIB/SURCOUCHE/src/fmwrit_ll.f90 | 162 +++----- src/LIB/SURCOUCHE/src/io_write_field.f90 | 58 ++- src/LIB/SURCOUCHE/src/mode_netcdf.f90 | 3 +- src/MNH/advection_metsv.f90 | 8 +- src/MNH/c2r2_adjust.f90 | 2 +- src/MNH/call_rttov11.f90 | 2 +- src/MNH/call_rttov8.f90 | 10 +- src/MNH/compute_r00.f90 | 10 +- src/MNH/diag.f90 | 2 +- src/MNH/free_atm_profile.f90 | 8 +- src/MNH/khko_notadjust.f90 | 4 +- src/MNH/lima_adjust.f90 | 4 +- src/MNH/menu_diachro.f90 | 4 +- src/MNH/mnhwrite_zs_dummyn.f90 | 17 +- src/MNH/modeln.f90 | 12 +- src/MNH/paspol.f90 | 10 +- src/MNH/phys_paramn.f90 | 6 +- src/MNH/prandtl.f90 | 18 +- src/MNH/prep_ideal_case.f90 | 12 +- src/MNH/prep_nest_pgd.f90 | 22 +- src/MNH/prep_pgd.f90 | 28 +- src/MNH/prep_real_case.f90 | 2 +- src/MNH/prep_surfex.f90 | 10 +- src/MNH/radiations.f90 | 98 ++--- src/MNH/rain_c2r2_khko.f90 | 16 +- src/MNH/resolved_cloud.f90 | 2 +- src/MNH/shallow_mf_pack.f90 | 22 +- src/MNH/spawn_model2.f90 | 2 +- src/MNH/tke_eps_sources.f90 | 16 +- src/MNH/turb.f90 | 30 +- src/MNH/turb_cloud_index.f90 | 24 +- src/MNH/turb_hor.f90 | 22 +- src/MNH/turb_hor_dyn_corr.f90 | 14 +- src/MNH/turb_hor_splt.f90 | 12 +- src/MNH/turb_hor_sv_flux.f90 | 12 +- src/MNH/turb_hor_thermo_corr.f90 | 14 +- src/MNH/turb_hor_thermo_flux.f90 | 20 +- src/MNH/turb_hor_uv.f90 | 10 +- src/MNH/turb_hor_uw.f90 | 10 +- src/MNH/turb_hor_vw.f90 | 10 +- src/MNH/turb_ver.f90 | 24 +- src/MNH/turb_ver_dyn_flux.f90 | 14 +- src/MNH/turb_ver_sv_flux.f90 | 10 +- src/MNH/turb_ver_thermo_corr.f90 | 14 +- src/MNH/turb_ver_thermo_flux.f90 | 14 +- src/MNH/uv_to_zonal_and_merid.f90 | 8 +- src/MNH/ver_thermo.f90 | 2 +- src/MNH/write_balloonn.f90 | 10 +- src/MNH/write_budget.f90 | 6 +- src/MNH/write_diachro.f90 | 30 +- src/MNH/write_dummy_gr_fieldn.f90 | 5 +- src/MNH/write_hgrid.f90 | 30 +- src/MNH/write_hgridn.f90 | 36 +- src/MNH/write_lbn.f90 | 128 +++--- src/MNH/write_lfifm1_for_diag.f90 | 484 ++++++++++----------- src/MNH/write_lfifm1_for_diag_supp.f90 | 132 +++--- src/MNH/write_lfifmn_fordiachron.f90 | 76 ++-- src/MNH/write_lfin.f90 | 508 +++++++++++------------ src/MNH/write_surf_mnh.f90 | 69 ++- src/MNH/zoom_pgd.f90 | 22 +- src/MNH/zsmt_pgd.f90 | 4 +- 61 files changed, 1115 insertions(+), 1259 deletions(-) diff --git a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 index 1752b4917..bf58fdffe 100644 --- a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 +++ b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 @@ -307,14 +307,13 @@ CONTAINS END SUBROUTINE FIELD_METADATA_CHECK - SUBROUTINE IO_WRITE_HEADER(TPFILE,HLUOUT,HDAD_NAME) + SUBROUTINE IO_WRITE_HEADER(TPFILE,HDAD_NAME) ! USE MODD_CONF USE MODD_CONF_n, ONLY : CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILEDATA ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! File structure - CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! File for prints in FM CHARACTER(LEN=*),OPTIONAL,INTENT(IN) :: HDAD_NAME ! CALL PRINT_MSG(NVERB_DEBUG,'IO','IO_WRITE_HEADER','called for file'//TRIM(TPFILE%CNAME)) @@ -325,21 +324,21 @@ CONTAINS END IF END IF ! - CALL IO_WRITE_HEADER_NC4(TPFILE,HLUOUT) + CALL IO_WRITE_HEADER_NC4(TPFILE) ! - CALL IO_WRITE_FIELD(TPFILE,'MASDEV', HLUOUT,NMASDEV) - CALL IO_WRITE_FIELD(TPFILE,'BUGFIX', HLUOUT,NBUGFIX) - CALL IO_WRITE_FIELD(TPFILE,'BIBUSER', HLUOUT,CBIBUSER) - CALL IO_WRITE_FIELD(TPFILE,'PROGRAM', HLUOUT,CPROGRAM) - CALL IO_WRITE_FIELD(TPFILE,'STORAGE_TYPE',HLUOUT,CSTORAGE_TYPE) - CALL IO_WRITE_FIELD(TPFILE,'MY_NAME', HLUOUT,TPFILE%CNAME) + CALL IO_WRITE_FIELD(TPFILE,'MASDEV', NMASDEV) + CALL IO_WRITE_FIELD(TPFILE,'BUGFIX', NBUGFIX) + CALL IO_WRITE_FIELD(TPFILE,'BIBUSER', CBIBUSER) + CALL IO_WRITE_FIELD(TPFILE,'PROGRAM', CPROGRAM) + CALL IO_WRITE_FIELD(TPFILE,'STORAGE_TYPE',CSTORAGE_TYPE) + CALL IO_WRITE_FIELD(TPFILE,'MY_NAME', TPFILE%CNAME) IF ( ASSOCIATED(TPFILE%TDADFILE) ) THEN - CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME',HLUOUT,TPFILE%TDADFILE%CNAME) + CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME',TPFILE%TDADFILE%CNAME) ELSE IF (PRESENT(HDAD_NAME)) THEN - CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME',HLUOUT,HDAD_NAME) + CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME',HDAD_NAME) ELSE CALL PRINT_MSG(NVERB_WARNING,'IO','IO_WRITE_HEADER','TPFILE%TDADFILE not associated and HDAD_NAME not provided') - CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME',HLUOUT,' ') + CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME',' ') ENDIF ! END SUBROUTINE IO_WRITE_HEADER @@ -438,7 +437,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITX0_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_X0(TPFILE,HNAME,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_X0(TPFILE,HNAME,PFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -446,7 +445,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL, INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -459,13 +457,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,PFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),PFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_X0 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_X0(TPFILE,TPFIELD,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_X0(TPFILE,TPFIELD,PFIELD,KRESP) USE MODD_IO_ll USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL USE MODE_IO_MANAGE_STRUCT, ONLY: IO_FILE_FIND_BYNAME @@ -476,7 +474,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,TARGET, INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -641,7 +638,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITX1_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_X1(TPFILE,HNAME,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_X1(TPFILE,HNAME,PFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -649,7 +646,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:), INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -662,13 +658,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,PFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),PFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_X1 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_X1(TPFILE,TPFIELD,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_X1(TPFILE,TPFIELD,PFIELD,KRESP) USE MODD_IO_ll USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL USE MODE_ALLOCBUFFER_ll @@ -681,7 +677,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:),TARGET, INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -935,7 +930,7 @@ CONTAINS TIMEZ%T_WRIT2D_ALL=TIMEZ%T_WRIT2D_ALL + T22 - T11 END SUBROUTINE FMWRITX2_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_X2(TPFILE,HNAME,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_X2(TPFILE,HNAME,PFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -943,7 +938,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:), INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -956,13 +950,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,PFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),PFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_X2 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_X2(TPFILE,TPFIELD,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_X2(TPFILE,TPFIELD,PFIELD,KRESP) USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -982,7 +976,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:),TARGET, INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -1502,7 +1495,7 @@ CONTAINS TIMEZ%T_WRIT3D_ALL=TIMEZ%T_WRIT3D_ALL + T22 - T11 END SUBROUTINE FMWRITX3_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_X3(TPFILE,HNAME,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_X3(TPFILE,HNAME,PFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -1510,7 +1503,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:), INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -1523,13 +1515,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,PFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),PFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_X3 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_X3(TPFILE,TPFIELD,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_X3(TPFILE,TPFIELD,PFIELD,KRESP) USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -1550,7 +1542,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:),TARGET,INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -1980,7 +1971,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITX4_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_X4(TPFILE,HNAME,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_X4(TPFILE,HNAME,PFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -1988,7 +1979,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:,:), INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2001,13 +1991,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,PFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),PFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_X4 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_X4(TPFILE,TPFIELD,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_X4(TPFILE,TPFIELD,PFIELD,KRESP) USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -2025,7 +2015,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:,:),TARGET, INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2215,7 +2204,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITX5_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_X5(TPFILE,HNAME,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_X5(TPFILE,HNAME,PFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -2223,7 +2212,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:,:,:), INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2236,13 +2224,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,PFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),PFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_X5 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_X5(TPFILE,TPFIELD,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_X5(TPFILE,TPFIELD,PFIELD,KRESP) USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -2260,7 +2248,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:,:,:),TARGET,INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2432,7 +2419,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITX6_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_X6(TPFILE,HNAME,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_X6(TPFILE,HNAME,PFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -2440,7 +2427,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:,:,:,:), INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2453,13 +2439,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,PFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),PFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_X6 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_X6(TPFILE,TPFIELD,HFIPRI,PFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_X6(TPFILE,TPFIELD,PFIELD,KRESP) USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -2477,7 +2463,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages REAL,DIMENSION(:,:,:,:,:,:),TARGET,INTENT(IN) :: PFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2643,7 +2628,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITN0_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_N0(TPFILE,HNAME,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_N0(TPFILE,HNAME,KFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -2651,7 +2636,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER, INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2664,13 +2648,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,KFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),KFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_N0 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_N0(TPFILE,TPFIELD,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_N0(TPFILE,TPFIELD,KFIELD,KRESP) USE MODD_IO_ll USE MODD_FM USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -2683,7 +2667,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER, INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2841,7 +2824,7 @@ CONTAINS END SUBROUTINE FMWRITN1_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_N1(TPFILE,HNAME,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_N1(TPFILE,HNAME,KFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -2849,7 +2832,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER,DIMENSION(:), INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -2862,14 +2844,14 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,KFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),KFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_N1 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_N1(TPFILE,TPFIELD,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_N1(TPFILE,TPFIELD,KFIELD,KRESP) ! USE MODD_IO_ll, ONLY : ISP,GSMONOPROC,LIOCDF4,LLFIOUT,TFILEDATA USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -2882,7 +2864,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER,DIMENSION(:),TARGET, INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3060,7 +3041,7 @@ CONTAINS END SUBROUTINE FMWRITN2_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_N2(TPFILE,HNAME,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_N2(TPFILE,HNAME,KFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -3068,7 +3049,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER,DIMENSION(:,:), INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3081,14 +3061,14 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,KFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),KFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_N2 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_N2(TPFILE,TPFIELD,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_N2(TPFILE,TPFIELD,KFIELD,KRESP) USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -3103,7 +3083,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER,DIMENSION(:,:),TARGET,INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3209,7 +3188,7 @@ CONTAINS END SUBROUTINE IO_WRITE_FIELD_BYFIELD_N2 - SUBROUTINE IO_WRITE_FIELD_BYNAME_N3(TPFILE,HNAME,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_N3(TPFILE,HNAME,KFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -3217,7 +3196,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER,DIMENSION(:,:,:), INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3230,13 +3208,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,KFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),KFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_N3 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_N3(TPFILE,TPFIELD,HFIPRI,KFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_N3(TPFILE,TPFIELD,KFIELD,KRESP) USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -3251,7 +3229,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER,DIMENSION(:,:,:),TARGET,INTENT(IN) :: KFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3425,7 +3402,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITL0_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_L0(TPFILE,HNAME,HFIPRI,OFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_L0(TPFILE,HNAME,OFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -3433,7 +3410,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages LOGICAL, INTENT(IN) :: OFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3446,13 +3422,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,OFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),OFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_L0 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_L0(TPFILE,TPFIELD,HFIPRI,OFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_L0(TPFILE,TPFIELD,OFIELD,KRESP) USE MODD_IO_ll USE MODD_FM USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -3465,7 +3441,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages LOGICAL, INTENT(IN) :: OFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3612,7 +3587,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITL1_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_L1(TPFILE,HNAME,HFIPRI,OFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_L1(TPFILE,HNAME,OFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -3620,7 +3595,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages LOGICAL,DIMENSION(:), INTENT(IN) :: OFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3633,13 +3607,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,OFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),OFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_L1 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_L1(TPFILE,TPFIELD,HFIPRI,OFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_L1(TPFILE,TPFIELD,OFIELD,KRESP) ! USE MODD_IO_ll, ONLY : ISP,GSMONOPROC,LIOCDF4,LLFIOUT,TFILEDATA USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -3652,7 +3626,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages LOGICAL,DIMENSION(:),TARGET, INTENT(IN) :: OFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3810,7 +3783,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITC0_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_C0(TPFILE,HNAME,HFIPRI,HFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_C0(TPFILE,HNAME,HFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -3818,7 +3791,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages CHARACTER(LEN=*), INTENT(IN) :: HFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3831,13 +3803,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,HFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_C0 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_C0(TPFILE,TPFIELD,HFIPRI,HFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_C0(TPFILE,TPFIELD,HFIELD,KRESP) USE MODD_IO_ll USE MODD_FM USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -3849,7 +3821,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages CHARACTER(LEN=*), INTENT(IN) :: HFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -3990,7 +3961,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITC1_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_C1(TPFILE,HNAME,HFIPRI,HFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_C1(TPFILE,HNAME,HFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -3998,7 +3969,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages CHARACTER(LEN=*),DIMENSION(:),INTENT(IN) :: HFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -4011,13 +3981,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,HFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_C1 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_C1(TPFILE,TPFIELD,HFIPRI,HFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_C1(TPFILE,TPFIELD,HFIELD,KRESP) USE MODD_IO_ll USE MODD_FM USE MODE_FD_ll, ONLY : GETFD,JPFINL,FD_LL @@ -4029,7 +3999,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages CHARACTER(LEN=*),DIMENSION(:),INTENT(IN) :: HFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -4180,7 +4149,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITT0_ll - SUBROUTINE IO_WRITE_FIELD_BYNAME_T0(TPFILE,HNAME,HFIPRI,TFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_T0(TPFILE,HNAME,TFIELD,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -4188,7 +4157,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages TYPE (DATE_TIME), INTENT(IN) :: TFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -4201,13 +4169,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),HFIPRI,TFIELD,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD(TPFILE,TFIELDLIST(ID),TFIELD,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_T0 - SUBROUTINE IO_WRITE_FIELD_BYFIELD_T0(TPFILE,TPFIELD,HFIPRI,TFIELD,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_T0(TPFILE,TPFIELD,TFIELD,KRESP) USE MODD_IO_ll USE MODD_FM USE MODD_TYPE_DATE @@ -4220,7 +4188,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages TYPE (DATE_TIME), INTENT(IN) :: TFIELD ! array containing the data field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code ! @@ -4405,7 +4372,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRIT_LB - SUBROUTINE IO_WRITE_FIELD_BYNAME_LB(TPFILE,HNAME,HFIPRI,KL3D,PLB,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYNAME_LB(TPFILE,HNAME,KL3D,PLB,KRESP) ! USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -4413,7 +4380,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE CHARACTER(LEN=*), INTENT(IN) :: HNAME ! name of the field to write - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages INTEGER, INTENT(IN) :: KL3D ! size of the LB array in FM REAL,DIMENSION(:,:,:), INTENT(IN) :: PLB ! array containing the LB field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code @@ -4427,13 +4393,13 @@ CONTAINS ! CALL FIND_FIELD_ID_FROM_MNHNAME(HNAME,ID,IRESP) ! - IF(IRESP==0) CALL IO_WRITE_FIELD_LB(TPFILE,TFIELDLIST(ID),HFIPRI,KL3D,PLB,IRESP) + IF(IRESP==0) CALL IO_WRITE_FIELD_LB(TPFILE,TFIELDLIST(ID),KL3D,PLB,IRESP) ! IF (PRESENT(KRESP)) KRESP = IRESP ! END SUBROUTINE IO_WRITE_FIELD_BYNAME_LB - SUBROUTINE IO_WRITE_FIELD_BYFIELD_LB(TPFILE,TPFIELD,HFIPRI,KL3D,PLB,KRESP) + SUBROUTINE IO_WRITE_FIELD_BYFIELD_LB(TPFILE,TPFIELD,KL3D,PLB,KRESP) ! USE MODD_IO_ll USE MODD_PARAMETERS_ll,ONLY : JPHEXT @@ -4448,7 +4414,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(INOUT) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! file for prints in FM INTEGER, INTENT(IN) :: KL3D ! size of the LB array in FM REAL,DIMENSION(:,:,:),TARGET,INTENT(IN) :: PLB ! array containing the LB field INTEGER,OPTIONAL, INTENT(OUT):: KRESP ! return-code @@ -4962,7 +4927,7 @@ CONTAINS KRESP = IRESP END SUBROUTINE FMWRITBOXX5_ll - SUBROUTINE IO_WRITE_FIELD_BOX_BYFIELD_X5(TPFILE,TPFIELD,HFIPRI,HBUDGET,PFIELD,KXOBOX,KXEBOX,KYOBOX,KYEBOX,KRESP) + SUBROUTINE IO_WRITE_FIELD_BOX_BYFIELD_X5(TPFILE,TPFIELD,HBUDGET,PFIELD,KXOBOX,KXEBOX,KYOBOX,KYEBOX,KRESP) ! USE MODD_IO_ll USE MODD_FM @@ -4974,7 +4939,6 @@ CONTAINS ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE TYPE(TFIELDDATA), INTENT(IN) :: TPFIELD - CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! output file for error messages CHARACTER(LEN=*), INTENT(IN) :: HBUDGET ! 'BUDGET' (budget) or 'OTHER' (MesoNH field) REAL,DIMENSION(:,:,:,:,:),TARGET,INTENT(IN) :: PFIELD ! array containing the data field INTEGER, INTENT(IN) :: KXOBOX ! diff --git a/src/LIB/SURCOUCHE/src/io_write_field.f90 b/src/LIB/SURCOUCHE/src/io_write_field.f90 index 910ba46ff..344346083 100644 --- a/src/LIB/SURCOUCHE/src/io_write_field.f90 +++ b/src/LIB/SURCOUCHE/src/io_write_field.f90 @@ -8,14 +8,13 @@ IMPLICIT NONE ! CONTAINS ! -SUBROUTINE IO_WRITE_FIELDLIST(TPOUTPUT,HFIPRI) +SUBROUTINE IO_WRITE_FIELDLIST(TPOUTPUT) ! USE MODE_MODELN_HANDLER, ONLY : GET_CURRENT_MODEL_INDEX ! IMPLICIT NONE ! TYPE(TOUTBAK), INTENT(IN) :: TPOUTPUT !Output structure -CHARACTER(LEN=*), INTENT(IN) :: HFIPRI !File for prints in FM ! INTEGER :: IDX INTEGER :: IMI @@ -44,7 +43,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_X0D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_X0D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 0D logical fields') END IF @@ -61,7 +60,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_N0D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_N0D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 0D integer fields') END IF @@ -78,7 +77,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_L0D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_L0D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 0D logical fields') END IF @@ -95,7 +94,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_C0D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_C0D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 0D character fields') END IF @@ -112,7 +111,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_T0D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_T0D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 0D date/time fields') END IF @@ -141,7 +140,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_X1D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_X1D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 1D real fields') END IF @@ -158,7 +157,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) ! STOP ! END IF ! IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN -! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_N1D(IMI)%DATA) +! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_N1D(IMI)%DATA) ! ELSE ! CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 1D integer fields') ! END IF @@ -175,7 +174,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) ! STOP ! END IF ! IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN -! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_L1D(IMI)%DATA) +! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_L1D(IMI)%DATA) ! ELSE ! CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 1D logical fields') ! END IF @@ -192,7 +191,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) ! STOP ! END IF ! IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN -! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_C1D(IMI)%DATA) +! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_C1D(IMI)%DATA) ! ELSE ! CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 1D character fields') ! END IF @@ -221,7 +220,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_X2D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_X2D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 2D real fields') END IF @@ -238,7 +237,7 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_N2D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_N2D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not allowed for 2D integer fields') END IF @@ -267,11 +266,11 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_X3D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_X3D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not (yet) allowed for 3D real fields') !PW: TODO?: add missing field in TFIELDLIST? - !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,***,TFIELDLIST(IDX)%TFIELD_X3D(IMI)%DATA) + !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),***,TFIELDLIST(IDX)%TFIELD_X3D(IMI)%DATA) END IF ! !3D integer @@ -286,11 +285,11 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_N3D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_N3D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not (yet) allowed for 3D integer fields') !PW: TODO?: add missing field in TFIELDLIST? - !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,***,TFIELDLIST(IDX)%TFIELD_N3D(IMI)%DATA) + !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),***,TFIELDLIST(IDX)%TFIELD_N3D(IMI)%DATA) END IF ! !3D other types @@ -317,11 +316,11 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) STOP END IF IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_X4D(IMI)%DATA) + CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_X4D(IMI)%DATA) ELSE CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not (yet) allowed for 4D real fields') !PW: TODO?: add missing field in TFIELDLIST? - !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,***,TFIELDLIST(IDX)%TFIELD_X4D(IMI)%DATA) + !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),***,TFIELDLIST(IDX)%TFIELD_X4D(IMI)%DATA) END IF ! !4D other types @@ -348,11 +347,11 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) ! STOP ! END IF ! IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN -! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_X5D(IMI)%DATA) +! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_X5D(IMI)%DATA) ! ELSE ! CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not (yet) allowed for 5D real fields') ! !PW: TODO?: add missing field in TFIELDLIST? -! !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,***,TFIELDLIST(IDX)%TFIELD_X5D(IMI)%DATA) +! !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),***,TFIELDLIST(IDX)%TFIELD_X5D(IMI)%DATA) ! END IF ! ! ! !5D other types @@ -379,11 +378,11 @@ DO JI = 1,SIZE(TPOUTPUT%NFIELDLIST) ! STOP ! END IF ! IF ( TFIELDLIST(IDX)%CLBTYPE == 'NONE' ) THEN -! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,TFIELDLIST(IDX)%TFIELD_X6D(IMI)%DATA) +! CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TFIELDLIST(IDX),TFIELDLIST(IDX)%TFIELD_X6D(IMI)%DATA) ! ELSE ! CALL PRINT_MSG(NVERB_ERROR,'IO','IO_WRITE_FIELDLIST','CLBTYPE/=NONE not (yet) allowed for 6D real fields') ! !PW: TODO?: add missing field in TFIELDLIST? -! !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),HFIPRI,***,TFIELDLIST(IDX)%TFIELD_X6D(IMI)%DATA) +! !CALL IO_WRITE_FIELD_LB(TPOUTPUT%TFILE,TFIELDLIST(IDX),***,TFIELDLIST(IDX)%TFIELD_X6D(IMI)%DATA) ! END IF ! ! ! !6D other types @@ -405,7 +404,7 @@ END SUBROUTINE IO_WRITE_FIELDLIST ! ! ! -SUBROUTINE IO_WRITE_FIELD_USER(TPOUTPUT,HFIPRI) +SUBROUTINE IO_WRITE_FIELD_USER(TPOUTPUT) ! #if 0 USE MODD_PARAMETERS, ONLY : JPVEXT @@ -417,7 +416,6 @@ USE MODD_PRECIP_n, ONLY: XINPRR IMPLICIT NONE ! TYPE(TOUTBAK), INTENT(IN) :: TPOUTPUT !Output structure -CHARACTER(LEN=*), INTENT(IN) :: HFIPRI ! File for prints in FM ! TYPE(TFIELDDATA) :: TZFIELD ! @@ -435,7 +433,7 @@ TZFIELD%CCOMMENT = 'X_Y_Z_U component of wind (m/s) at lowest physical level' TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 -CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,HFIPRI,XUT(:,:,IKB)) +CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,XUT(:,:,IKB)) ! TZFIELD%CMNHNAME = 'VTLOW' TZFIELD%CSTDNAME = 'y_wind' @@ -446,7 +444,7 @@ TZFIELD%CCOMMENT = 'X_Y_Z_V component of wind (m/s) at lowest physical level' TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 -CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,HFIPRI,XVT(:,:,IKB)) +CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,XVT(:,:,IKB)) ! TZFIELD%CMNHNAME = 'THTLOW' TZFIELD%CSTDNAME = 'air_potential_temperature' @@ -457,7 +455,7 @@ TZFIELD%CCOMMENT = 'X_Y_Z_potential temperature (K) at lowest physical level' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 -CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,HFIPRI,XTHT(:,:,IKB)) +CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,XTHT(:,:,IKB)) ! TZFIELD%CMNHNAME = 'RVTLOW' !TZFIELD%CSTDNAME = 'humidity_mixing_ratio' !ratio of the mass of water vapor to the mass of dry air @@ -469,7 +467,7 @@ TZFIELD%CCOMMENT = 'X_Y_Z_Vapor mixing Ratio (KG/KG) at lowest physical level' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 -CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,HFIPRI,XRT(:,:,IKB,1)) +CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,XRT(:,:,IKB,1)) ! TZFIELD%CMNHNAME = 'ACPRRSTEP' TZFIELD%CSTDNAME = 'rainfall_amount' @@ -481,7 +479,7 @@ TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 !XACPRR is multiplied by 1000. to convert from m to kg m-2 (water density is assumed to be 1000 kg m-3) -CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,HFIPRI,XINPRR*XTSTEP*1.0E3) +CALL IO_WRITE_FIELD(TPOUTPUT%TFILE,TZFIELD,XINPRR*XTSTEP*1.0E3) #endif ! END SUBROUTINE IO_WRITE_FIELD_USER diff --git a/src/LIB/SURCOUCHE/src/mode_netcdf.f90 b/src/LIB/SURCOUCHE/src/mode_netcdf.f90 index b0797b850..f4bfbf03c 100644 --- a/src/LIB/SURCOUCHE/src/mode_netcdf.f90 +++ b/src/LIB/SURCOUCHE/src/mode_netcdf.f90 @@ -161,14 +161,13 @@ END IF END FUNCTION str_replace -SUBROUTINE IO_WRITE_HEADER_NC4(TPFILE,HFIPRI) +SUBROUTINE IO_WRITE_HEADER_NC4(TPFILE) ! USE MODD_IO_ll, ONLY: ISP,TFILEDATA ! USE MODE_FD_ll ! TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! File structure -CHARACTER(LEN=*),INTENT(IN) :: HFIPRI ! File for prints in FM ! INTEGER(KIND=IDCDF_KIND) :: ISTATUS TYPE(FD_ll), POINTER :: TZFD diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90 index 5138248ec..607b0940a 100644 --- a/src/MNH/advection_metsv.f90 +++ b/src/MNH/advection_metsv.f90 @@ -316,7 +316,7 @@ IF (OCLOSE_OUT .AND. OCFL_WRIT .AND. (.NOT. L1D)) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZCFLU) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZCFLU) ! TZFIELD%CMNHNAME = 'CFLV' TZFIELD%CSTDNAME = '' @@ -327,7 +327,7 @@ IF (OCLOSE_OUT .AND. OCFL_WRIT .AND. (.NOT. L1D)) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZCFLV) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZCFLV) ! TZFIELD%CMNHNAME = 'CFLW' TZFIELD%CSTDNAME = '' @@ -338,7 +338,7 @@ IF (OCLOSE_OUT .AND. OCFL_WRIT .AND. (.NOT. L1D)) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZCFLW) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZCFLW) ! TZFIELD%CMNHNAME = 'CFL' TZFIELD%CSTDNAME = '' @@ -349,7 +349,7 @@ IF (OCLOSE_OUT .AND. OCFL_WRIT .AND. (.NOT. L1D)) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZCFL) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZCFL) END IF ! !* prints in the output file the maximum CFL diff --git a/src/MNH/c2r2_adjust.f90 b/src/MNH/c2r2_adjust.f90 index 194b00a98..0cf366da5 100644 --- a/src/MNH/c2r2_adjust.f90 +++ b/src/MNH/c2r2_adjust.f90 @@ -432,7 +432,7 @@ IF ( OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZW1) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZW1) END IF ! ! diff --git a/src/MNH/call_rttov11.f90 b/src/MNH/call_rttov11.f90 index 4bc195d4b..5493c3f64 100644 --- a/src/MNH/call_rttov11.f90 +++ b/src/MNH/call_rttov11.f90 @@ -576,7 +576,7 @@ DO JSAT=1,IJSAT ! loop over sensors TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 PRINT *,'YRECFM='//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZBT(:,:,JCH)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZBT(:,:,JCH)) END DO DEALLOCATE(chanprof,frequencies,emissivity,calcemis,profiles,cld_profiles) DEALLOCATE(ZBT) diff --git a/src/MNH/call_rttov8.f90 b/src/MNH/call_rttov8.f90 index 792b857a0..c41920a72 100644 --- a/src/MNH/call_rttov8.f90 +++ b/src/MNH/call_rttov8.f90 @@ -1584,7 +1584,7 @@ DO JSAT=1,IJSAT ! loop over sensors TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 PRINT *,TZFIELD%CMNHNAME//TZFIELD%CCOMMENT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZANTMP) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZANTMP) END IF DEALLOCATE(ZANTMP) ! ----------------------------------------------------------------------------- @@ -1642,7 +1642,7 @@ DO JSAT=1,IJSAT ! loop over sensors PRINT *,TZFIELD%CMNHNAME//TZFIELD%CCOMMENT, & MINVAL(ZTBTMP(:,:,JCH),ZTBTMP(:,:,JCH)/=XUNDEF), & MAXVAL(ZTBTMP(:,:,JCH),ZTBTMP(:,:,JCH)/=XUNDEF) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZTBTMP(:,:,JCH)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTBTMP(:,:,JCH)) IF (KRTTOVINFO(3,JSAT) == 4.AND. JCH==3 ) THEN ! AMSU-B TZFIELD%CMNHNAME = TRIM(YBEG)//'_UTH' TZFIELD%CSTDNAME = '' @@ -1670,7 +1670,7 @@ DO JSAT=1,IJSAT ! loop over sensors END IF END DO END DO - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZUTH) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZUTH) DEALLOCATE(ZUTH) END IF END DO @@ -1736,7 +1736,7 @@ DO JSAT=1,IJSAT ! loop over sensors PRINT *,TZFIELD%CMNHNAME//TZFIELD%CCOMMENT, & MINVAL(ZTEMPK(:,:,:),ZTEMPK(:,:,:)/=XUNDEF), & MAXVAL(ZTEMPK(:,:,:),ZTEMPK(:,:,:)/=XUNDEF) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZTEMPK(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTEMPK(:,:,:)) ! TZFIELD%CMNHNAME = TRIM(YBEG)//'_'//TRIM(YEND)//'JAV' TZFIELD%CSTDNAME = '' @@ -1752,7 +1752,7 @@ DO JSAT=1,IJSAT ! loop over sensors PRINT *,TZFIELD%CMNHNAME//TZFIELD%CCOMMENT, & MINVAL(ZWVAPK(:,:,:),ZWVAPK(:,:,:)/=XUNDEF), & MAXVAL(ZWVAPK(:,:,:),ZWVAPK(:,:,:)/=XUNDEF) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWVAPK(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWVAPK(:,:,:)) END DO DEALLOCATE(ZTEMPKP,ZWVAPKP,ZFIN) ENDIF diff --git a/src/MNH/compute_r00.f90 b/src/MNH/compute_r00.f90 index a584591f2..3ec7b851a 100644 --- a/src/MNH/compute_r00.f90 +++ b/src/MNH/compute_r00.f90 @@ -307,7 +307,7 @@ DO JFILECUR=1,NFILES TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZX00(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZX00(:,:,:)) ! WRITE(TZFIELD%CMNHNAME,'(A2,I2.2)')'Y0',INBR_START TZFIELD%CSTDNAME = '' @@ -319,7 +319,7 @@ DO JFILECUR=1,NFILES TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZY00(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZY00(:,:,:)) ! WRITE(TZFIELD%CMNHNAME,'(A2,I2.2)')'Z0',INBR_START TZFIELD%CSTDNAME = '' @@ -331,7 +331,7 @@ DO JFILECUR=1,NFILES TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZZ00(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZZ00(:,:,:)) END IF ! ! @@ -359,7 +359,7 @@ DO JFILECUR=1,NFILES TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK1(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK1(:,:,:)) ! WRITE(TZFIELD%CMNHNAME,'(A3,I2.2)')'RV0',INBR_START TZFIELD%CSTDNAME = '' @@ -371,7 +371,7 @@ DO JFILECUR=1,NFILES TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK2(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK2(:,:,:)) ENDIF !* 4.4 compute the origin of the particules using one more segment ! diff --git a/src/MNH/diag.f90 b/src/MNH/diag.f90 index 1629b9651..380d8d698 100644 --- a/src/MNH/diag.f90 +++ b/src/MNH/diag.f90 @@ -586,7 +586,7 @@ IF ( LAIRCRAFT_BALLOON ) THEN TXDTBAL%TDATE%DAY, & TXDTBAL%TIME ) ENDDO - CALL IO_WRITE_HEADER(TZDIACFILE,CLUOUT) + CALL IO_WRITE_HEADER(TZDIACFILE) CALL WRITE_LFIFMN_FORDIACHRO_n(TZDIACFILE) CALL WRITE_AIRCRAFT_BALLOON(TZDIACFILE) CALL MENU_DIACHRO(TZDIACFILE,CLUOUT,'END') diff --git a/src/MNH/free_atm_profile.f90 b/src/MNH/free_atm_profile.f90 index 87dcf6e5e..63c34214d 100644 --- a/src/MNH/free_atm_profile.f90 +++ b/src/MNH/free_atm_profile.f90 @@ -491,7 +491,7 @@ IF (CPROGRAM == 'DIAG ' ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT0,Z2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,Z2D) ! !* 11.2 Writing of level of boundary layer top ! -------------------------------------- @@ -506,7 +506,7 @@ IF (CPROGRAM == 'DIAG ' ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT0,IK_BL_TOP) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,IK_BL_TOP) END IF ! IF (CPROGRAM /= 'DIAG ' .AND. CPROGRAM /= 'IDEAL ' ) THEN @@ -525,7 +525,7 @@ IF (CPROGRAM /= 'DIAG ' .AND. CPROGRAM /= 'IDEAL ' ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT0,Z2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,Z2D) ! !* 11.4 Writing of free atmosphere 3D profiles ! -------------------------------------- @@ -545,7 +545,7 @@ IF (CPROGRAM /= 'DIAG ' .AND. CPROGRAM /= 'IDEAL ' ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT0,Z3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,Z3D) ! END IF !------------------------------------------------------------------------------- diff --git a/src/MNH/khko_notadjust.f90 b/src/MNH/khko_notadjust.f90 index b7ac1531f..1f7fcfa24 100644 --- a/src/MNH/khko_notadjust.f90 +++ b/src/MNH/khko_notadjust.f90 @@ -401,7 +401,7 @@ IF ( OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZWORK) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK) ! TZFIELD%CMNHNAME = 'ACT_OD' TZFIELD%CSTDNAME = '' @@ -412,7 +412,7 @@ IF ( OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZACT) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZACT) END IF ! !* 7. STORE THE BUDGET TERMS diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90 index 9ea232849..3d86e78dc 100644 --- a/src/MNH/lima_adjust.f90 +++ b/src/MNH/lima_adjust.f90 @@ -1130,7 +1130,7 @@ IF ( OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZW) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZW) END IF ! ! @@ -1184,7 +1184,7 @@ IF ( OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZW) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZW) END IF ! ! diff --git a/src/MNH/menu_diachro.f90 b/src/MNH/menu_diachro.f90 index a0b98ce9f..b9d38087a 100644 --- a/src/MNH/menu_diachro.f90 +++ b/src/MNH/menu_diachro.f90 @@ -113,7 +113,7 @@ IF(HGROUP == 'END')THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,ILENG) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,ILENG) ALLOCATE(ITABCHAR(ILENG)) DO JJ=1,IGROUP @@ -131,7 +131,7 @@ IF(HGROUP == 'END')THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,ITABCHAR) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,ITABCHAR) DEALLOCATE(ITABCHAR) diff --git a/src/MNH/mnhwrite_zs_dummyn.f90 b/src/MNH/mnhwrite_zs_dummyn.f90 index 3482f54bd..f33f1aa2c 100644 --- a/src/MNH/mnhwrite_zs_dummyn.f90 +++ b/src/MNH/mnhwrite_zs_dummyn.f90 @@ -64,7 +64,6 @@ END MODULE MODI_MNHWRITE_ZS_DUMMY_n USE MODD_GR_FIELD_n, ONLY : XSSO_STDEV, XSSO_ANISOTROPY, XSSO_DIRECTION, XSSO_SLOPE, & XAVG_ZS, XSIL_ZS, XMIN_ZS, XMAX_ZS ! -USE MODD_LUNIT_n, ONLY : CLUOUT USE MODD_PARAM_n, ONLY : CSURF USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -97,14 +96,14 @@ IF (CSURF /='EXTE') RETURN !* 2. Orographic characteristics : ! -------------------------- ! -CALL IO_WRITE_FIELD(TPFILE,'SSO_ANIS', CLUOUT,XSSO_ANISOTROPY) -CALL IO_WRITE_FIELD(TPFILE,'SSO_SLOPE',CLUOUT,XSSO_SLOPE) -CALL IO_WRITE_FIELD(TPFILE,'SSO_DIR', CLUOUT,XSSO_DIRECTION) -CALL IO_WRITE_FIELD(TPFILE,'AVG_ZS', CLUOUT,XAVG_ZS) -CALL IO_WRITE_FIELD(TPFILE,'SIL_ZS', CLUOUT,XSIL_ZS) -CALL IO_WRITE_FIELD(TPFILE,'MAX_ZS', CLUOUT,XMAX_ZS) -CALL IO_WRITE_FIELD(TPFILE,'MIN_ZS', CLUOUT,XMIN_ZS) -CALL IO_WRITE_FIELD(TPFILE,'SSO_STDEV',CLUOUT,XSSO_STDEV) +CALL IO_WRITE_FIELD(TPFILE,'SSO_ANIS', XSSO_ANISOTROPY) +CALL IO_WRITE_FIELD(TPFILE,'SSO_SLOPE',XSSO_SLOPE) +CALL IO_WRITE_FIELD(TPFILE,'SSO_DIR', XSSO_DIRECTION) +CALL IO_WRITE_FIELD(TPFILE,'AVG_ZS', XAVG_ZS) +CALL IO_WRITE_FIELD(TPFILE,'SIL_ZS', XSIL_ZS) +CALL IO_WRITE_FIELD(TPFILE,'MAX_ZS', XMAX_ZS) +CALL IO_WRITE_FIELD(TPFILE,'MIN_ZS', XMIN_ZS) +CALL IO_WRITE_FIELD(TPFILE,'SSO_STDEV',XSSO_STDEV) ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90 index 274877ae1..1b69bb27c 100644 --- a/src/MNH/modeln.f90 +++ b/src/MNH/modeln.f90 @@ -603,7 +603,7 @@ IF (KTCOUNT == 1) THEN ! CALL IO_FILE_OPEN_ll(TDIAFILE,CLUOUT,IRESP) ! - CALL IO_WRITE_HEADER(TDIAFILE,CLUOUT) + CALL IO_WRITE_HEADER(TDIAFILE) CALL WRITE_DESFM_n(IMI,TRIM(TDIAFILE%CNAME)//'.des',CLUOUT) CALL WRITE_LFIFMN_FORDIACHRO_n(TDIAFILE) ! @@ -913,7 +913,7 @@ IF (IBAK < NBAK_NUMB ) THEN CALL IO_FILE_OPEN_ll(TZBAKFILE,CLUOUT,IRESP) ! CALL WRITE_DESFM_n(IMI,TRIM(TZBAKFILE%CNAME)//'.des',CLUOUT) - CALL IO_WRITE_HEADER(TBACKUPN(IBAK)%TFILE,CLUOUT) + CALL IO_WRITE_HEADER(TBACKUPN(IBAK)%TFILE) CALL WRITE_LFIFM_n(TBACKUPN(IBAK)%TFILE,TBACKUPN(IBAK)%TFILE%TDADFILE%CNAME) COUTFMFILE = TZBAKFILE%CNAME CALL MNHWRITE_ZS_DUMMY_n(TZBAKFILE) @@ -955,9 +955,9 @@ IF (IOUT < NOUT_NUMB ) THEN ! CALL IO_FILE_OPEN_ll(TZOUTFILE,CLUOUT,IRESP) ! - CALL IO_WRITE_HEADER(TZOUTFILE,CLUOUT) - CALL IO_WRITE_FIELDLIST(TOUTPUTN(IOUT),CLUOUT) - CALL IO_WRITE_FIELD_USER(TOUTPUTN(IOUT),CLUOUT) + CALL IO_WRITE_HEADER(TZOUTFILE) + CALL IO_WRITE_FIELDLIST(TOUTPUTN(IOUT)) + CALL IO_WRITE_FIELD_USER(TOUTPUTN(IOUT)) ! CALL IO_FILE_CLOSE_ll(TZOUTFILE,CLUOUT,IRESP) ! @@ -1535,7 +1535,7 @@ XT_ADVUVW = XT_ADVUVW + ZTIME2 - ZTIME1 - XTIME_LES_BU_PROCESS - XTIME_BU_PROCES !------------------------------------------------------------------------------- ! IF (NMODEL_CLOUD==IMI .AND. CTURBLEN_CLOUD/='NONE') THEN - CALL TURB_CLOUD_INDEX(XTSTEP,TZBAKFILE,CLUOUT, & + CALL TURB_CLOUD_INDEX(XTSTEP,TZBAKFILE, & LTURB_DIAG,GCLOSE_OUT,NRRI, & XRRS,XRT,XRHODJ,XDXX,XDYY,XDZZ,XDZX,XDZY, & XCEI ) diff --git a/src/MNH/paspol.f90 b/src/MNH/paspol.f90 index 2d62e56ab..44d33efe8 100644 --- a/src/MNH/paspol.f90 +++ b/src/MNH/paspol.f90 @@ -8,8 +8,7 @@ ! INTERFACE ! - SUBROUTINE PASPOL (PTSTEP, PSFSV, KLUOUT, KVERB, OCLOSE_OUT, & - TPFILE, HLUOUT) + SUBROUTINE PASPOL (PTSTEP, PSFSV, KLUOUT, KVERB, OCLOSE_OUT, TPFILE) ! USE MODD_IO_ll, ONLY: TFILEDATA ! @@ -22,7 +21,6 @@ INTEGER, INTENT(IN) :: KLUOUT ! unit for output listing co INTEGER, INTENT(IN) :: KVERB ! verbosity level LOGICAL, INTENT(IN) :: OCLOSE_OUT ! conditional closure of the OUTPUT FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for model n ! END SUBROUTINE PASPOL ! @@ -30,8 +28,7 @@ END INTERFACE ! END MODULE MODI_PASPOL ! ######spl - SUBROUTINE PASPOL (PTSTEP, PSFSV, KLUOUT, KVERB, OCLOSE_OUT, & - TPFILE, HLUOUT) + SUBROUTINE PASPOL (PTSTEP, PSFSV, KLUOUT, KVERB, OCLOSE_OUT, TPFILE) ! ############################################################ ! ! @@ -109,7 +106,6 @@ INTEGER, INTENT(IN) :: KLUOUT ! unit for output listing co INTEGER, INTENT(IN) :: KVERB ! verbosity level LOGICAL, INTENT(IN) :: OCLOSE_OUT ! conditional closure of the OUTPUT FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for model n ! !* 0.2 declarations of local variables ! @@ -591,7 +587,7 @@ IF (OCLOSE_OUT) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','ATC',JSV+NSV_PPBEG-1 ! - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZTEMPO) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTEMPO) END DO ! DEALLOCATE(ZTEMPO) diff --git a/src/MNH/phys_paramn.f90 b/src/MNH/phys_paramn.f90 index a243c4440..cd4dee213 100644 --- a/src/MNH/phys_paramn.f90 +++ b/src/MNH/phys_paramn.f90 @@ -1216,7 +1216,7 @@ END IF ! ZTIME1 = ZTIME2 ! -IF (LPASPOL) CALL PASPOL(XTSTEP, ZSFSV, ILUOUT, NVERB, OCLOSE_OUT, TPFILE, CLUOUT ) +IF (LPASPOL) CALL PASPOL(XTSTEP, ZSFSV, ILUOUT, NVERB, OCLOSE_OUT, TPFILE) ! ! !* 4b. PASSIVE POLLUTANTS FOR MASS-FLUX SCHEME DIAGNOSTICS @@ -1351,7 +1351,7 @@ END IF CALL TURB(1,IKU,1,IMI,NRR, NRRL, NRRI, CLBCX, CLBCY, 1,NMODEL_CLOUD, & OCLOSE_OUT,LTURB_FLX,LTURB_DIAG,LSUBG_COND,LRMC01, & CTURBDIM,CTURBLEN,CTOM,CTURBLEN_CLOUD,CCLOUD,XIMPL, & - XTSTEP,TPFILE,CLUOUT, & + XTSTEP,TPFILE, & XDXX,XDYY,XDZZ,XDZX,XDZY,XZZ, & XDIRCOSXW,XDIRCOSYW,XDIRCOSZW,XCOSSLOPE,XSINSLOPE, & XRHODJ,XTHVREF,XRHODREF, & @@ -1401,7 +1401,7 @@ IF (CSCONV == 'EDKF') THEN CALL MPPDB_CHECK3D(ZEXN,"physparam.7::ZEXN",PRECISION) ! CALL SHALLOW_MF_PACK(NRR,NRRL,NRRI, CMF_UPDRAFT, CMF_CLOUD, LMIXUV, & - OCLOSE_OUT,LMF_FLX,TPFILE,CLUOUT,ZTIME_LES_MF, & + OCLOSE_OUT,LMF_FLX,TPFILE,ZTIME_LES_MF, & XIMPL_MF, XTSTEP, & XDZZ, XZZ, & XRHODJ, XRHODREF, XPABST, ZEXN, ZSFTH, ZSFRV, & diff --git a/src/MNH/prandtl.f90 b/src/MNH/prandtl.f90 index ffc9c150d..82761b44a 100644 --- a/src/MNH/prandtl.f90 +++ b/src/MNH/prandtl.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE PRANDTL(KKA,KKU,KKL,KRR,KRRI,OCLOSE_OUT,OTURB_DIAG,& HTURBDIM, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PTHVREF,PLOCPEXNM,PATHETA,PAMOIST, & PLM,PLEPS,PTKEM,PTHLM,PRM,PSVM,PSRCM, & @@ -41,8 +41,6 @@ LOGICAL, INTENT(IN) :: OTURB_DIAG ! switch to write some ! diagnostic fields in the syncronous FM-file CHARACTER*4 , INTENT(IN) :: HTURBDIM ! Kind of turbulence param. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX,PDYY,PDZZ,PDZX,PDZY ! metric coefficients ! @@ -87,7 +85,7 @@ END MODULE MODI_PRANDTL ! ########################################################### SUBROUTINE PRANDTL(KKA,KKU,KKL,KRR,KRRI,OCLOSE_OUT,OTURB_DIAG,& HTURBDIM, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PTHVREF,PLOCPEXNM,PATHETA,PAMOIST, & PLM,PLEPS,PTKEM,PTHLM,PRM,PSVM,PSRCM, & @@ -231,8 +229,6 @@ LOGICAL, INTENT(IN) :: OTURB_DIAG ! switch to write some ! diagnostic fields in the syncronous FM-file CHARACTER*4 , INTENT(IN) :: HTURBDIM ! Kind of turbulence param. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX,PDYY,PDZZ,PDZX,PDZY ! metric coefficients ! @@ -529,7 +525,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PREDTH1) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PREDTH1) ! ! stores the RED_R1 TZFIELD%CMNHNAME = 'RED_R1' @@ -541,7 +537,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PREDR1) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PREDR1) ! ! stores the RED2_TH3 TZFIELD%CMNHNAME = 'RED2_TH3' @@ -553,7 +549,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PRED2TH3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PRED2TH3) ! ! stores the RED2_R3 TZFIELD%CMNHNAME = 'RED2_R3' @@ -565,7 +561,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PRED2R3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PRED2R3) ! ! stores the RED2_THR3 TZFIELD%CMNHNAME = 'RED2_THR3' @@ -577,7 +573,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PRED2THR3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PRED2THR3) ! END IF ! diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90 index 9f20000f1..98a4bf971 100644 --- a/src/MNH/prep_ideal_case.f90 +++ b/src/MNH/prep_ideal_case.f90 @@ -1782,7 +1782,7 @@ TZFILE%NLFIVERB = NVERB ! CALL IO_FILE_OPEN_ll(TZFILE,CLUOUT,NRESP) ! -CALL IO_WRITE_HEADER(TZFILE,CLUOUT) +CALL IO_WRITE_HEADER(TZFILE) ! CALL WRITE_DESFM_n(1,CDESFM,CLUOUT) ! @@ -1862,11 +1862,11 @@ IF (CSURF =='EXTE') THEN ! CALL IO_FILE_OPEN_ll(TZINIFILEPGD,CLUOUT,NRESP) ! - CALL IO_WRITE_HEADER(TZINIFILEPGD,CLUOUT) - CALL IO_WRITE_FIELD(TZINIFILEPGD,'SURF',CLUOUT,'EXTE') - CALL IO_WRITE_FIELD(TZINIFILEPGD,'L1D', CLUOUT,L1D) - CALL IO_WRITE_FIELD(TZINIFILEPGD,'L2D', CLUOUT,L2D) - CALL IO_WRITE_FIELD(TZINIFILEPGD,'PACK',CLUOUT,LPACK) + CALL IO_WRITE_HEADER(TZINIFILEPGD) + CALL IO_WRITE_FIELD(TZINIFILEPGD,'SURF','EXTE') + CALL IO_WRITE_FIELD(TZINIFILEPGD,'L1D', L1D) + CALL IO_WRITE_FIELD(TZINIFILEPGD,'L2D', L2D) + CALL IO_WRITE_FIELD(TZINIFILEPGD,'PACK',LPACK) CALL WRITE_HGRID(1,TZINIFILEPGD) TFILE_SURFEX => TZINIFILEPGD CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH') diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90 index 1fe61ace9..96cc35116 100644 --- a/src/MNH/prep_nest_pgd.f90 +++ b/src/MNH/prep_nest_pgd.f90 @@ -354,7 +354,7 @@ DO JPGD=1,NMODEL TFILE_SURFEX => TZFILENESTPGD(JPGD) CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH') NULLIFY(TFILE_SURFEX) - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'ZSMT',CLUOUT0,XZSMT) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'ZSMT',XZSMT) END DO ! !------------------------------------------------------------------------------- @@ -364,18 +364,18 @@ END DO ! ! DO JPGD=1,NMODEL - CALL IO_WRITE_HEADER(TZFILENESTPGD(JPGD),CLUOUT0) + CALL IO_WRITE_HEADER(TZFILENESTPGD(JPGD)) IF ( ASSOCIATED(TZFILENESTPGD(JPGD)%TDADFILE) ) THEN - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'DXRATIO',CLUOUT0,NDXRATIO_ALL(JPGD)) - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'DYRATIO',CLUOUT0,NDYRATIO_ALL(JPGD)) - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'XOR', CLUOUT0,NXOR_ALL(JPGD)) - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'YOR', CLUOUT0,NYOR_ALL(JPGD)) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'DXRATIO',NDXRATIO_ALL(JPGD)) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'DYRATIO',NDYRATIO_ALL(JPGD)) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'XOR', NXOR_ALL(JPGD)) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'YOR', NYOR_ALL(JPGD)) END IF - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'SURF', CLUOUT0,'EXTE') - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'L1D', CLUOUT0,L1D_ALL(JPGD)) - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'L2D', CLUOUT0,L2D_ALL(JPGD)) - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'PACK', CLUOUT0,LPACK_ALL(JPGD)) - CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'JPHEXT',CLUOUT0,JPHEXT) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'SURF', 'EXTE') + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'L1D', L1D_ALL(JPGD)) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'L2D', L2D_ALL(JPGD)) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'PACK', LPACK_ALL(JPGD)) + CALL IO_WRITE_FIELD(TZFILENESTPGD(JPGD),'JPHEXT',JPHEXT) END DO ! !------------------------------------------------------------------------------- diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90 index af6528e6c..09025286d 100644 --- a/src/MNH/prep_pgd.f90 +++ b/src/MNH/prep_pgd.f90 @@ -259,12 +259,12 @@ TZFILE%NLFIVERB = 5 ! CALL IO_FILE_OPEN_ll(TZFILE,CLUOUT0,IRESP,OPARALLELIO=.FALSE.) ! -CALL IO_WRITE_HEADER(TZFILE,CLUOUT0) +CALL IO_WRITE_HEADER(TZFILE) ! -CALL IO_WRITE_FIELD(TZFILE,'SURF',CLUOUT0,'EXTE') -CALL IO_WRITE_FIELD(TZFILE,'L1D', CLUOUT0,L1D) -CALL IO_WRITE_FIELD(TZFILE,'L2D', CLUOUT0,L2D) -CALL IO_WRITE_FIELD(TZFILE,'PACK',CLUOUT0,LPACK) +CALL IO_WRITE_FIELD(TZFILE,'SURF','EXTE') +CALL IO_WRITE_FIELD(TZFILE,'L1D', L1D) +CALL IO_WRITE_FIELD(TZFILE,'L2D', L2D) +CALL IO_WRITE_FIELD(TZFILE,'PACK',LPACK) IF ( NDXRATIO <= 0 .AND. NDYRATIO <= 0 ) THEN NDXRATIO = 1 NDYRATIO = 1 @@ -277,13 +277,13 @@ IF ( NXOR <= 0 .AND. NYOR <= 0 ) THEN NXOR = 1 NYOR = 1 ENDIF -CALL IO_WRITE_FIELD(TZFILE,'DXRATIO',CLUOUT0,NDXRATIO) -CALL IO_WRITE_FIELD(TZFILE,'DYRATIO',CLUOUT0,NDYRATIO) -CALL IO_WRITE_FIELD(TZFILE,'XSIZE', CLUOUT0,NXSIZE) -CALL IO_WRITE_FIELD(TZFILE,'YSIZE', CLUOUT0,NYSIZE) -CALL IO_WRITE_FIELD(TZFILE,'XOR', CLUOUT0,NXOR) -CALL IO_WRITE_FIELD(TZFILE,'YOR', CLUOUT0,NYOR) -CALL IO_WRITE_FIELD(TZFILE,'JPHEXT', CLUOUT0,JPHEXT) +CALL IO_WRITE_FIELD(TZFILE,'DXRATIO',NDXRATIO) +CALL IO_WRITE_FIELD(TZFILE,'DYRATIO',NDYRATIO) +CALL IO_WRITE_FIELD(TZFILE,'XSIZE', NXSIZE) +CALL IO_WRITE_FIELD(TZFILE,'YSIZE', NYSIZE) +CALL IO_WRITE_FIELD(TZFILE,'XOR', NXOR) +CALL IO_WRITE_FIELD(TZFILE,'YOR', NYOR) +CALL IO_WRITE_FIELD(TZFILE,'JPHEXT', JPHEXT) ! TFILE_SURFEX => TZFILE CALL WRITE_PGD_SURF_ATM_n(YSURF_CUR,'MESONH') @@ -319,8 +319,8 @@ IF (.NOT.LCARTESIAN) THEN ZWORK_LON(:,1) = ZWORK_LON(:,2) ZWORK_LON(:,IJMAX+2) = ZWORK_LON(:,IJMAX+1) ENDIF - CALL IO_WRITE_FIELD(TZFILE,'LAT',CLUOUT0,ZWORK_LAT) - CALL IO_WRITE_FIELD(TZFILE,'LON',CLUOUT0,ZWORK_LON) + CALL IO_WRITE_FIELD(TZFILE,'LAT',ZWORK_LAT) + CALL IO_WRITE_FIELD(TZFILE,'LON',ZWORK_LON) ! DEALLOCATE(ZWORK,ZWORK_LAT,ZWORK_LON) END IF diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90 index 100ce5193..930329005 100644 --- a/src/MNH/prep_real_case.f90 +++ b/src/MNH/prep_real_case.f90 @@ -1068,7 +1068,7 @@ END IF ! YDESFM=ADJUSTL(ADJUSTR(CINIFILE)//'.des') CALL WRITE_DESFM_n(1,YDESFM,CLUOUT0) -CALL IO_WRITE_HEADER(TZFILE,CLUOUT0,HDAD_NAME=YDAD_NAME) +CALL IO_WRITE_HEADER(TZFILE,HDAD_NAME=YDAD_NAME) CALL WRITE_LFIFM_n(TZFILE,YDAD_NAME) ! CALL SECOND_MNH(ZTIME2) diff --git a/src/MNH/prep_surfex.f90 b/src/MNH/prep_surfex.f90 index 4ec85e838..cfa262431 100644 --- a/src/MNH/prep_surfex.f90 +++ b/src/MNH/prep_surfex.f90 @@ -206,11 +206,11 @@ NULLIFY(TFILE_SURFEX) ! !------------------------------------------------------------------------------- ! -CALL IO_WRITE_HEADER(TZFILE,CLUOUT0) -CALL IO_WRITE_FIELD(TZFILE,'SURF',CLUOUT0,'EXTE') -CALL IO_WRITE_FIELD(TZFILE,'L1D', CLUOUT0,L1D) -CALL IO_WRITE_FIELD(TZFILE,'L2D', CLUOUT0,L2D) -CALL IO_WRITE_FIELD(TZFILE,'PACK',CLUOUT0,LPACK) +CALL IO_WRITE_HEADER(TZFILE) +CALL IO_WRITE_FIELD(TZFILE,'SURF','EXTE') +CALL IO_WRITE_FIELD(TZFILE,'L1D', L1D) +CALL IO_WRITE_FIELD(TZFILE,'L2D', L2D) +CALL IO_WRITE_FIELD(TZFILE,'PACK',LPACK) ! !------------------------------------------------------------------------------- WRITE(ILUOUT0,*) ' ' diff --git a/src/MNH/radiations.f90 b/src/MNH/radiations.f90 index b8f4501fd..7cfb63962 100644 --- a/src/MNH/radiations.f90 +++ b/src/MNH/radiations.f90 @@ -2598,7 +2598,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2618,7 +2618,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2638,7 +2638,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2658,7 +2658,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2678,7 +2678,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2698,7 +2698,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE DO JJ=IJB,IJE @@ -2716,7 +2716,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE DO JJ=IJB,IJE @@ -2734,7 +2734,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -2751,7 +2751,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -2768,7 +2768,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -2785,7 +2785,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) END IF ! ! @@ -2808,7 +2808,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2828,7 +2828,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2848,7 +2848,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2868,7 +2868,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2888,7 +2888,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -2908,7 +2908,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK-JPVEXT @@ -2928,7 +2928,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK-JPVEXT @@ -2948,7 +2948,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -2965,7 +2965,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -2982,7 +2982,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -2999,7 +2999,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) END IF ! ! @@ -3019,7 +3019,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -3036,7 +3036,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -3053,7 +3053,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -3070,7 +3070,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -3087,7 +3087,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! DO JJ=IJB,IJE DO JI=IIB,IIE @@ -3104,7 +3104,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_2D) ! ! END IF @@ -3129,7 +3129,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3149,7 +3149,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3169,7 +3169,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3189,7 +3189,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3209,7 +3209,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3229,7 +3229,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3249,7 +3249,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3269,7 +3269,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! ! spectral bands IF (KSWB==6) THEN @@ -3295,7 +3295,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZTAUAZ(:,:,:,JBAND)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTAUAZ(:,:,:,JBAND)) ! TZFIELD%CMNHNAME = 'SSAAER_'//YBAND_NAME(JBAND) TZFIELD%CSTDNAME = '' @@ -3306,7 +3306,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZPIZAZ(:,:,:,JBAND)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPIZAZ(:,:,:,JBAND)) ! TZFIELD%CMNHNAME = 'GAER_'//YBAND_NAME(JBAND) TZFIELD%CSTDNAME = '' @@ -3317,7 +3317,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZCGAZ(:,:,:,JBAND)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZCGAZ(:,:,:,JBAND)) ENDDO DO JBAND=1,KSWB @@ -3339,7 +3339,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3359,7 +3359,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! DO JK=IKB,IKE JKRAD = JK - JPVEXT @@ -3379,7 +3379,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) END DO END IF ! @@ -3406,7 +3406,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D) ! !cumulated optical thickness of aerosols !cumul begin from the top of the domain, not from the TOA ! @@ -3436,7 +3436,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D2) ! ! sea DO JK=IKB,IKE @@ -3464,7 +3464,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D2) ! ! desert DO JK=IKB,IKE @@ -3492,7 +3492,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D2) ! ! urban DO JK=IKB,IKE @@ -3520,7 +3520,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D2) ! ! Volcanoes DO JK=IKB,IKE @@ -3548,7 +3548,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D2) ! ! stratospheric background DO JK=IKB,IKE @@ -3576,7 +3576,7 @@ IF( OCLOSE_OUT .AND. (KRAD_DIAG >= 1) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZSTORE_3D2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSTORE_3D2) ENDIF END IF ! diff --git a/src/MNH/rain_c2r2_khko.f90 b/src/MNH/rain_c2r2_khko.f90 index f532d367d..a0189e587 100644 --- a/src/MNH/rain_c2r2_khko.f90 +++ b/src/MNH/rain_c2r2_khko.f90 @@ -14,7 +14,7 @@ INTERFACE SUBROUTINE RAIN_C2R2_KHKO(HCLOUD,OACTIT, OSEDC, ORAIN, KSPLITR, PTSTEP, & KMI, & - TPFILE, HLUOUT, OCLOSE_OUT, & + TPFILE, OCLOSE_OUT, & PZZ, PRHODJ, & PRHODREF, PEXNREF, & PPABST, PTHT, PRVT, PRCT, & @@ -41,8 +41,6 @@ INTEGER, INTENT(IN) :: KSPLITR ! Number of small time step REAL, INTENT(IN) :: PTSTEP ! Time step :XTSTEP in namelist INTEGER, INTENT(IN) :: KMI ! Model index TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of ! the tput FM fileoutp REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ ! Height (z) @@ -93,7 +91,7 @@ END INTERFACE END MODULE MODI_RAIN_C2R2_KHKO ! ###################################################################### SUBROUTINE RAIN_C2R2_KHKO (HCLOUD,OACTIT, OSEDC, ORAIN, KSPLITR, PTSTEP, & - KMI, TPFILE, HLUOUT, OCLOSE_OUT, PZZ, PRHODJ, & + KMI, TPFILE, OCLOSE_OUT, PZZ, PRHODJ, & PRHODREF, PEXNREF, & PPABST, PTHT, PRVT, PRCT, & PRRT, PTHM, PRCM, PPABSM, & @@ -265,8 +263,6 @@ INTEGER, INTENT(IN) :: KSPLITR ! Number of small time step REAL, INTENT(IN) :: PTSTEP ! Time step :XTSTEP in namelist INTEGER, INTENT(IN) :: KMI ! Model index TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of ! the tput FM fileoutp REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ ! Height (z) @@ -604,7 +600,7 @@ INTEGER :: J1 ! TZFIELD%NGRID = 1 ! TZFIELD%NTYPE = TYPEREAL ! TZFIELD%NDIMS = 3 -! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZCHEN) +! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZCHEN) ! END IF ! !------------------------------------------------------------------------------- @@ -887,7 +883,7 @@ IF ( OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZZW1LOG) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZZW1LOG) END IF ! !* 3.4 budget storage @@ -1910,7 +1906,7 @@ DO JN = 1 , KSPLITR TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZWSEDC) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWSEDC) ! TZFIELD%CMNHNAME = 'SEDFLUXR' TZFIELD%CSTDNAME = '' @@ -1921,7 +1917,7 @@ DO JN = 1 , KSPLITR TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZWSEDR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWSEDR) END IF END DO ! diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90 index a245c573b..a594acc9a 100644 --- a/src/MNH/resolved_cloud.f90 +++ b/src/MNH/resolved_cloud.f90 @@ -841,7 +841,7 @@ SELECT CASE ( HCLOUD ) ! ! CALL RAIN_C2R2_KHKO ( HCLOUD, OACTIT, OSEDC, ORAIN, KSPLITR, PTSTEP, KMI, & - TPFILE, HLUOUT, OCLOSE_OUT, PZZ, PRHODJ, PRHODREF, PEXNREF, & + TPFILE, OCLOSE_OUT, PZZ, PRHODJ, PRHODREF, PEXNREF, & PPABST, PTHT, PRT(:,:,:,1), PRT(:,:,:,2), PRT(:,:,:,3), & PTHM, PRCM, PPABSM, & PW_ACT,PDTHRAD,PTHS, PRS(:,:,:,1),PRS(:,:,:,2),PRS(:,:,:,3), & diff --git a/src/MNH/shallow_mf_pack.f90 b/src/MNH/shallow_mf_pack.f90 index 1604f23a9..f8c77d26e 100644 --- a/src/MNH/shallow_mf_pack.f90 +++ b/src/MNH/shallow_mf_pack.f90 @@ -10,7 +10,7 @@ INTERFACE ! ################################################################# SUBROUTINE SHALLOW_MF_PACK(KRR,KRRL,KRRI, & HMF_UPDRAFT, HMF_CLOUD, OMIXUV, & - OCLOSE_OUT,OMF_FLX,TPFILE,HLUOUT,PTIME_LES, & + OCLOSE_OUT,OMF_FLX,TPFILE,PTIME_LES, & PIMPL_MF, PTSTEP, & PDZZ, PZZ, & PRHODJ, PRHODREF, & @@ -39,9 +39,7 @@ LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for synchronous LOGICAL, INTENT(IN) :: OMF_FLX ! switch to write the ! MF fluxes in the synchronous FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n -REAL*8,DIMENSION(2), INTENT(OUT) :: PTIME_LES ! time spent in LES computations +REAL*8,DIMENSION(2), INTENT(OUT) :: PTIME_LES ! time spent in LES computations REAL, INTENT(IN) :: PIMPL_MF ! degre of implicitness REAL, INTENT(IN) :: PTSTEP ! Dynamical timestep @@ -77,7 +75,7 @@ END MODULE MODI_SHALLOW_MF_PACK ! ################################################################# SUBROUTINE SHALLOW_MF_PACK(KRR,KRRL,KRRI, & HMF_UPDRAFT, HMF_CLOUD, OMIXUV, & - OCLOSE_OUT,OMF_FLX,TPFILE,HLUOUT,PTIME_LES, & + OCLOSE_OUT,OMF_FLX,TPFILE,PTIME_LES, & PIMPL_MF, PTSTEP, & PDZZ, PZZ, & PRHODJ, PRHODREF, & @@ -155,9 +153,7 @@ LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for synchronous LOGICAL, INTENT(IN) :: OMF_FLX ! switch to write the ! MF fluxes in the synchronous FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n -REAL*8,DIMENSION(2), INTENT(OUT) :: PTIME_LES ! time spent in LES computations +REAL*8,DIMENSION(2), INTENT(OUT) :: PTIME_LES ! time spent in LES computations REAL, INTENT(IN) :: PIMPL_MF ! degre of implicitness REAL, INTENT(IN) :: PTSTEP ! Dynamical timestep @@ -390,7 +386,7 @@ IF ( OMF_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZWORK) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK) ! ! stores the conservative mixing ratio vertical flux ZWORK(:,:,:)=RESHAPE(ZFLXZRMF(:,:),(/ IIU,IJU,IKU /) ) @@ -403,7 +399,7 @@ IF ( OMF_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZWORK) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK) ! ! stores the theta_v vertical flux TZFIELD%CMNHNAME = 'MF_THVW_FLX' @@ -415,7 +411,7 @@ IF ( OMF_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PFLXZTHVMF) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PFLXZTHVMF) ! IF (OMIXUV) THEN ! stores the U momentum vertical flux @@ -429,7 +425,7 @@ IF ( OMF_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZWORK) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK) ! ! stores the V momentum vertical flux ZWORK(:,:,:)=RESHAPE(ZFLXZVMF(:,:),(/ IIU,IJU,IKU /) ) @@ -442,7 +438,7 @@ IF ( OMF_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZWORK) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK) ! END IF END IF diff --git a/src/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90 index 80ddb4e8f..c2607e6b5 100644 --- a/src/MNH/spawn_model2.f90 +++ b/src/MNH/spawn_model2.f90 @@ -1500,7 +1500,7 @@ ELSE CDAD_NAME(2)=CMY_NAME(1) ! model 1 becomes the DAD of model 2 (spawned one) ENDIF ! -CALL IO_WRITE_HEADER(TZFILE,CLUOUT,HDAD_NAME=CDAD_NAME(2)) +CALL IO_WRITE_HEADER(TZFILE,HDAD_NAME=CDAD_NAME(2)) CALL WRITE_LFIFM_n(TZFILE,CDAD_NAME(2)) ! CALL SECOND_MNH(ZTIME2) diff --git a/src/MNH/tke_eps_sources.f90 b/src/MNH/tke_eps_sources.f90 index 951488e0a..e865f1223 100644 --- a/src/MNH/tke_eps_sources.f90 +++ b/src/MNH/tke_eps_sources.f90 @@ -17,7 +17,7 @@ INTERFACE PRHODJ,PDZZ,PDXX,PDYY,PDZX,PDZY,PZZ, & PTSTEP,PIMPL,PEXPL, & HTURBLEN,HTURBDIM, & - TPFILE,HLUOUT,OCLOSE_OUT,OTURB_DIAG, & + TPFILE,OCLOSE_OUT,OTURB_DIAG, & PTP,PRTKES,PRTKESM, PRTHLS,PCOEF_DISS,PTR,PDISS ) ! USE MODD_IO_ll, ONLY: TFILEDATA @@ -39,8 +39,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the ! turbulence scheme CHARACTER*4, INTENT(IN) :: HTURBLEN ! kind of mixing length TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous ! file opening LOGICAL, INTENT(IN) :: OTURB_DIAG ! switch to write some @@ -69,7 +67,7 @@ END MODULE MODI_TKE_EPS_SOURCES PTRH,PRHODJ,PDZZ,PDXX,PDYY,PDZX,PDZY,PZZ, & PTSTEP,PIMPL,PEXPL, & HTURBLEN,HTURBDIM, & - TPFILE,HLUOUT,OCLOSE_OUT,OTURB_DIAG, & + TPFILE,OCLOSE_OUT,OTURB_DIAG, & PTP,PRTKES,PRTKESM, PRTHLS,PCOEF_DISS,PTR,PDISS ) ! ################################################################## ! @@ -231,8 +229,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the ! turbulence scheme CHARACTER*4, INTENT(IN) :: HTURBLEN ! kind of mixing length TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous ! file opening LOGICAL, INTENT(IN) :: OTURB_DIAG ! switch to write some @@ -435,7 +431,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PDP) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PDP) ! ! stores the thermal production ! @@ -448,7 +444,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PTP) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PTP) ! ! stores the whole turbulent transport ! @@ -461,7 +457,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PTR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PTR) ! ! stores the dissipation of TKE ! @@ -474,7 +470,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PDISS) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PDISS) END IF ! ! Storage in the LES configuration of the Dynamic Production of TKE and diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90 index 996b9cfdc..7f4eb0b6d 100644 --- a/src/MNH/turb.f90 +++ b/src/MNH/turb.f90 @@ -12,7 +12,7 @@ INTERFACE KSPLIT,KMODEL_CL, & OCLOSE_OUT,OTURB_FLX,OTURB_DIAG,OSUBG_COND,ORMC01, & HTURBDIM,HTURBLEN,HTOM,HTURBLEN_CL,HCLOUD,PIMPL, & - PTSTEP,TPFILE,HLUOUT,PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & + PTSTEP,TPFILE,PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW,PCOSSLOPE,PSINSLOPE, & PRHODJ,PTHVREF,PRHODREF, & PSFTH,PSFRV,PSFSV,PSFU,PSFV, & @@ -55,8 +55,6 @@ REAL, INTENT(IN) :: PIMPL ! degree of implicitness CHARACTER (LEN=4), INTENT(IN) :: HCLOUD ! Kind of microphysical scheme REAL, INTENT(IN) :: PTSTEP ! timestep TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX,PDYY,PDZZ,PDZX,PDZY ! metric coefficients @@ -141,7 +139,7 @@ END MODULE MODI_TURB SUBROUTINE TURB(KKA,KKU,KKL,KMI,KRR,KRRL,KRRI,HLBCX,HLBCY,KSPLIT,KMODEL_CL, & OCLOSE_OUT,OTURB_FLX,OTURB_DIAG,OSUBG_COND,ORMC01, & HTURBDIM,HTURBLEN,HTOM,HTURBLEN_CL,HCLOUD,PIMPL, & - PTSTEP,TPFILE,HLUOUT,PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & + PTSTEP,TPFILE,PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW,PCOSSLOPE,PSINSLOPE, & PRHODJ,PTHVREF,PRHODREF, & PSFTH,PSFRV,PSFSV,PSFU,PSFV, & @@ -414,8 +412,6 @@ REAL, INTENT(IN) :: PIMPL ! degree of implicitness CHARACTER (LEN=4), INTENT(IN) :: HCLOUD ! Kind of microphysical scheme REAL, INTENT(IN) :: PTSTEP ! timestep TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX,PDYY,PDZZ,PDZX,PDZY ! metric coefficients @@ -688,7 +684,7 @@ IF (KRRL >=1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZATHETA) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZATHETA) ! TZFIELD%CMNHNAME = 'AMOIST' TZFIELD%CSTDNAME = '' @@ -699,7 +695,7 @@ IF (KRRL >=1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZAMOIST) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZAMOIST) END IF ! ELSE @@ -888,7 +884,7 @@ ZFTHR(:,:,:IKTB) = 0. CALL TURB_VER(KKA,KKU,KKL,KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX, & HTURBDIM,HTOM,PIMPL,ZEXPL, & - PTSTEP,TPFILE,HLUOUT, & + PTSTEP,TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PCOSSLOPE,PSINSLOPE, & PRHODJ,PTHVREF, & @@ -936,7 +932,7 @@ IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),9,'VTURB_BU_RRI') IF (HTURBDIM=='3DIM') THEN CALL TURB_HOR_SPLT(KSPLIT, KRR, KRRL, KRRI, PTSTEP, & HLBCX,HLBCY,OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, & PCOSSLOPE,PSINSLOPE, & @@ -998,7 +994,7 @@ CALL TKE_EPS_SOURCES(KKA,KKU,KKL,KMI,PTKET,ZLM,ZLEPS,ZDP,ZTRH, & PRHODJ,PDZZ,PDXX,PDYY,PDZX,PDZY,PZZ, & PTSTEP,PIMPL,ZEXPL, & HTURBLEN,HTURBDIM, & - TPFILE,HLUOUT,OCLOSE_OUT,OTURB_DIAG, & + TPFILE,OCLOSE_OUT,OTURB_DIAG, & ZTP,PRTKES,PRTKEMS,PRTHLS,ZCOEF_DISS,PTR,PDISS ) ! PDYP = ZDP @@ -1035,7 +1031,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZLM) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLM) ! IF (KRR /= 0) THEN ! @@ -1050,7 +1046,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PTHLT) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PTHLT) ! ! stores the conservative mixing ratio ! @@ -1063,7 +1059,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PRT(:,:,:,1)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PRT(:,:,:,1)) END IF END IF ! @@ -1662,7 +1658,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZLM) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLM) ENDIF ! ! Amplification of the mixing length when the criteria are verified @@ -1687,7 +1683,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZCOEF_AMPL) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZCOEF_AMPL) ! TZFIELD%CMNHNAME = 'LM_CLOUD' TZFIELD%CSTDNAME = '' @@ -1698,7 +1694,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZLM_CLOUD) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLM_CLOUD) ! ENDIF ! diff --git a/src/MNH/turb_cloud_index.f90 b/src/MNH/turb_cloud_index.f90 index 37f9ec80c..a27d3931e 100644 --- a/src/MNH/turb_cloud_index.f90 +++ b/src/MNH/turb_cloud_index.f90 @@ -14,7 +14,7 @@ ! INTERFACE ! - SUBROUTINE TURB_CLOUD_INDEX(PTSTEP,TPFILE,HLUOUT, & + SUBROUTINE TURB_CLOUD_INDEX(PTSTEP,TPFILE, & OTURB_DIAG,OCLOSE_OUT,KRRI, & PRRS,PRM,PRHODJ,PDXX,PDYY,PDZZ,PDZX,PDZY, & PCEI ) @@ -23,8 +23,6 @@ USE MODD_IO_ll, ONLY: TFILEDATA ! REAL, INTENT(IN) :: PTSTEP ! Double Time step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n LOGICAL, INTENT(IN) :: OTURB_DIAG ! switch to write some ! diagnostic fields in the syncronous FM-file LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous @@ -47,7 +45,7 @@ END INTERFACE END MODULE MODI_TURB_CLOUD_INDEX ! ! ####################### - SUBROUTINE TURB_CLOUD_INDEX(PTSTEP,TPFILE,HLUOUT, & + SUBROUTINE TURB_CLOUD_INDEX(PTSTEP,TPFILE, & OTURB_DIAG,OCLOSE_OUT,KRRI, & PRRS,PRM,PRHODJ,PDXX,PDYY,PDZZ,PDZX,PDZY, & PCEI ) @@ -108,8 +106,6 @@ IMPLICIT NONE ! REAL, INTENT(IN) :: PTSTEP ! Double Time step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n LOGICAL, INTENT(IN) :: OTURB_DIAG ! switch to write some ! diagnostic fields in the syncronous FM-file LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous @@ -266,7 +262,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZRVCI) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZRVCI) ! TZFIELD%CMNHNAME = 'GX_RVCI' TZFIELD%CSTDNAME = '' @@ -277,7 +273,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZG_RVCI(:,:,:,1)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZG_RVCI(:,:,:,1)) ! TZFIELD%CMNHNAME = 'GY_RVCI' TZFIELD%CSTDNAME = '' @@ -288,7 +284,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZG_RVCI(:,:,:,2)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZG_RVCI(:,:,:,2)) ! TZFIELD%CMNHNAME = 'GNORM_RVCI' TZFIELD%CSTDNAME = '' @@ -299,7 +295,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZGNORM_RVCI) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZGNORM_RVCI) ! TZFIELD%CMNHNAME = 'QX_RVCI' TZFIELD%CSTDNAME = '' @@ -310,7 +306,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZQ_RVCI(:,:,:,1)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZQ_RVCI(:,:,:,1)) ! TZFIELD%CMNHNAME = 'QY_RVCI' TZFIELD%CSTDNAME = '' @@ -321,7 +317,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZQ_RVCI(:,:,:,2)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZQ_RVCI(:,:,:,2)) ! TZFIELD%CMNHNAME = 'QNORM_RVCI' TZFIELD%CSTDNAME = '' @@ -332,7 +328,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZQNORM_RVCI) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZQNORM_RVCI) ! TZFIELD%CMNHNAME = 'CEI' TZFIELD%CSTDNAME = '' @@ -343,7 +339,7 @@ IF ( OTURB_DIAG .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,PCEI) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,PCEI) END IF ! END SUBROUTINE TURB_CLOUD_INDEX diff --git a/src/MNH/turb_hor.f90 b/src/MNH/turb_hor.f90 index eb1729439..8551bc98f 100644 --- a/src/MNH/turb_hor.f90 +++ b/src/MNH/turb_hor.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE TURB_HOR(KSPLT, KRR, KRRL, KRRI, PTSTEP, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, & PCOSSLOPE,PSINSLOPE, & @@ -46,8 +46,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -119,7 +117,7 @@ END MODULE MODI_TURB_HOR ! ################################################################ SUBROUTINE TURB_HOR(KSPLT, KRR, KRRL, KRRI, PTSTEP, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, & PCOSSLOPE,PSINSLOPE, & @@ -299,8 +297,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -384,7 +380,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS ! CALL TURB_HOR_THERMO_FLUX(KSPLT, KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSXW,PDIRCOSYW, & @@ -400,7 +396,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS IF (KSPLT==1) & CALL TURB_HOR_THERMO_CORR(KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PINV_PDXX,PINV_PDYY, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PTHVREF, & @@ -416,7 +412,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS ! CALL TURB_HOR_DYN_CORR(KSPLT, PTSTEP, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDZZ, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSZW, & @@ -434,7 +430,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS ! CALL TURB_HOR_UV(KSPLT, & OCLOSE_OUT,OTURB_FLX, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSZW, & @@ -450,7 +446,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS ! CALL TURB_HOR_UW(KSPLT, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDZZ,PDZX, & PRHODJ,PTHVREF, & @@ -464,7 +460,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS ! CALL TURB_HOR_VW(KSPLT, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDYY,PDZZ,PDZY, & PRHODJ,PTHVREF, & @@ -479,7 +475,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSIGS ! CALL TURB_HOR_SV_FLUX(KSPLT, & OCLOSE_OUT,OTURB_FLX, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSXW,PDIRCOSYW, & diff --git a/src/MNH/turb_hor_dyn_corr.f90 b/src/MNH/turb_hor_dyn_corr.f90 index 24d74e009..d34ef68ce 100644 --- a/src/MNH/turb_hor_dyn_corr.f90 +++ b/src/MNH/turb_hor_dyn_corr.f90 @@ -13,7 +13,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_DYN_CORR(KSPLT, PTSTEP, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDZZ, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSZW, & @@ -36,8 +36,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file INTEGER, INTENT(IN) :: KRR ! number of moist var. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -86,7 +84,7 @@ END MODULE MODI_TURB_HOR_DYN_CORR ! ################################################################ SUBROUTINE TURB_HOR_DYN_CORR(KSPLT, PTSTEP, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDZZ, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSZW, & @@ -186,8 +184,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file INTEGER, INTENT(IN) :: KRR ! number of moist var. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -391,7 +387,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! Complete the U tendency @@ -486,7 +482,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! Complete the V tendency @@ -572,7 +568,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! Complete the W tendency diff --git a/src/MNH/turb_hor_splt.f90 b/src/MNH/turb_hor_splt.f90 index c938ff3b5..4d029f060 100644 --- a/src/MNH/turb_hor_splt.f90 +++ b/src/MNH/turb_hor_splt.f90 @@ -15,7 +15,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_SPLT(KSPLIT, KRR, KRRL, KRRI, PTSTEP, & HLBCX,HLBCY,OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, & PCOSSLOPE,PSINSLOPE, & @@ -45,8 +45,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -113,7 +111,7 @@ END MODULE MODI_TURB_HOR_SPLT ! ################################################################ SUBROUTINE TURB_HOR_SPLT(KSPLIT, KRR, KRRL, KRRI, PTSTEP, & HLBCX,HLBCY,OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, & PCOSSLOPE,PSINSLOPE, & @@ -291,8 +289,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -474,7 +470,7 @@ IF (KSPLIT>1 .AND. CPROGRAM=='MESONH') THEN ! compute the turbulent tendencies for the small time step CALL TURB_HOR(JSPLT, KRR, KRRL, KRRI, PTSTEP, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, & PCOSSLOPE,PSINSLOPE, & @@ -615,7 +611,7 @@ ELSE ! CALL TURB_HOR(1, KRR, KRRL, KRRI, PTSTEP, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PZZ, & PDIRCOSXW,PDIRCOSYW,PDIRCOSZW, & PCOSSLOPE,PSINSLOPE, & diff --git a/src/MNH/turb_hor_sv_flux.f90 b/src/MNH/turb_hor_sv_flux.f90 index f2f31e975..9322af019 100644 --- a/src/MNH/turb_hor_sv_flux.f90 +++ b/src/MNH/turb_hor_sv_flux.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_SV_FLUX(KSPLT, & OCLOSE_OUT,OTURB_FLX, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSXW,PDIRCOSYW, & @@ -33,8 +33,6 @@ LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -67,7 +65,7 @@ END MODULE MODI_TURB_HOR_SV_FLUX ! ################################################################ SUBROUTINE TURB_HOR_SV_FLUX(KSPLT, & OCLOSE_OUT,OTURB_FLX, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSXW,PDIRCOSYW, & @@ -152,8 +150,6 @@ LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -260,7 +256,7 @@ DO JSV=1,ISV TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXX) END IF ! IF (LLES_CALL .AND. KSPLT==1) THEN @@ -310,7 +306,7 @@ DO JSV=1,ISV TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXY) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXY) END IF ! ELSE diff --git a/src/MNH/turb_hor_thermo_corr.f90 b/src/MNH/turb_hor_thermo_corr.f90 index f241c93d3..14eff4f17 100644 --- a/src/MNH/turb_hor_thermo_corr.f90 +++ b/src/MNH/turb_hor_thermo_corr.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_THERMO_CORR(KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PINV_PDXX,PINV_PDYY, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PTHVREF, & @@ -37,8 +37,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PINV_PDXX ! 1./PDXX REAL, DIMENSION(:,:,:), INTENT(IN) :: PINV_PDYY ! 1./PDYY @@ -77,7 +75,7 @@ END MODULE MODI_TURB_HOR_THERMO_CORR ! ################################################################ SUBROUTINE TURB_HOR_THERMO_CORR(KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PINV_PDXX,PINV_PDYY, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PTHVREF, & @@ -166,8 +164,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PINV_PDXX ! 1./PDXX REAL, DIMENSION(:,:,:), INTENT(IN) :: PINV_PDYY ! 1./PDYY @@ -289,7 +285,7 @@ IF ( ( KRRL > 0 .AND. OSUBG_COND) .OR. ( OTURB_FLX .AND. OCLOSE_OUT ) & TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! Storage in the LES configuration (addition to TURB_VER computation) @@ -376,7 +372,7 @@ IF ( ( KRRL > 0 .AND. OSUBG_COND) .OR. ( OTURB_FLX .AND. OCLOSE_OUT ) & TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! Storage in the LES configuration (addition to TURB_VER computation) @@ -443,7 +439,7 @@ IF ( ( KRRL > 0 .AND. OSUBG_COND) .OR. ( OTURB_FLX .AND. OCLOSE_OUT ) & TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! Storage in the LES configuration (addition to TURB_VER computation) diff --git a/src/MNH/turb_hor_thermo_flux.f90 b/src/MNH/turb_hor_thermo_flux.f90 index 96427e33c..2950c51c6 100644 --- a/src/MNH/turb_hor_thermo_flux.f90 +++ b/src/MNH/turb_hor_thermo_flux.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_THERMO_FLUX(KSPLT, KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSXW,PDIRCOSYW, & @@ -39,8 +39,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -83,7 +81,7 @@ END MODULE MODI_TURB_HOR_THERMO_FLUX ! ################################################################ SUBROUTINE TURB_HOR_THERMO_FLUX(KSPLT, KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX,OSUBG_COND, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSXW,PDIRCOSYW, & @@ -174,8 +172,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for sub-grid ! condensation TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -332,7 +328,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! IF (KSPLT==1 .AND. LLES_CALL) THEN @@ -434,7 +430,7 @@ IF (KRR/=0) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! IF (KSPLT==1 .AND. LLES_CALL) THEN @@ -482,7 +478,7 @@ END IF !! TZFIELD%NGRID = 2 !! TZFIELD%NTYPE = TYPEREAL !! TZFIELD%NDIMS = 3 -!! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZVPTU) +!! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZVPTU) !! END IF !!! !!ELSE @@ -584,7 +580,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! IF (KSPLT==1 .AND. LLES_CALL) THEN @@ -695,7 +691,7 @@ IF (KRR/=0) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! IF (KSPLT==1 .AND. LLES_CALL) THEN @@ -747,7 +743,7 @@ END IF !! TZFIELD%NGRID = 3 !! TZFIELD%NTYPE = TYPEREAL !! TZFIELD%NDIMS = 3 -!! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZVPTV) +!! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZVPTV) !! END IF !!! !!ELSE diff --git a/src/MNH/turb_hor_uv.f90 b/src/MNH/turb_hor_uv.f90 index aac215c83..4eb26ee40 100644 --- a/src/MNH/turb_hor_uv.f90 +++ b/src/MNH/turb_hor_uv.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_UV(KSPLT, & OCLOSE_OUT,OTURB_FLX, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSZW, & @@ -35,8 +35,6 @@ LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -82,7 +80,7 @@ END MODULE MODI_TURB_HOR_UV ! ################################################################ SUBROUTINE TURB_HOR_UV(KSPLT, & OCLOSE_OUT,OTURB_FLX, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PDIRCOSZW, & @@ -164,8 +162,6 @@ LOGICAL, INTENT(IN) :: OCLOSE_OUT ! switch for syncronous LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -292,7 +288,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 5 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! diff --git a/src/MNH/turb_hor_uw.f90 b/src/MNH/turb_hor_uw.f90 index feed91a92..03e1be25c 100644 --- a/src/MNH/turb_hor_uw.f90 +++ b/src/MNH/turb_hor_uw.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_UW(KSPLT, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDZZ,PDZX, & PRHODJ,PTHVREF, & @@ -34,8 +34,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file INTEGER, INTENT(IN) :: KRR ! number of moist var. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. @@ -70,7 +68,7 @@ END MODULE MODI_TURB_HOR_UW ! ################################################################ SUBROUTINE TURB_HOR_UW(KSPLT, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDXX,PINV_PDZZ,PMZM_PRHODJ, & PDXX,PDZZ,PDZX, & PRHODJ,PTHVREF, & @@ -157,8 +155,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file INTEGER, INTENT(IN) :: KRR ! number of moist var. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. @@ -241,7 +237,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 6 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! diff --git a/src/MNH/turb_hor_vw.f90 b/src/MNH/turb_hor_vw.f90 index 8855269fa..e3fc145f5 100644 --- a/src/MNH/turb_hor_vw.f90 +++ b/src/MNH/turb_hor_vw.f90 @@ -16,7 +16,7 @@ INTERFACE ! SUBROUTINE TURB_HOR_VW(KSPLT, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDYY,PDZZ,PDZY, & PRHODJ,PTHVREF, & @@ -34,8 +34,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file INTEGER, INTENT(IN) :: KRR ! number of moist var. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -66,7 +64,7 @@ END MODULE MODI_TURB_HOR_VW ! ################################################################ SUBROUTINE TURB_HOR_VW(KSPLT, & OCLOSE_OUT,OTURB_FLX,KRR, & - TPFILE,HLUOUT, & + TPFILE, & PK,PINV_PDYY,PINV_PDZZ,PMZM_PRHODJ, & PDYY,PDZZ,PDZY, & PRHODJ,PTHVREF, & @@ -153,8 +151,6 @@ LOGICAL, INTENT(IN) :: OTURB_FLX ! switch to write the ! turbulent fluxes in the syncronous FM-file INTEGER, INTENT(IN) :: KRR ! number of moist var. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name - ! for model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PK ! Turbulent diffusion doef. ! PK = PLM * SQRT(PTKEM) @@ -243,7 +239,7 @@ IF ( OCLOSE_OUT .AND. OTURB_FLX ) THEN TZFIELD%NGRID = 7 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLX) END IF ! ! compute the source for rho*V due to this residual flux ( the other part is diff --git a/src/MNH/turb_ver.f90 b/src/MNH/turb_ver.f90 index a182304dd..8ad678b36 100644 --- a/src/MNH/turb_ver.f90 +++ b/src/MNH/turb_ver.f90 @@ -17,7 +17,7 @@ INTERFACE SUBROUTINE TURB_VER(KKA,KKU,KKL,KRR,KRRL,KRRI, & OCLOSE_OUT,OTURB_FLX, & HTURBDIM,HTOM,PIMPL,PEXPL, & - PTSTEP, TPFILE,HLUOUT, & + PTSTEP, TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PCOSSLOPE,PSINSLOPE, & PRHODJ,PTHVREF, & @@ -47,8 +47,6 @@ CHARACTER*4, INTENT(IN) :: HTOM ! type of Third Order Mome REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! timestep TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -129,7 +127,7 @@ END MODULE MODI_TURB_VER SUBROUTINE TURB_VER(KKA,KKU,KKL,KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX, & HTURBDIM,HTOM,PIMPL,PEXPL, & - PTSTEP, TPFILE,HLUOUT, & + PTSTEP, TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PCOSSLOPE,PSINSLOPE, & PRHODJ,PTHVREF, & @@ -380,8 +378,6 @@ CHARACTER*4, INTENT(IN) :: HTOM ! type of Third Order Mome REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! timestep TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -538,7 +534,7 @@ IKE=KKU-JPVEXT_TURB*KKL ! CALL PRANDTL(KKA,KKU,KKL,KRR,KRRI,OCLOSE_OUT,OTURB_FLX, & HTURBDIM, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY, & PTHVREF,PLOCPEXNM,PATHETA,PAMOIST, & PLM,PLEPS,PTKEM,PTHLM,PRM,PSVM,PSRCM, & @@ -611,7 +607,7 @@ END IF CALL TURB_VER_THERMO_FLUX(KKA,KKU,KKL,KRR,KRRL,KRRI, & OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM, & PIMPL,PEXPL,PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PRHODJ,PTHVREF, & PSFTHM,PSFRM,PSFTHP,PSFRP, & @@ -627,7 +623,7 @@ END IF CALL TURB_VER_THERMO_CORR(KKA,KKU,KKL,KRR,KRRL,KRRI, & OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM, & PIMPL,PEXPL, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW, & PRHODJ,PTHVREF, & PSFTHM,PSFRM,PSFTHP,PSFRP, & @@ -656,7 +652,7 @@ END IF CALL TURB_VER_DYN_FLUX(KKA,KKU,KKL, & OCLOSE_OUT,OTURB_FLX,KRR, & HTURBDIM,PIMPL,PEXPL,PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PCOSSLOPE,PSINSLOPE, & PRHODJ, & @@ -676,7 +672,7 @@ IF (SIZE(PSVM,4)>0) & CALL TURB_VER_SV_FLUX(KKA,KKU,KKL, & OCLOSE_OUT,OTURB_FLX,HTURBDIM, & PIMPL,PEXPL,PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDZZ,PDIRCOSZW, & PRHODJ,PWM, & PSFSVM,PSFSVP, & @@ -721,7 +717,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZPHI3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPHI3) ! ! stores the Turbulent Schmidt number ! @@ -734,7 +730,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZPSI3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPSI3) ! ! ! stores the Turbulent Schmidt number for the scalar variables @@ -749,7 +745,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN WRITE(TZFIELD%CMNHNAME, '("PSI_SV_",I3.3)') JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZPSI_SV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPSI_SV(:,:,:,JSV)) END DO ! END IF diff --git a/src/MNH/turb_ver_dyn_flux.f90 b/src/MNH/turb_ver_dyn_flux.f90 index bcece1bbf..6dbf1e40a 100644 --- a/src/MNH/turb_ver_dyn_flux.f90 +++ b/src/MNH/turb_ver_dyn_flux.f90 @@ -17,7 +17,7 @@ INTERFACE OCLOSE_OUT,OTURB_FLX,KRR, & HTURBDIM,PIMPL,PEXPL, & PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PCOSSLOPE,PSINSLOPE, & PRHODJ, & @@ -42,8 +42,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! Double Time Step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -98,7 +96,7 @@ END MODULE MODI_TURB_VER_DYN_FLUX OCLOSE_OUT,OTURB_FLX,KRR, & HTURBDIM,PIMPL,PEXPL, & PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PCOSSLOPE,PSINSLOPE, & PRHODJ, & @@ -333,8 +331,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! Double Time Step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX, PDYY, PDZZ, PDZX, PDZY ! Metric coefficients @@ -526,7 +522,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! first part of total momentum flux @@ -700,7 +696,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! second part of total momentum flux @@ -820,7 +816,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT .AND. HTURBDIM == '1DIM') THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! !---------------------------------------------------------------------------- diff --git a/src/MNH/turb_ver_sv_flux.f90 b/src/MNH/turb_ver_sv_flux.f90 index 3b9d8ba3d..ff6b4c950 100644 --- a/src/MNH/turb_ver_sv_flux.f90 +++ b/src/MNH/turb_ver_sv_flux.f90 @@ -18,7 +18,7 @@ INTERFACE OCLOSE_OUT,OTURB_FLX,HTURBDIM, & PIMPL,PEXPL, & PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDZZ,PDIRCOSZW, & PRHODJ,PWM, & PSFSVM,PSFSVP, & @@ -40,8 +40,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! Double Time Step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! Metric coefficients @@ -79,7 +77,7 @@ END MODULE MODI_TURB_VER_SV_FLUX OCLOSE_OUT,OTURB_FLX,HTURBDIM, & PIMPL,PEXPL, & PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDZZ,PDIRCOSZW, & PRHODJ,PWM, & PSFSVM,PSFSVP, & @@ -314,8 +312,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! Double Time Step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ ! Metric coefficients @@ -462,7 +458,7 @@ DO JSV=1,ISV TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 ! - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! Storage in the LES configuration diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90 index ea8aea763..5be5b0b7c 100644 --- a/src/MNH/turb_ver_thermo_corr.f90 +++ b/src/MNH/turb_ver_thermo_corr.f90 @@ -17,7 +17,7 @@ INTERFACE SUBROUTINE TURB_VER_THERMO_CORR(KKA,KKU,KKL,KRR,KRRL,KRRI, & OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM, & PIMPL,PEXPL, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW, & PRHODJ,PTHVREF, & PSFTHM,PSFRM,PSFTHP,PSFRP, & @@ -47,8 +47,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the CHARACTER*4, INTENT(IN) :: HTOM ! type of Third Order Moment REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ, PDXX, PDYY, PDZX, PDZY ! Metric coefficients @@ -120,7 +118,7 @@ END MODULE MODI_TURB_VER_THERMO_CORR SUBROUTINE TURB_VER_THERMO_CORR(KKA,KKU,KKL,KRR, KRRL, KRRI, & OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM, & PIMPL,PEXPL, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW, & PRHODJ,PTHVREF, & PSFTHM,PSFRM,PSFTHP,PSFRP, & @@ -362,8 +360,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! dimensionality of the CHARACTER*4, INTENT(IN) :: HTOM ! type of Third Order Moment REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ, PDXX, PDYY, PDZX, PDZY ! Metric coefficients @@ -589,7 +585,7 @@ END IF TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! and we store in LES configuration @@ -715,7 +711,7 @@ END IF TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! and we store in LES configuration @@ -821,7 +817,7 @@ END IF TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! and we store in LES configuration diff --git a/src/MNH/turb_ver_thermo_flux.f90 b/src/MNH/turb_ver_thermo_flux.f90 index 65dee0384..6c4a71f53 100644 --- a/src/MNH/turb_ver_thermo_flux.f90 +++ b/src/MNH/turb_ver_thermo_flux.f90 @@ -17,7 +17,7 @@ INTERFACE OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM, & PIMPL,PEXPL, & PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PRHODJ,PTHVREF, & PSFTHM,PSFRM,PSFTHP,PSFRP, & @@ -48,8 +48,6 @@ CHARACTER*4, INTENT(IN) :: HTOM ! type of Third Order Mome REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! Double Time Step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ, PDXX, PDYY, PDZX, PDZY ! Metric coefficients @@ -131,7 +129,7 @@ END MODULE MODI_TURB_VER_THERMO_FLUX OCLOSE_OUT,OTURB_FLX,HTURBDIM,HTOM, & PIMPL,PEXPL, & PTSTEP, & - TPFILE,HLUOUT, & + TPFILE, & PDXX,PDYY,PDZZ,PDZX,PDZY,PDIRCOSZW,PZZ, & PRHODJ,PTHVREF, & PSFTHM,PSFRM,PSFTHP,PSFRP, & @@ -381,8 +379,6 @@ CHARACTER*4, INTENT(IN) :: HTOM ! type of Third Order Mome REAL, INTENT(IN) :: PIMPL, PEXPL ! Coef. for temporal disc. REAL, INTENT(IN) :: PTSTEP ! Double Time Step TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! Output file -CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for - ! model n ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDZZ, PDXX, PDYY, PDZX, PDZY ! Metric coefficients @@ -623,7 +619,7 @@ IF ( OTURB_FLX .AND. OCLOSE_OUT ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! Contribution of the conservative temperature flux to the buoyancy flux @@ -800,7 +796,7 @@ IF (KRR /= 0) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! Contribution of the conservative water flux to the Buoyancy flux @@ -881,7 +877,7 @@ IF ( ((OTURB_FLX .AND. OCLOSE_OUT) .OR. LLES_CALL) .AND. (KRRL > 0) ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,HLUOUT,ZFLXZ) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZFLXZ) END IF ! ! and we store in LES configuration this subgrid flux <w'rc'> diff --git a/src/MNH/uv_to_zonal_and_merid.f90 b/src/MNH/uv_to_zonal_and_merid.f90 index afbfcba4c..fd8d80fb0 100644 --- a/src/MNH/uv_to_zonal_and_merid.f90 +++ b/src/MNH/uv_to_zonal_and_merid.f90 @@ -223,8 +223,8 @@ IF(PRESENT(TPFILE)) THEN CALL PRINT_MSG(NVERB_WARNING,'IO','UV_TO_ZONAL_AND_MERID3D','inconsistent values for TZFIELDS(x)%HDIR') END IF ! - CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(1),CLUOUT,ZZC(:,:,:)) - CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(2),CLUOUT,ZMC(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(1),ZZC(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(2),ZMC(:,:,:)) ELSE IF (PRESENT(PZC).AND.PRESENT(PMC)) THEN PZC(:,:,:)=ZZC(:,:,:) PMC(:,:,:)=ZMC(:,:,:) @@ -336,8 +336,8 @@ IF(PRESENT(TPFILE)) THEN CALL PRINT_MSG(NVERB_WARNING,'IO','UV_TO_ZONAL_AND_MERID2D','inconsistent values for TZFIELDS(x)%HDIR') END IF ! - CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(1),CLUOUT,ZZC3D(:,:,1)) - CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(2),CLUOUT,ZMC3D(:,:,1)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(1),ZZC3D(:,:,1)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELDS(2),ZMC3D(:,:,1)) ELSE IF (PRESENT(PZC).AND.PRESENT(PMC)) THEN PZC(:,:)=ZZC3D(:,:,1) PMC(:,:)=ZMC3D(:,:,1) diff --git a/src/MNH/ver_thermo.f90 b/src/MNH/ver_thermo.f90 index a001bda3d..ee2d88296 100644 --- a/src/MNH/ver_thermo.f90 +++ b/src/MNH/ver_thermo.f90 @@ -314,7 +314,7 @@ IF (NVERB>=10) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT0,ZTHV) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTHV) END IF !------------------------------------------------------------------------------- ! diff --git a/src/MNH/write_balloonn.f90 b/src/MNH/write_balloonn.f90 index e66378693..f1b95431b 100644 --- a/src/MNH/write_balloonn.f90 +++ b/src/MNH/write_balloonn.f90 @@ -126,7 +126,7 @@ TZFIELD%CCOMMENT = '' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLAT) +CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLAT) ! TZFIELD%CMNHNAME = TRIM(TPFLYER%TITLE)//'LON' TZFIELD%CSTDNAME = '' @@ -137,7 +137,7 @@ TZFIELD%CCOMMENT = '' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLON) +CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLON) ! TZFIELD%CMNHNAME = TRIM(TPFLYER%TITLE)//'ALT' TZFIELD%CSTDNAME = '' @@ -148,7 +148,7 @@ TZFIELD%CCOMMENT = '' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,TPFLYER%Z_CUR) +CALL IO_WRITE_FIELD(TPFILE,TZFIELD,TPFLYER%Z_CUR) ! TZFIELD%CMNHNAME = TRIM(TPFLYER%TITLE)//'WASCENT' TZFIELD%CSTDNAME = '' @@ -159,7 +159,7 @@ TZFIELD%CCOMMENT = '' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,TPFLYER%WASCENT) +CALL IO_WRITE_FIELD(TPFILE,TZFIELD,TPFLYER%WASCENT) ! TZFIELD%CMNHNAME = TRIM(TPFLYER%TITLE)//'RHO' TZFIELD%CSTDNAME = '' @@ -170,7 +170,7 @@ TZFIELD%CCOMMENT = '' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,TPFLYER%RHO) +CALL IO_WRITE_FIELD(TPFILE,TZFIELD,TPFLYER%RHO) ! ! ! diff --git a/src/MNH/write_budget.f90 b/src/MNH/write_budget.f90 index f6284127d..a3f8f2d00 100644 --- a/src/MNH/write_budget.f90 +++ b/src/MNH/write_budget.f90 @@ -204,7 +204,7 @@ TZFIELD%CCOMMENT = 'Time step' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUT,PTSTEP) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PTSTEP) ! TZFIELD%CMNHNAME = 'BULEN' TZFIELD%CSTDNAME = '' @@ -215,7 +215,7 @@ TZFIELD%CCOMMENT = 'Time step' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUT,XBULEN) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,XBULEN) ! !* 1.1 initialize NBUTSHIFT ! --------------------- @@ -1040,7 +1040,7 @@ SELECT CASE (CBUTYPE) TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 6 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUT,ZWORKMASK(:,:,:,:,:,:)) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,ZWORKMASK(:,:,:,:,:,:)) WRITE(YRECFM,FMT="('MASK_',I4.4)") NBUTSHIFT CALL MENU_DIACHRO(TPDIAFILE,HLUOUT,YRECFM) DEALLOCATE(ZWORKMASK) diff --git a/src/MNH/write_diachro.f90 b/src/MNH/write_diachro.f90 index 31a7b4669..98583d751 100644 --- a/src/MNH/write_diachro.f90 +++ b/src/MNH/write_diachro.f90 @@ -245,7 +245,7 @@ TZFIELD%CCOMMENT = TRIM(YCOMMENT) TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPECHAR TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,HTYPE) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HTYPE) IF (NVERB>=5) THEN WRITE(ILUOUTDIA,*)' 1st record (',TRIM(TZFIELD%CMNHNAME),'): OK' @@ -288,7 +288,7 @@ SELECT CASE(HTYPE) ITABCHAR(29)=IIMASK; ITABCHAR(30)=IJMASK ITABCHAR(31)=IKMASK; ITABCHAR(32)=ITMASK ITABCHAR(33)=INMASK; ITABCHAR(34)=IPMASK - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,ITABCHAR) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,ITABCHAR) DEALLOCATE(ITABCHAR) IF (NVERB>=5) THEN WRITE(ILUOUTDIA,*)' ILENTITRE,ILENUNITE,ILENCOMMENT ',ILENTITRE,ILENUNITE,ILENCOMMENT @@ -309,7 +309,7 @@ SELECT CASE(HTYPE) ITABCHAR(20)=IIMASK; ITABCHAR(21)=IJMASK ITABCHAR(22)=IKMASK; ITABCHAR(23)=ITMASK ITABCHAR(24)=INMASK; ITABCHAR(25)=IPMASK - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,ITABCHAR) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,ITABCHAR) DEALLOCATE(ITABCHAR) END SELECT IF (NVERB>=5) THEN @@ -327,7 +327,7 @@ TZFIELD%CCOMMENT = TRIM(YCOMMENT) TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPECHAR TZFIELD%NDIMS = 1 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,HTITRE(1:IP)) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HTITRE(1:IP)) IF (NVERB>=5) THEN WRITE(ILUOUTDIA,*)' 3rd record (',TRIM(TZFIELD%CMNHNAME),'): OK' @@ -344,7 +344,7 @@ TZFIELD%CCOMMENT = TRIM(YCOMMENT) TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPECHAR TZFIELD%NDIMS = 1 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,HUNITE(1:IP)) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HUNITE(1:IP)) IF (NVERB>=5) THEN WRITE(ILUOUTDIA,*)' 4th record (',TRIM(TZFIELD%CMNHNAME),'): OK' @@ -361,7 +361,7 @@ TZFIELD%CCOMMENT = TRIM(YCOMMENT) TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPECHAR TZFIELD%NDIMS = 1 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,HCOMMENT(1:IP)) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HCOMMENT(1:IP)) IF (NVERB>=5) THEN WRITE(ILUOUTDIA,*)' 5th record (',TRIM(TZFIELD%CMNHNAME),'): OK' @@ -394,7 +394,7 @@ IF (PRESENT(OICP) .AND. PRESENT(OJCP)) THEN TZFIELD%NGRID = KGRID(J) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 5 - CALL IO_WRITE_FIELD_BOX(TPDIAFILE,TZFIELD,HLUOUTDIA,'BUDGET',PVAR(:,:,:,:,:,J), & + CALL IO_WRITE_FIELD_BOX(TPDIAFILE,TZFIELD,'BUDGET',PVAR(:,:,:,:,:,J), & KIL+JPHEXT,KIH+JPHEXT,KJL+JPHEXT,KJH+JPHEXT) ELSE TZFIELD%CMNHNAME = TRIM(HGROUP)//'.'//TRIM(HTITRE(J)) @@ -406,7 +406,7 @@ IF (PRESENT(OICP) .AND. PRESENT(OJCP)) THEN TZFIELD%NGRID = KGRID(J) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 5 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PVAR(:,:,:,:,:,J)) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PVAR(:,:,:,:,:,J)) ENDIF ELSE TZFIELD%CMNHNAME = TRIM(HGROUP)//'.'//TRIM(HTITRE(J)) @@ -418,7 +418,7 @@ ELSE TZFIELD%NGRID = KGRID(J) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 5 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PVAR(:,:,:,:,:,J)) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PVAR(:,:,:,:,:,J)) END IF IF (NVERB>=5) THEN WRITE(ILUOUTDIA,*)J,TRIM(TZFIELD%CMNHNAME) @@ -439,7 +439,7 @@ TZFIELD%CCOMMENT = TRIM(YCOMMENT) TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PTRAJT) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PTRAJT) IF (NVERB>=5) THEN WRITE(ILUOUTDIA,*)' 7th record (',TRIM(TZFIELD%CMNHNAME),'): OK' @@ -460,7 +460,7 @@ IF(PRESENT(PTRAJX))THEN TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PTRAJX) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PTRAJX) ENDIF ! ! ou @@ -475,7 +475,7 @@ IF(PRESENT(PMASK))THEN TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 6 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PMASK) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PMASK) ENDIF ! ! 9eme enregistrement TRAJY @@ -490,7 +490,7 @@ IF(PRESENT(PTRAJY))THEN TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PTRAJY) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PTRAJY) ENDIF ! ! 10eme enregistrement TRAJZ @@ -505,7 +505,7 @@ IF(PRESENT(PTRAJZ))THEN TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PTRAJZ) + CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PTRAJZ) ENDIF ! ! 11eme enregistrement PDATIME @@ -519,7 +519,7 @@ TZFIELD%CCOMMENT = TRIM(YCOMMENT) TZFIELD%NGRID = KGRID(1) TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 -CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,HLUOUTDIA,PDATIME) +CALL IO_WRITE_FIELD(TPDIAFILE,TZFIELD,PDATIME) ! CALL MENU_DIACHRO(TPDIAFILE,HLUOUTDIA,HGROUP) LPACK=GPACK diff --git a/src/MNH/write_dummy_gr_fieldn.f90 b/src/MNH/write_dummy_gr_fieldn.f90 index 39118ad55..6a5f35c96 100644 --- a/src/MNH/write_dummy_gr_fieldn.f90 +++ b/src/MNH/write_dummy_gr_fieldn.f90 @@ -67,7 +67,6 @@ END MODULE MODI_WRITE_DUMMY_GR_FIELD_n ! USE MODD_DUMMY_GR_FIELD_n, ONLY : NDUMMY_GR_NBR, CDUMMY_GR_NAME, & CDUMMY_GR_AREA, XDUMMY_GR_FIELDS -USE MODD_LUNIT_n, ONLY : CLUOUT USE MODE_FIELD, ONLY : TFIELDDATA,TYPEINT,TYPEREAL USE MODD_IO_ll, ONLY : TFILEDATA ! @@ -117,7 +116,7 @@ TZFIELD%CCOMMENT = 'number of dummy pgd fields chosen by user' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,NDUMMY_GR_NBR) +CALL IO_WRITE_FIELD(TPFILE,TZFIELD,NDUMMY_GR_NBR) ! DO JDUMMY=1,NDUMMY_GR_NBR WRITE(YRECFM,'(A8,I3.3,A5)') 'DUMMY_GR',JDUMMY,' ' @@ -136,7 +135,7 @@ DO JDUMMY=1,NDUMMY_GR_NBR ! ZWORK2D(:,:) = XDUMMY_GR_FIELDS(:,:,JDUMMY) ! - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK2D) END DO ! !------------------------------------------------------------------------------- diff --git a/src/MNH/write_hgrid.f90 b/src/MNH/write_hgrid.f90 index 86e9645ff..1ff97d59d 100644 --- a/src/MNH/write_hgrid.f90 +++ b/src/MNH/write_hgrid.f90 @@ -66,10 +66,8 @@ USE MODD_GRID USE MODD_IO_ll, ONLY: TFILEDATA USE MODD_PGDGRID USE MODD_PGDDIM -USE MODD_PARAMETERS ! USE MODI_WRITE_HGRIDn -USE MODE_FM USE MODE_IO_ll USE MODE_FMWRIT ! @@ -83,14 +81,10 @@ TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! File to write ! !* 0.2 declarations of local variables ! -INTEGER :: ILUOUT0 INTEGER :: IRESP -CHARACTER (LEN=100) :: YCOMMENT ! !------------------------------------------------------------------------------- ! -CALL FMLOOK_ll(CLUOUT0,CLUOUT0,ILUOUT0,IRESP) -! !* 1. TEST ON MODEL INDEX ! ------------------- ! KMI may be 0 @@ -110,20 +104,20 @@ END IF !* 2. WRITING FROM MODD_PGD... ! ---------------------- ! -CALL IO_WRITE_FIELD(TPFILE,'LAT0', CLUOUT0,XLAT0) -CALL IO_WRITE_FIELD(TPFILE,'LON0', CLUOUT0,XLON0) -CALL IO_WRITE_FIELD(TPFILE,'RPK', CLUOUT0,XRPK) -CALL IO_WRITE_FIELD(TPFILE,'BETA', CLUOUT0,XBETA) -CALL IO_WRITE_FIELD(TPFILE,'LATORI',CLUOUT0,XPGDLATOR) -CALL IO_WRITE_FIELD(TPFILE,'LONORI',CLUOUT0,XPGDLONOR) -CALL IO_WRITE_FIELD(TPFILE,'IMAX', CLUOUT0,NPGDIMAX) -CALL IO_WRITE_FIELD(TPFILE,'JMAX', CLUOUT0,NPGDJMAX) -CALL IO_WRITE_FIELD(TPFILE,'XHAT', CLUOUT0,XPGDXHAT) -CALL IO_WRITE_FIELD(TPFILE,'YHAT', CLUOUT0,XPGDYHAT) +CALL IO_WRITE_FIELD(TPFILE,'LAT0', XLAT0) +CALL IO_WRITE_FIELD(TPFILE,'LON0', XLON0) +CALL IO_WRITE_FIELD(TPFILE,'RPK', XRPK) +CALL IO_WRITE_FIELD(TPFILE,'BETA', XBETA) +CALL IO_WRITE_FIELD(TPFILE,'LATORI',XPGDLATOR) +CALL IO_WRITE_FIELD(TPFILE,'LONORI',XPGDLONOR) +CALL IO_WRITE_FIELD(TPFILE,'IMAX', NPGDIMAX) +CALL IO_WRITE_FIELD(TPFILE,'JMAX', NPGDJMAX) +CALL IO_WRITE_FIELD(TPFILE,'XHAT', XPGDXHAT) +CALL IO_WRITE_FIELD(TPFILE,'YHAT', XPGDYHAT) ! IF (CSTORAGE_TYPE=='TT') THEN - CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',CLUOUT0,LTHINSHELL) - CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',CLUOUT0,LCARTESIAN) + CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',LTHINSHELL) + CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',LCARTESIAN) END IF !------------------------------------------------------------------------------- ! diff --git a/src/MNH/write_hgridn.f90 b/src/MNH/write_hgridn.f90 index e0bd7cee6..c293c7fa3 100644 --- a/src/MNH/write_hgridn.f90 +++ b/src/MNH/write_hgridn.f90 @@ -54,10 +54,6 @@ END MODULE MODI_WRITE_HGRIDn !! Module MODD_DIM_n : contains domain size !! NIMAX !! NJMAX -!! Module MODD_PARAMETERS : -!! JPHEXT -!! Module MODD_LUNIT_n : -!! CLUOUT !! !! REFERENCE !! --------- @@ -82,10 +78,7 @@ USE MODD_DIM_n USE MODD_GRID USE MODD_GRID_n USE MODD_IO_ll, ONLY: TFILEDATA -USE MODD_LUNIT_n -USE MODD_PARAMETERS ! -USE MODE_FM USE MODE_FMWRIT ! IMPLICIT NONE @@ -97,26 +90,23 @@ TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! File to write ! !* 0.2 declarations of local variables ! -INTEGER :: ILUOUT -INTEGER :: IRESP +! NONE !------------------------------------------------------------------------------- ! -CALL FMLOOK_ll(CLUOUT,CLUOUT,ILUOUT,IRESP) -! -CALL IO_WRITE_FIELD(TPFILE,'LAT0', CLUOUT,XLAT0) -CALL IO_WRITE_FIELD(TPFILE,'LON0', CLUOUT,XLON0) -CALL IO_WRITE_FIELD(TPFILE,'RPK', CLUOUT,XRPK) -CALL IO_WRITE_FIELD(TPFILE,'BETA', CLUOUT,XBETA) -CALL IO_WRITE_FIELD(TPFILE,'LATORI',CLUOUT,XLATORI) -CALL IO_WRITE_FIELD(TPFILE,'LONORI',CLUOUT,XLONORI) -CALL IO_WRITE_FIELD(TPFILE,'IMAX', CLUOUT,NIMAX) -CALL IO_WRITE_FIELD(TPFILE,'JMAX', CLUOUT,NJMAX) -CALL IO_WRITE_FIELD(TPFILE,'XHAT', CLUOUT,XXHAT) -CALL IO_WRITE_FIELD(TPFILE,'YHAT', CLUOUT,XYHAT) +CALL IO_WRITE_FIELD(TPFILE,'LAT0', XLAT0) +CALL IO_WRITE_FIELD(TPFILE,'LON0', XLON0) +CALL IO_WRITE_FIELD(TPFILE,'RPK', XRPK) +CALL IO_WRITE_FIELD(TPFILE,'BETA', XBETA) +CALL IO_WRITE_FIELD(TPFILE,'LATORI',XLATORI) +CALL IO_WRITE_FIELD(TPFILE,'LONORI',XLONORI) +CALL IO_WRITE_FIELD(TPFILE,'IMAX', NIMAX) +CALL IO_WRITE_FIELD(TPFILE,'JMAX', NJMAX) +CALL IO_WRITE_FIELD(TPFILE,'XHAT', XXHAT) +CALL IO_WRITE_FIELD(TPFILE,'YHAT', XYHAT) ! IF (CSTORAGE_TYPE=='TT') THEN - CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',CLUOUT,LTHINSHELL) - CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',CLUOUT,LCARTESIAN) + CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',LTHINSHELL) + CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',LCARTESIAN) END IF !------------------------------------------------------------------------------- ! diff --git a/src/MNH/write_lbn.f90 b/src/MNH/write_lbn.f90 index 3e58191ac..d9495811c 100644 --- a/src/MNH/write_lbn.f90 +++ b/src/MNH/write_lbn.f90 @@ -169,23 +169,23 @@ YFMFILE = TPFILE%CNAME ! 2. WRITE THE DIMENSION OF LB FIELDS ! -------------------------------- ! -CALL IO_WRITE_FIELD(TPFILE,'RIMX',CLUOUT,NRIMX) -CALL IO_WRITE_FIELD(TPFILE,'RIMY',CLUOUT,NRIMY) +CALL IO_WRITE_FIELD(TPFILE,'RIMX',NRIMX) +CALL IO_WRITE_FIELD(TPFILE,'RIMY',NRIMY) ! !* 3. BASIC VARIABLES ! -------------- ! -CALL IO_WRITE_FIELD(TPFILE,'HORELAX_UVWTH',CLUOUT,LHORELAX_UVWTH) +CALL IO_WRITE_FIELD(TPFILE,'HORELAX_UVWTH',LHORELAX_UVWTH) ! !gathering and writing of the LB fields -IF(NSIZELBXU_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXUM', CLUOUT,NSIZELBXU_ll,XLBXUM) -IF(NSIZELBX_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXVM', CLUOUT,NSIZELBX_ll,XLBXVM) -IF(NSIZELBX_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXWM', CLUOUT,NSIZELBX_ll,XLBXWM) -IF(NSIZELBY_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYUM', CLUOUT,NSIZELBY_ll,XLBYUM) -IF(NSIZELBYV_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYVM', CLUOUT,NSIZELBYV_ll,XLBYVM) -IF(NSIZELBY_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYWM', CLUOUT,NSIZELBY_ll,XLBYWM) -IF(NSIZELBX_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXTHM',CLUOUT,NSIZELBX_ll,XLBXTHM) -IF(NSIZELBY_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYTHM',CLUOUT,NSIZELBY_ll,XLBYTHM) +IF(NSIZELBXU_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXUM', NSIZELBXU_ll,XLBXUM) +IF(NSIZELBX_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXVM', NSIZELBX_ll,XLBXVM) +IF(NSIZELBX_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXWM', NSIZELBX_ll,XLBXWM) +IF(NSIZELBY_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYUM', NSIZELBY_ll,XLBYUM) +IF(NSIZELBYV_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYVM', NSIZELBYV_ll,XLBYVM) +IF(NSIZELBY_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYWM', NSIZELBY_ll,XLBYWM) +IF(NSIZELBX_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXTHM',NSIZELBX_ll,XLBXTHM) +IF(NSIZELBY_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYTHM',NSIZELBY_ll,XLBYTHM) ! !* 4 LB-TKE ! ------ @@ -196,10 +196,10 @@ YCOMMENT='' ILENCH=LEN(YCOMMENT) ! IF(CTURB/='NONE') THEN - CALL IO_WRITE_FIELD(TPFILE,'HORELAX_TKE',CLUOUT,LHORELAX_TKE) + CALL IO_WRITE_FIELD(TPFILE,'HORELAX_TKE',LHORELAX_TKE) ! - IF(NSIZELBXTKE_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXTKEM',CLUOUT,NSIZELBXTKE_ll,XLBXTKEM) - IF(NSIZELBYTKE_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYTKEM',CLUOUT,NSIZELBYTKE_ll,XLBYTKEM) + IF(NSIZELBXTKE_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBXTKEM',NSIZELBXTKE_ll,XLBXTKEM) + IF(NSIZELBYTKE_ll /= 0) CALL IO_WRITE_FIELD_LB(TPFILE,'LBYTKEM',NSIZELBYTKE_ll,XLBYTKEM) END IF ! ! @@ -222,7 +222,7 @@ IF (NRR >=1) THEN TZFIELD%NTYPE = TYPELOG TZFIELD%NDIMS = 0 ! - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,GHORELAX_R) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,GHORELAX_R) ! GUSER(:)=(/LUSERV,LUSERC,LUSERR,LUSERI,LUSERS,LUSERG,LUSERH/) YC(:)=(/"V","C","R","I","S","G","H"/) @@ -243,7 +243,7 @@ IF (NRR >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: LBXR'//YC(JRR)//'M' TZFIELD%CLBTYPE = 'LBX' TZFIELD%CCOMMENT = '2_Y_Z_LBXR'//YC(JRR)//'M' - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXR_ll,XLBXRM(:,:,:,IRR)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXR_ll,XLBXRM(:,:,:,IRR)) END IF ! IF(NSIZELBYR_ll /= 0) THEN @@ -251,7 +251,7 @@ IF (NRR >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: LBYR'//YC(JRR)//'M' TZFIELD%CLBTYPE = 'LBY' TZFIELD%CCOMMENT = '2_Y_Z_LBYR'//YC(JRR)//'M' - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXR_ll,XLBYRM(:,:,:,IRR)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXR_ll,XLBYRM(:,:,:,IRR)) END IF END IF END DO @@ -274,7 +274,7 @@ IF (NSV >=1) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPELOG TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,GHORELAX_SV) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,GHORELAX_SV) ! IGRID=1 IRIMX =(NSIZELBXSV_ll-2*JPHEXT)/2 @@ -293,7 +293,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3,A8)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -301,7 +301,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3,A8)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -320,7 +320,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -328,7 +328,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -347,7 +347,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -355,7 +355,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -377,7 +377,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -385,7 +385,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO ! @@ -396,7 +396,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -404,7 +404,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -425,7 +425,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -433,7 +433,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -477,7 +477,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -485,7 +485,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO ! @@ -496,7 +496,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -504,7 +504,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -516,7 +516,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -524,7 +524,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO ! @@ -534,7 +534,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -542,7 +542,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO ! @@ -552,7 +552,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -560,7 +560,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO ! @@ -626,14 +626,14 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3,A8)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) ENDIF !Check on border points in X direction IF(NSIZELBYSV_ll /= 0) THEN TZFIELD%CMNHNAME = 'LBY_'//TRIM(YPDUST_INI(ISV_NAME_IDX)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3,A8)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) ENDIF !Check on points in Y direction ENDDO ! Loop on mode ELSE ! valeur IMOMENTS =/ 1 @@ -649,14 +649,14 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3,A8)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) ENDIF !Check on border points in X direction IF(NSIZELBYSV_ll /= 0) THEN TZFIELD%CMNHNAME = 'LBY_'//TRIM(YPDUST_INI(ISV_NAME_IDX)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3,A8)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) ENDIF !Check on points in Y direction ENDDO ! Loop on moments ENDDO ! Loop on modes @@ -679,7 +679,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -687,7 +687,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO IF (LDEPOS_DST(IMI)) THEN @@ -697,7 +697,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -705,7 +705,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -776,14 +776,14 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) ENDIF !Check on border points in X direction IF(NSIZELBYSV_ll /= 0) THEN TZFIELD%CMNHNAME = 'LBY_'//TRIM(YPSALT_INI(ISV_NAME_IDX)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) ENDIF !Check on points in Y direction ENDDO ! Loop on mode ELSE ! valeur IMOMENTS =/ 1 @@ -799,14 +799,14 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) ENDIF !Check on border points in X direction IF(NSIZELBYSV_ll /= 0) THEN TZFIELD%CMNHNAME = 'LBY_'//TRIM(YPSALT_INI(ISV_NAME_IDX)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) ENDIF !Check on points in Y direction ENDDO ! Loop on moments ENDDO ! Loop on modes @@ -827,7 +827,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -835,7 +835,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO IF (LDEPOS_SLT(IMI)) THEN @@ -845,7 +845,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -853,7 +853,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -875,7 +875,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -883,7 +883,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -902,7 +902,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -910,7 +910,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -929,7 +929,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -937,7 +937,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF @@ -957,7 +957,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBX' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'2_Y_Z_','LBXSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBXSV_ll,XLBXSVM(:,:,:,JSV)) END IF ! IF(NSIZELBYSV_ll /= 0) THEN @@ -965,7 +965,7 @@ IF (NSV >=1) THEN TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CLBTYPE = 'LBY' WRITE(TZFIELD%CCOMMENT,'(A6,A6,I3.3)')'X_2_Z_','LBYSVM',JSV - CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,CLUOUT,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) + CALL IO_WRITE_FIELD_LB(TPFILE,TZFIELD,NSIZELBYSV_ll,XLBYSVM(:,:,:,JSV)) END IF END DO END IF diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90 index 0e35605c8..2db75813f 100644 --- a/src/MNH/write_lfifm1_for_diag.f90 +++ b/src/MNH/write_lfifm1_for_diag.f90 @@ -344,43 +344,43 @@ CALL FMLOOK_ll(CLUOUT0,CLUOUT0,ILUOUT0,IRESP) ! !* 1.0 TPFILE%CNAME and HDADFILE : ! -CALL IO_WRITE_FIELD(TPFILE,'MASDEV', CLUOUT,NMASDEV) -CALL IO_WRITE_FIELD(TPFILE,'BUGFIX', CLUOUT,NBUGFIX) -CALL IO_WRITE_FIELD(TPFILE,'BIBUSER', CLUOUT,CBIBUSER) -CALL IO_WRITE_FIELD(TPFILE,'PROGRAM', CLUOUT,CPROGRAM) +CALL IO_WRITE_FIELD(TPFILE,'MASDEV', NMASDEV) +CALL IO_WRITE_FIELD(TPFILE,'BUGFIX', NBUGFIX) +CALL IO_WRITE_FIELD(TPFILE,'BIBUSER', CBIBUSER) +CALL IO_WRITE_FIELD(TPFILE,'PROGRAM', CPROGRAM) ! -CALL IO_WRITE_FIELD(TPFILE,'L1D', CLUOUT,L1D) -CALL IO_WRITE_FIELD(TPFILE,'L2D', CLUOUT,L2D) -CALL IO_WRITE_FIELD(TPFILE,'PACK', CLUOUT,LPACK) +CALL IO_WRITE_FIELD(TPFILE,'L1D', L1D) +CALL IO_WRITE_FIELD(TPFILE,'L2D', L2D) +CALL IO_WRITE_FIELD(TPFILE,'PACK', LPACK) ! -CALL IO_WRITE_FIELD(TPFILE,'MY_NAME', CLUOUT,TPFILE%CNAME) -CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME', CLUOUT,HDADFILE) +CALL IO_WRITE_FIELD(TPFILE,'MY_NAME', TPFILE%CNAME) +CALL IO_WRITE_FIELD(TPFILE,'DAD_NAME', HDADFILE) ! IF (LEN_TRIM(HDADFILE)>0) THEN - CALL IO_WRITE_FIELD(TPFILE,'DXRATIO',CLUOUT,NDXRATIO_ALL(1)) - CALL IO_WRITE_FIELD(TPFILE,'DYRATIO',CLUOUT,NDYRATIO_ALL(1)) - CALL IO_WRITE_FIELD(TPFILE,'XOR', CLUOUT,NXOR_ALL(1)) - CALL IO_WRITE_FIELD(TPFILE,'YOR', CLUOUT,NYOR_ALL(1)) + CALL IO_WRITE_FIELD(TPFILE,'DXRATIO',NDXRATIO_ALL(1)) + CALL IO_WRITE_FIELD(TPFILE,'DYRATIO',NDYRATIO_ALL(1)) + CALL IO_WRITE_FIELD(TPFILE,'XOR', NXOR_ALL(1)) + CALL IO_WRITE_FIELD(TPFILE,'YOR', NYOR_ALL(1)) END IF ! -CALL IO_WRITE_FIELD(TPFILE,'SURF', CLUOUT,CSURF) +CALL IO_WRITE_FIELD(TPFILE,'SURF', CSURF) ! !* 1.1 Type and Dimensions : ! -CALL IO_WRITE_FIELD(TPFILE,'STORAGE_TYPE',CLUOUT,'DI') +CALL IO_WRITE_FIELD(TPFILE,'STORAGE_TYPE','DI') ! -CALL IO_WRITE_FIELD(TPFILE,'IMAX',CLUOUT,NIMAX_ll) -CALL IO_WRITE_FIELD(TPFILE,'JMAX',CLUOUT,NJMAX_ll) -CALL IO_WRITE_FIELD(TPFILE,'KMAX',CLUOUT,NKMAX) +CALL IO_WRITE_FIELD(TPFILE,'IMAX',NIMAX_ll) +CALL IO_WRITE_FIELD(TPFILE,'JMAX',NJMAX_ll) +CALL IO_WRITE_FIELD(TPFILE,'KMAX',NKMAX) ! -CALL IO_WRITE_FIELD(TPFILE,'JPHEXT',CLUOUT,JPHEXT) +CALL IO_WRITE_FIELD(TPFILE,'JPHEXT',JPHEXT) ! !* 1.2 Grid variables : ! IF (.NOT.LCARTESIAN) THEN - CALL IO_WRITE_FIELD(TPFILE,'RPK', CLUOUT,XRPK) - CALL IO_WRITE_FIELD(TPFILE,'LONORI',CLUOUT,XLONORI) - CALL IO_WRITE_FIELD(TPFILE,'LATORI',CLUOUT,XLATORI) + CALL IO_WRITE_FIELD(TPFILE,'RPK', XRPK) + CALL IO_WRITE_FIELD(TPFILE,'LONORI',XLONORI) + CALL IO_WRITE_FIELD(TPFILE,'LATORI',XLATORI) ! !* diagnostic of 1st mass point ! @@ -402,43 +402,43 @@ IF (.NOT.LCARTESIAN) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLONOR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLONOR) ! TZFIELD%CMNHNAME = 'LATOR' TZFIELD%CLONGNAME = 'MesoNH: LATOR' TZFIELD%CCOMMENT = 'Latitude of 1st mass point' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLATOR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLATOR) ! END IF ! -CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',CLUOUT,LTHINSHELL) -CALL IO_WRITE_FIELD(TPFILE,'LAT0',CLUOUT,XLAT0) -CALL IO_WRITE_FIELD(TPFILE,'LON0',CLUOUT,XLON0) -CALL IO_WRITE_FIELD(TPFILE,'BETA',CLUOUT,XBETA) +CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',LTHINSHELL) +CALL IO_WRITE_FIELD(TPFILE,'LAT0',XLAT0) +CALL IO_WRITE_FIELD(TPFILE,'LON0',XLON0) +CALL IO_WRITE_FIELD(TPFILE,'BETA',XBETA) ! -CALL IO_WRITE_FIELD(TPFILE,'XHAT',CLUOUT,XXHAT) -CALL IO_WRITE_FIELD(TPFILE,'YHAT',CLUOUT,XYHAT) -CALL IO_WRITE_FIELD(TPFILE,'ZHAT',CLUOUT,XZHAT) +CALL IO_WRITE_FIELD(TPFILE,'XHAT',XXHAT) +CALL IO_WRITE_FIELD(TPFILE,'YHAT',XYHAT) +CALL IO_WRITE_FIELD(TPFILE,'ZHAT',XZHAT) ! -CALL IO_WRITE_FIELD(TPFILE,'ZS', CLUOUT,XZS) -CALL IO_WRITE_FIELD(TPFILE,'ZSMT', CLUOUT,XZSMT) -CALL IO_WRITE_FIELD(TPFILE,'SLEVE',CLUOUT,LSLEVE) +CALL IO_WRITE_FIELD(TPFILE,'ZS', XZS) +CALL IO_WRITE_FIELD(TPFILE,'ZSMT', XZSMT) +CALL IO_WRITE_FIELD(TPFILE,'SLEVE',LSLEVE) ! IF (LSLEVE) THEN - CALL IO_WRITE_FIELD(TPFILE,'LEN1',CLUOUT,XLEN1) - CALL IO_WRITE_FIELD(TPFILE,'LEN2',CLUOUT,XLEN2) + CALL IO_WRITE_FIELD(TPFILE,'LEN1',XLEN1) + CALL IO_WRITE_FIELD(TPFILE,'LEN2',XLEN2) END IF ! ! -CALL IO_WRITE_FIELD(TPFILE,'DTMOD',CLUOUT,TDTMOD) -CALL IO_WRITE_FIELD(TPFILE,'DTCUR',CLUOUT,TDTCUR) -CALL IO_WRITE_FIELD(TPFILE,'DTEXP',CLUOUT,TDTEXP) -CALL IO_WRITE_FIELD(TPFILE,'DTSEG',CLUOUT,TDTSEG) +CALL IO_WRITE_FIELD(TPFILE,'DTMOD',TDTMOD) +CALL IO_WRITE_FIELD(TPFILE,'DTCUR',TDTCUR) +CALL IO_WRITE_FIELD(TPFILE,'DTEXP',TDTEXP) +CALL IO_WRITE_FIELD(TPFILE,'DTSEG',TDTSEG) ! !* 1.3 Configuration variables : ! -CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',CLUOUT,LCARTESIAN) -CALL IO_WRITE_FIELD(TPFILE,'LBOUSS', CLUOUT,LBOUSS) +CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',LCARTESIAN) +CALL IO_WRITE_FIELD(TPFILE,'LBOUSS', LBOUSS) ! IF (LCARTESIAN .AND. LWIND_ZM) THEN LWIND_ZM=.FALSE. @@ -446,12 +446,12 @@ IF (LCARTESIAN .AND. LWIND_ZM) THEN END IF !* 1.4 Reference state variables : ! -CALL IO_WRITE_FIELD(TPFILE,'RHOREFZ',CLUOUT,XRHODREFZ) -CALL IO_WRITE_FIELD(TPFILE,'THVREFZ',CLUOUT,XTHVREFZ) -CALL IO_WRITE_FIELD(TPFILE,'EXNTOP', CLUOUT,XEXNTOP) +CALL IO_WRITE_FIELD(TPFILE,'RHOREFZ',XRHODREFZ) +CALL IO_WRITE_FIELD(TPFILE,'THVREFZ',XTHVREFZ) +CALL IO_WRITE_FIELD(TPFILE,'EXNTOP', XEXNTOP) ! -CALL IO_WRITE_FIELD(TPFILE,'RHODREF',CLUOUT,XRHODREF) -CALL IO_WRITE_FIELD(TPFILE,'THVREF', CLUOUT,XTHVREF) +CALL IO_WRITE_FIELD(TPFILE,'RHODREF',XRHODREF) +CALL IO_WRITE_FIELD(TPFILE,'THVREF', XTHVREF) ! ! !* 1.5 Variables necessary for plots @@ -460,11 +460,11 @@ CALL IO_WRITE_FIELD(TPFILE,'THVREF', CLUOUT,XTHVREF) ! level or constant theta level or constant PV level ! IF (INDEX(CISO,'PR') /= 0) THEN - CALL IO_WRITE_FIELD(TPFILE,'PABST',CLUOUT,XPABST) + CALL IO_WRITE_FIELD(TPFILE,'PABST',XPABST) END IF ! IF (INDEX(CISO,'TK') /= 0) THEN - CALL IO_WRITE_FIELD(TPFILE,'THT',CLUOUT,XTHT) + CALL IO_WRITE_FIELD(TPFILE,'THT',XTHT) END IF ! ZCORIOZ(:,:,:)=SPREAD( XCORIOZ(:,:),DIM=3,NCOPIES=IKU ) @@ -494,13 +494,13 @@ IF (INDEX(CISO,'EV') /= 0) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPOVO) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPOVO) END IF ! ! IF (LVAR_RS) THEN - CALL IO_WRITE_FIELD(TPFILE,'UT',CLUOUT,XUT) - CALL IO_WRITE_FIELD(TPFILE,'VT',CLUOUT,XVT) + CALL IO_WRITE_FIELD(TPFILE,'UT',XUT) + CALL IO_WRITE_FIELD(TPFILE,'VT',XVT) ! IF (LWIND_ZM) THEN TZFIELD2(1)%CMNHNAME = 'UM_ZM' @@ -526,20 +526,20 @@ IF (LVAR_RS) THEN CALL UV_TO_ZONAL_AND_MERID(XUT,XVT,23,TPFILE=TPFILE,TZFIELDS=TZFIELD2) END IF ! - CALL IO_WRITE_FIELD(TPFILE,'WT',CLUOUT,XWT) + CALL IO_WRITE_FIELD(TPFILE,'WT',XWT) ! ! write mixing ratio for water vapor required to plot radio-soundings ! IF (LUSERV) THEN - CALL IO_WRITE_FIELD(TPFILE,'RVT',CLUOUT,XRT(:,:,:,IDX_RVT)) + CALL IO_WRITE_FIELD(TPFILE,'RVT',XRT(:,:,:,IDX_RVT)) END IF END IF ! !* Latitude and Longitude arrays ! IF (.NOT.LCARTESIAN) THEN - CALL IO_WRITE_FIELD(TPFILE,'LAT',CLUOUT,XLAT) - CALL IO_WRITE_FIELD(TPFILE,'LON',CLUOUT,XLON) + CALL IO_WRITE_FIELD(TPFILE,'LAT',XLAT) + CALL IO_WRITE_FIELD(TPFILE,'LON',XLON) END IF ! ! @@ -551,15 +551,15 @@ ZTEMP(:,:,:)=XTHT(:,:,:)*(XPABST(:,:,:)/ XP00) **(XRD/XCPD) ! IF (LVAR_TURB) THEN IF (CTURB /= 'NONE') THEN - CALL IO_WRITE_FIELD(TPFILE,'TKET',CLUOUT,XTKET) + CALL IO_WRITE_FIELD(TPFILE,'TKET',XTKET) ! IF( NRR > 1 ) THEN - CALL IO_WRITE_FIELD(TPFILE,'SRCT',CLUOUT,XSRCT) - CALL IO_WRITE_FIELD(TPFILE,'SIGS',CLUOUT,XSIGS) + CALL IO_WRITE_FIELD(TPFILE,'SRCT',XSRCT) + CALL IO_WRITE_FIELD(TPFILE,'SIGS',XSIGS) END IF ! IF(CTOM=='TM06') THEN - CALL IO_WRITE_FIELD(TPFILE,'BL_DEPTH',CLUOUT,XBL_DEPTH) + CALL IO_WRITE_FIELD(TPFILE,'BL_DEPTH',XBL_DEPTH) END IF END IF END IF @@ -573,15 +573,15 @@ IF (LVAR_PR .AND. LUSERR .AND. SIZE(XINPRR)>0 ) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRR',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRR*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRR*3.6E6) ! - CALL IO_WRITE_FIELD(TPFILE,'INPRR3D',CLUOUT,XINPRR3D) - CALL IO_WRITE_FIELD(TPFILE,'EVAP3D', CLUOUT,XEVAP3D) + CALL IO_WRITE_FIELD(TPFILE,'INPRR3D',XINPRR3D) + CALL IO_WRITE_FIELD(TPFILE,'EVAP3D', XEVAP3D) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRR',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRR*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRR*1.0E3) ! IF (CCLOUD(1:3) == 'ICE' .OR. CCLOUD == 'C2R2' .OR. CCLOUD == 'C3R5' .OR.& CCLOUD == 'KHKO' .OR. CCLOUD == 'LIMA') THEN @@ -589,56 +589,56 @@ IF (LVAR_PR .AND. LUSERR .AND. SIZE(XINPRR)>0 ) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRC',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRC*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRC*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRC',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRC*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRC*1.0E3) END IF IF (SIZE(XINDEP) /= 0 ) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INDEP',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINDEP*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINDEP*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACDEP',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACDEP*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACDEP*1.0E3) END IF END IF IF (CCLOUD(1:3) == 'ICE' .OR. CCLOUD == 'C3R5' .OR. CCLOUD == 'LIMA') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRS',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRS*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRS*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRS',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRS*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRS*1.0E3) ! CALL FIND_FIELD_ID_FROM_MNHNAME('INPRG',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRG*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRG*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRG',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRG*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRG*1.0E3) ! IF (SIZE(XINPRH) /= 0 ) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRH',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRH*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRH*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRH',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRH*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRH*1.0E3) ENDIF ! ZWORK21(:,:) = XINPRR(:,:) + XINPRS(:,:) + XINPRG(:,:) @@ -649,7 +649,7 @@ IF (LVAR_PR .AND. LUSERR .AND. SIZE(XINPRR)>0 ) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRT',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21*3.6E6) ! ZWORK21(:,:) = (XACPRR(:,:) + XACPRS(:,:) + XACPRG(:,:))*1.0E3 IF (SIZE(XINPRC) /= 0 ) & @@ -660,7 +660,7 @@ IF (LVAR_PR .AND. LUSERR .AND. SIZE(XINPRR)>0 ) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRT',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21*1.0E3) ! END IF ! @@ -670,17 +670,17 @@ IF (LVAR_PR .AND. LUSERR .AND. SIZE(XINPRR)>0 ) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('PRCONV',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPRCONV*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPRCONV*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('PACCONV',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPACCONV*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPACCONV*1.0E3) ! CALL FIND_FIELD_ID_FROM_MNHNAME('PRSCONV',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPRSCONV*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPRSCONV*3.6E6) END IF END IF IF (LVAR_PR ) THEN @@ -717,7 +717,7 @@ IF (LVAR_PR ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) ENDIF ! ! @@ -795,7 +795,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! TZFIELD%CMNHNAME = 'VM90' TZFIELD%CSTDNAME = '' @@ -806,7 +806,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! composantes U et V du flux d'humidit� int�gr� sur 3000 metres TZFIELD%CMNHNAME = 'UM91' TZFIELD%CSTDNAME = '' @@ -817,7 +817,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ! TZFIELD%CMNHNAME = 'VM91' TZFIELD%CSTDNAME = '' @@ -828,7 +828,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) ! ! Convergence d'humidit� TZFIELD%CMNHNAME = 'HMCONV' @@ -840,7 +840,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,-ZWORK35) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,-ZWORK35) ! ! Convergence d'humidit� int�gr� sur 3000 m�tres TZFIELD%CMNHNAME = 'HMCONV3000' @@ -852,7 +852,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,-ZWORK25) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,-ZWORK25) ! IF (CCLOUD(1:3) == 'ICE' .OR. CCLOUD == 'LIMA') THEN ! composantes U et V du flux surfacique d'hydrom�t�ores @@ -865,7 +865,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK33) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK33) ! TZFIELD%CMNHNAME = 'VM92' TZFIELD%CSTDNAME = '' @@ -876,7 +876,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK34) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK34) ! composantes U et V du flux d'hydrom�t�ores int�gr� sur 3000 metres TZFIELD%CMNHNAME = 'UM93' TZFIELD%CSTDNAME = '' @@ -887,7 +887,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK23) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK23) ! TZFIELD%CMNHNAME = 'VM93' TZFIELD%CSTDNAME = '' @@ -898,7 +898,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK24) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK24) ! Convergence d'hydrom�t�ores TZFIELD%CMNHNAME = 'HMCONV_TT' TZFIELD%CSTDNAME = '' @@ -909,7 +909,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,-ZWORK36) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,-ZWORK36) ! Convergence d'hydrom�t�ores int�gr� sur 3000 m�tres TZFIELD%CMNHNAME = 'HMCONV3000_TT' TZFIELD%CSTDNAME = '' @@ -920,7 +920,7 @@ IF (LHU_FLX) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,-ZWORK26) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,-ZWORK26) ENDIF ENDIF ! @@ -939,43 +939,43 @@ IF (LVAR_MRW .OR. LLIMA_DIAG) THEN TZFIELD%CLONGNAME = 'MesoNH: MRV' TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Z_MRV' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RVT)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RVT)*1.E3) END IF IF (LUSERC) THEN TZFIELD%CMNHNAME = 'MRC' TZFIELD%CLONGNAME = 'MesoNH: MRC' TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Z_MRC' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RCT)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RCT)*1.E3) ! TZFIELD%CMNHNAME = 'VRC' TZFIELD%CLONGNAME = 'MesoNH: VRC' TZFIELD%CUNITS = '' !vol/vol TZFIELD%CCOMMENT = 'X_Y_Z_VRC (vol/vol)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RCT)*XRHODREF(:,:,:)/1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RCT)*XRHODREF(:,:,:)/1.E3) END IF IF (LUSERR) THEN TZFIELD%CMNHNAME = 'MRR' TZFIELD%CLONGNAME = 'MesoNH: MRR' TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Z_MRR' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RRT)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RRT)*1.E3) ! TZFIELD%CMNHNAME = 'VRR' TZFIELD%CLONGNAME = 'MesoNH: VRR' TZFIELD%CUNITS = '' !vol/vol TZFIELD%CCOMMENT = 'X_Y_Z_VRR (vol/vol)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RRT)*XRHODREF(:,:,:)/1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RRT)*XRHODREF(:,:,:)/1.E3) END IF IF (LUSERI) THEN TZFIELD%CMNHNAME = 'MRI' TZFIELD%CLONGNAME = 'MesoNH: MRI' TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Z_MRI' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RIT)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RIT)*1.E3) ! IF (LUSECI) THEN - CALL IO_WRITE_FIELD(TPFILE,'CIT',CLUOUT,XCIT(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,'CIT',XCIT(:,:,:)) END IF END IF IF (LUSERS) THEN @@ -983,21 +983,21 @@ IF (LVAR_MRW .OR. LLIMA_DIAG) THEN TZFIELD%CLONGNAME = 'MesoNH: MRS' TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Z_MRS' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RST)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RST)*1.E3) END IF IF (LUSERG) THEN TZFIELD%CMNHNAME = 'MRG' TZFIELD%CLONGNAME = 'MesoNH: MRG' TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Z_MRG' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RGT)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RGT)*1.E3) END IF IF (LUSERH) THEN TZFIELD%CMNHNAME = 'MRH' TZFIELD%CLONGNAME = 'MesoNH: MRH' TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Z_MRH' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRT(:,:,:,IDX_RHT)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRT(:,:,:,IDX_RHT)*1.E3) END IF END IF END IF @@ -1018,7 +1018,7 @@ IF (LVAR_MRSV) THEN WRITE(TZFIELD%CMNHNAME,'(A4,I3.3)')'MRSV',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A4,I3.3)')'X_Y_Z_','MRSV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)*1.E3) END DO END IF ! microphysical C2R2 scheme scalar variables @@ -1041,7 +1041,7 @@ IF(LVAR_MRW) THEN ZWORK31(:,:,:)=XSVT(:,:,:,JSV)*1.E-3 END IF WRITE(TZFIELD%CCOMMENT,'(A6,A4,I3.3)')'X_Y_Z_','MRSV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END DO END IF ! microphysical C3R5 scheme additional scalar variables @@ -1057,7 +1057,7 @@ IF(LVAR_MRW) THEN TZFIELD%CMNHNAME = TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)*1.E-3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)*1.E-3) END DO END IF END IF @@ -1129,7 +1129,7 @@ IF (LLIMA_DIAG) THEN ! TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) ZWORK31(:,:,:)=XSVT(:,:,:,JSV)*1.E-6*XRHODREF(:,:,:) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END DO ! IF (LUSERC) THEN @@ -1143,7 +1143,7 @@ IF (LLIMA_DIAG) THEN TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 ZWORK31(:,:,:)=XRT(:,:,:,2)*1.E3*XRHODREF(:,:,:) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF ! IF (LUSERI) THEN @@ -1157,7 +1157,7 @@ IF (LLIMA_DIAG) THEN TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 ZWORK31(:,:,:)=XRT(:,:,:,4)*1.E3*XRHODREF(:,:,:) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF ! END IF @@ -1174,7 +1174,7 @@ IF (LCHEMDIAG) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)*1.E9) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)*1.E9) END DO END IF IF (LCHAQDIAG) THEN !aqueous concentration in M @@ -1194,7 +1194,7 @@ IF (LCHAQDIAG) THEN !aqueous concentration in M WHERE(((XRT(:,:,:,2)*XRHODREF(:,:,:))/1.e3) .GE. XRTMIN_AQ) ZWORK31(:,:,:)=(XSVT(:,:,:,JSV)*1000.)/(XMD*1.E+3*XRT(:,:,:,2)) ENDWHERE - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END DO ! ZWORK31(:,:,:)=0. @@ -1205,7 +1205,7 @@ IF (LCHAQDIAG) THEN !aqueous concentration in M WHERE(((XRT(:,:,:,3)*XRHODREF(:,:,:))/1.e3) .GE. XRTMIN_AQ) ZWORK31(:,:,:)=(XSVT(:,:,:,JSV)*1000.)/(XMD*1.E+3*XRT(:,:,:,3)) ENDWHERE - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END DO ! ZWORK31(:,:,:)=0. ! DO JSV = NSV_CHICBEG,NSV_CHICEND ! ice phase @@ -1215,7 +1215,7 @@ IF (LCHAQDIAG) THEN !aqueous concentration in M ! WHERE(((XRT(:,:,:,3)*XRHODREF(:,:,:))/1.e3) .GE. XRTMIN_AQ) ! ZWORK31(:,:,:)=(XSVT(:,:,:,JSV)*1000.)/(XMD*1.E+3*XRT(:,:,:,3)) ! ENDWHERE -! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) +! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! END DO END IF @@ -1244,7 +1244,7 @@ IF (LPASPOL) THEN WRITE(TZFIELD%CMNHNAME,'(A3,I3.3)')'PPT',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZTMP) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTMP) END DO DEALLOCATE(ZTMP) DEALLOCATE(ZRHOT) @@ -1262,7 +1262,7 @@ IF (LCONDSAMP) THEN WRITE(TZFIELD%CMNHNAME,'(A3,I3.3)')'CST',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) END DO END IF @@ -1281,7 +1281,7 @@ IF (LTRAJ) THEN TZFIELD%CMNHNAME = TRIM(CLGNAMES(JSV-NSV_LGBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A20,I3.3,A4)')'X_Y_Z_','Lagrangian variable ',JSV,' (M)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) END DO ! X coordinate DO JK=1,IKU @@ -1295,7 +1295,7 @@ IF (LTRAJ) THEN TZFIELD%CMNHNAME = 'X' TZFIELD%CLONGNAME = 'MesoNH: X' TZFIELD%CCOMMENT = 'X_Y_Z_X coordinate' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! Y coordinate DO JK=1,IKU DO JI=1,IIU @@ -1308,7 +1308,7 @@ IF (LTRAJ) THEN TZFIELD%CMNHNAME = 'Y' TZFIELD%CLONGNAME = 'MesoNH: Y' TZFIELD%CCOMMENT = 'X_Y_Z_Y coordinate' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF ! linox scalar variables IF (.NOT.(LUSECHEM .OR. LCHEMDIAG) .AND. LCH_CONV_LINOX) THEN @@ -1322,7 +1322,7 @@ IF (.NOT.(LUSECHEM .OR. LCHEMDIAG) .AND. LCH_CONV_LINOX) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)*1.E9) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)*1.E9) END DO END IF IF (LELECDIAG .AND. CELEC .NE. "NONE") THEN @@ -1343,7 +1343,7 @@ IF (LELECDIAG .AND. CELEC .NE. "NONE") THEN WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (nb ions/m3)' END IF ZWORK31(:,:,:)=XSVT(:,:,:,JSV) * XRHODREF(:,:,:) ! C/kg --> C/m3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END DO END IF ! Sea Salt variables @@ -1366,7 +1366,7 @@ IF (LSALT) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CSALTNAMES(JSV-NSV_SLTBEG+1)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A4,I3.3)')'X_Y_Z_','SALT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)*1.E9) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)*1.E9) END DO ! CALL PPP2SALT(XSVT(:,:,:,NSV_SLTBEG:NSV_SLTEND),XRHODREF,& @@ -1383,26 +1383,26 @@ IF (LSALT) THEN TZFIELD%CLONGNAME = 'MesoNH: SLTRGA' TZFIELD%CUNITS = 'um' WRITE(TZFIELD%CCOMMENT,'(A18,I1)')'RG (nb) SALT MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZRG_SLT(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZRG_SLT(:,:,:,JJ)) ! TZFIELD%CMNHNAME = 'SLTRGAM' TZFIELD%CLONGNAME = 'MesoNH: SLTRGAM' TZFIELD%CUNITS = 'um' WRITE(TZFIELD%CCOMMENT,'(A17,I1)')'RG (m) SALT MODE ',JJ ZWORK31(:,:,:)=ZRG_SLT(:,:,:,JJ) / (EXP(-3.*(LOG(ZSIG_SLT(:,:,:,JJ)))**2)) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! WRITE(TZFIELD%CMNHNAME,'(A6,I1)')'SLTN0A',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'm-3' WRITE(TZFIELD%CCOMMENT,'(A13,I1)')'N0 SALT MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZN0_SLT(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZN0_SLT(:,:,:,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A7,I1)')'SLTSIGA',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = '1' WRITE(TZFIELD%CCOMMENT,'(A16,I1)')'SIGMA SALT MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZSIG_SLT(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSIG_SLT(:,:,:,JJ)) !SALT MASS CONCENTRATION WRITE(TZFIELD%CMNHNAME,'(A4,I1)')'SLTMSS',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1411,7 +1411,7 @@ IF (LSALT) THEN ZWORK31(:,:,:)= ZN0_SLT(:,:,:,JJ)*4./3.*3.14*2500.*1e9 & !kg-->ug * (ZRG_SLT(:,:,:,JJ)**3)*1.d-18 & !um-->m * exp(4.5*log(ZSIG_SLT(:,:,:,JJ))*log(ZSIG_SLT(:,:,:,JJ))) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) !SALT BURDEN (g/m2) ZWORK21(:,:)=0.0 DO JK=IKB,IKE @@ -1430,7 +1430,7 @@ IF (LSALT) THEN TZFIELD%CUNITS = 'g m-2' WRITE(TZFIELD%CCOMMENT,'(A6,I1)')'BURDEN',JJ TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ! TZFIELD%NDIMS = 3 ENDDO @@ -1450,7 +1450,7 @@ IF (LSALT.AND.LDEPOS_SLT(IMI)) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CDESLTNAMES(JSV)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A4,I3.3)')'X_Y_Z_','SALTDEP',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZSSLTDEP(:,:,:,JSV)*1.E9) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSSLTDEP(:,:,:,JSV)*1.E9) END DO ! DO JJ=1,NMODE_SLT @@ -1480,7 +1480,7 @@ IF (LSALT.AND.LDEPOS_SLT(IMI)) THEN * XAVOGADRO & !==>#/mole / XMD & !==>#/kg_{air} * XRHODREF(:,:,:) !==>#/m3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! CLOUD: DUST MASS CONCENTRATION WRITE(TZFIELD%CMNHNAME,'(A9,I1)')'SLTDEPMSS',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1489,7 +1489,7 @@ IF (LSALT.AND.LDEPOS_SLT(IMI)) THEN ZWORK31(:,:,:)= ZWORK31(:,:,:)*4./3.*3.14*2500.*1e9 & !kg-->ug * (ZRG_SLT(:,:,:,JJ)**3)*1.d-18 & !um-->m * exp(4.5*log(ZSIG_SLT(:,:,:,JJ))*log(ZSIG_SLT(:,:,:,JJ))) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! FOR RAIN DROPS WRITE(TZFIELD%CMNHNAME,'(A9,I1)')'SLTDEPN0A',JJ+NMODE_SLT TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1516,7 +1516,7 @@ IF (LSALT.AND.LDEPOS_SLT(IMI)) THEN * XAVOGADRO & !==>#/mole / XMD & !==>#/kg_{air} * XRHODREF(:,:,:) !==>#/m3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! RAIN: DUST MASS CONCENTRATION WRITE(TZFIELD%CMNHNAME,'(A9,I1)')'SLTDEPMSS',JJ+NMODE_SLT TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1525,7 +1525,7 @@ IF (LSALT.AND.LDEPOS_SLT(IMI)) THEN ZWORK31(:,:,:)= ZWORK31(:,:,:)*4./3.*3.14*2500.*1e9 & !kg-->ug * (ZRG_SLT(:,:,:,JJ)**3)*1.d-18 & !um-->m * exp(4.5*log(ZSIG_SLT(:,:,:,JJ))*log(ZSIG_SLT(:,:,:,JJ))) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END DO ! END IF @@ -1549,7 +1549,7 @@ IF (LDUST) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CDUSTNAMES(JSV-NSV_DSTBEG+1)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A4,I3.3)')'X_Y_Z_','DUST',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)*1.E9) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)*1.E9) END DO ! CALL PPP2DUST(XSVT(:,:,:,NSV_DSTBEG:NSV_DSTEND),XRHODREF,& @@ -1559,26 +1559,26 @@ IF (LDUST) THEN TZFIELD%CLONGNAME = 'MesoNH: DSTRGA' TZFIELD%CUNITS = 'um' WRITE(TZFIELD%CCOMMENT,'(A18,I1)')'RG (nb) DUST MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZRG_DST(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZRG_DST(:,:,:,JJ)) ! TZFIELD%CMNHNAME = 'DSTRGAM' TZFIELD%CLONGNAME = 'MesoNH: DSTRGAM' TZFIELD%CUNITS = 'um' WRITE(TZFIELD%CCOMMENT,'(A17,I1)')'RG (m) DUST MODE ',JJ ZWORK31(:,:,:)=ZRG_DST(:,:,:,JJ) / (EXP(-3.*(LOG(ZSIG_DST(:,:,:,JJ)))**2)) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! WRITE(TZFIELD%CMNHNAME,'(A6,I1)')'DSTN0A',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'm-3' WRITE(TZFIELD%CCOMMENT,'(A13,I1)')'N0 DUST MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZN0_DST(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZN0_DST(:,:,:,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A7,I1)')'DSTSIGA',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = '1' WRITE(TZFIELD%CCOMMENT,'(A16,I1)')'SIGMA DUST MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZSIG_DST(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSIG_DST(:,:,:,JJ)) !DUST MASS CONCENTRATION WRITE(TZFIELD%CMNHNAME,'(A4,I1)')'DSTMSS',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1587,7 +1587,7 @@ IF (LDUST) THEN ZWORK31(:,:,:)= ZN0_DST(:,:,:,JJ)*4./3.*3.14*2500.*1e9 & !kg-->ug * (ZRG_DST(:,:,:,JJ)**3)*1.d-18 & !um-->m * exp(4.5*log(ZSIG_DST(:,:,:,JJ))*log(ZSIG_DST(:,:,:,JJ))) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) !DUST BURDEN (g/m2) ZWORK21(:,:)=0.0 DO JK=IKB,IKE @@ -1606,7 +1606,7 @@ IF (LDUST) THEN TZFIELD%CUNITS = 'g m-2' WRITE(TZFIELD%CCOMMENT,'(A6,I1)')'BURDEN',JJ TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ! TZFIELD%NDIMS = 3 ENDDO @@ -1626,7 +1626,7 @@ IF (LDUST.AND.LDEPOS_DST(IMI)) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CDEDSTNAMES(JSV)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A4,I3.3)')'X_Y_Z_','DUSTDEP',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZSDSTDEP(:,:,:,JSV)*1.E9) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZSDSTDEP(:,:,:,JSV)*1.E9) END DO ! DO JJ=1,NMODE_DST @@ -1656,7 +1656,7 @@ IF (LDUST.AND.LDEPOS_DST(IMI)) THEN * XAVOGADRO & !==>#/mole / XMD & !==>#/kg_{air} * XRHODREF(:,:,:) !==>#/m3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! CLOUD: DUST MASS CONCENTRATION WRITE(TZFIELD%CMNHNAME,'(A9,I1)')'DSTDEPMSS',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1665,7 +1665,7 @@ IF (LDUST.AND.LDEPOS_DST(IMI)) THEN ZWORK31(:,:,:)= ZWORK31(:,:,:)*4./3.*3.14*2500.*1e9 & !kg-->ug * (ZRG_DST(:,:,:,JJ)**3)*1.d-18 & !um-->m * exp(4.5*log(ZSIG_DST(:,:,:,JJ))*log(ZSIG_DST(:,:,:,JJ))) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! FOR RAIN DROPS WRITE(TZFIELD%CMNHNAME,'(A9,I1)')'DSTDEPN0A',JJ+NMODE_DST TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1692,7 +1692,7 @@ IF (LDUST.AND.LDEPOS_DST(IMI)) THEN * XAVOGADRO & !==>#/mole / XMD & !==>#/kg_{air} * XRHODREF(:,:,:) !==>#/m3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! RAIN: DUST MASS CONCENTRATION WRITE(TZFIELD%CMNHNAME,'(A9,I1)')'DSTDEPMSS',JJ+NMODE_DST TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) @@ -1701,7 +1701,7 @@ IF (LDUST.AND.LDEPOS_DST(IMI)) THEN ZWORK31(:,:,:)= ZWORK31(:,:,:)*4./3.*3.14*2500.*1e9 & !kg-->ug * (ZRG_DST(:,:,:,JJ)**3)*1.d-18 & !um-->m * exp(4.5*log(ZSIG_DST(:,:,:,JJ))*log(ZSIG_DST(:,:,:,JJ))) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END DO ! END IF @@ -1718,7 +1718,7 @@ IF ((LCHEMDIAG).AND.(LORILAM).AND.(LUSECHEM)) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CAERONAMES(JSV-NSV_AERBEG+1)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A4,I3.3)')'X_Y_Z_','AERO',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)*1.E9) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)*1.E9) END DO ! IF (.NOT.(ASSOCIATED(XN3D))) & @@ -1735,132 +1735,132 @@ IF ((LCHEMDIAG).AND.(LORILAM).AND.(LUSECHEM)) THEN TZFIELD%CLONGNAME = 'MesoNH: RGA' TZFIELD%CUNITS = 'um' WRITE(TZFIELD%CCOMMENT,'(A21,I1)')'RG (nb) AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRG3D(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRG3D(:,:,:,JJ)) ! TZFIELD%CMNHNAME = 'RGAM' TZFIELD%CLONGNAME = 'MesoNH: RGAM' TZFIELD%CUNITS = 'um' WRITE(TZFIELD%CCOMMENT,'(A20,I1)')'RG (m) AEROSOL MODE ',JJ ZWORK31(:,:,:)=XRG3D(:,:,:,JJ) / (EXP(-3.*(LOG(XSIG3D(:,:,:,JJ)))**2)) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! WRITE(TZFIELD%CMNHNAME,'(A3,I1)')'N0A',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'cm-3' WRITE(TZFIELD%CCOMMENT,'(A16,I1)')'N0 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XN3D(:,:,:,JJ)*1.E-6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XN3D(:,:,:,JJ)*1.E-6) ! WRITE(TZFIELD%CMNHNAME,'(A4,I1)')'SIGA',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = '1' WRITE(TZFIELD%CCOMMENT,'(A19,I1)')'SIGMA AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSIG3D(:,:,:,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSIG3D(:,:,:,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A4,I1)')'MSO4',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A22,I1)')'MASS SO4 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SO4,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SO4,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A4,I1)')'MNO3',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A22,I1)')'MASS NO3 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_NO3,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_NO3,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A4,I1)')'MNH3',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A22,I1)')'MASS NH3 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_NH3,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_NH3,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A4,I1)')'MH2O',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A22,I1)')'MASS H2O AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_H2O,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_H2O,JJ)) ! IF (NSOA .EQ. 10) THEN WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA1',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA1 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA1,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA1,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA2',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA2 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA2,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA2,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA3',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA3 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA3,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA3,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA4',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA4 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA4,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA4,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA5',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA5 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA5,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA5,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA6',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA6 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA6,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA6,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA7',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA7 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA7,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA7,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA8',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA8 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA8,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA8,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A5,I1)')'MSOA9',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A23,I1)')'MASS SOA9 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA9,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA9,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A6,I1)')'MSOA10',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A24,I1)')'MASS SOA10 AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_SOA10,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_SOA10,JJ)) END IF ! WRITE(TZFIELD%CMNHNAME,'(A3,I1)')'MOC',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A21,I1)')'MASS OC AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_OC,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_OC,JJ)) ! WRITE(TZFIELD%CMNHNAME,'(A3,I1)')'MBC',JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'ug m-3' WRITE(TZFIELD%CCOMMENT,'(A21,I1)')'MASS BC AEROSOL MODE ',JJ - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZPTOTA(:,:,:,JP_AER_BC,JJ)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZPTOTA(:,:,:,JP_AER_BC,JJ)) ENDDO END IF ! !* Large Scale variables ! IF (LVAR_LS) THEN - CALL IO_WRITE_FIELD(TPFILE,'LSUM', CLUOUT,XLSUM) - CALL IO_WRITE_FIELD(TPFILE,'LSVM', CLUOUT,XLSVM) + CALL IO_WRITE_FIELD(TPFILE,'LSUM', XLSUM) + CALL IO_WRITE_FIELD(TPFILE,'LSVM', XLSVM) ! IF (LWIND_ZM) THEN TZFIELD2(1)%CMNHNAME = 'LSUM_ZM' @@ -1886,14 +1886,14 @@ IF (LVAR_LS) THEN CALL UV_TO_ZONAL_AND_MERID(XLSUM,XLSVM,23,TPFILE=TPFILE,TZFIELDS=TZFIELD2) ENDIF ! - CALL IO_WRITE_FIELD(TPFILE,'LSWM', CLUOUT,XLSWM) - CALL IO_WRITE_FIELD(TPFILE,'LSTHM',CLUOUT,XLSTHM) + CALL IO_WRITE_FIELD(TPFILE,'LSWM', XLSWM) + CALL IO_WRITE_FIELD(TPFILE,'LSTHM',XLSTHM) ! IF (LUSERV) THEN CALL FIND_FIELD_ID_FROM_MNHNAME('LSRVM',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'g kg-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XLSRVM(:,:,:)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XLSRVM(:,:,:)*1.E3) END IF END IF ! @@ -1913,7 +1913,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XUFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XUFRC(:,JT)) ! TZFIELD%CMNHNAME = 'VFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1924,7 +1924,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XVFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XVFRC(:,JT)) ! TZFIELD%CMNHNAME = 'WFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1935,7 +1935,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XWFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XWFRC(:,JT)) ! TZFIELD%CMNHNAME = 'THFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1946,7 +1946,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'RVFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1957,7 +1957,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRVFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRVFRC(:,JT)) ! TZFIELD%CMNHNAME = 'TENDTHFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1968,7 +1968,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTENDTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTENDTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'TENDRVFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1979,7 +1979,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTENDRVFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTENDRVFRC(:,JT)) ! TZFIELD%CMNHNAME = 'GXTHFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1990,7 +1990,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XGXTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XGXTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'GYTHFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -2001,7 +2001,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XGYTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XGYTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'PGROUNDFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -2012,7 +2012,7 @@ IF (LVAR_FRC .AND. LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPGROUNDFRC(JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPGROUNDFRC(JT)) ! END DO END IF @@ -2034,16 +2034,16 @@ IF (LTPZH .OR. LCOREF) THEN TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 ZWORK31(:,:,:)=ZTEMP(:,:,:) - XTT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! !* Pressure in hPa CALL FIND_FIELD_ID_FROM_MNHNAME('PABST',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'hPa' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPABST(:,:,:)*1E-2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPABST(:,:,:)*1E-2) ! !* Geopotential in meters - CALL IO_WRITE_FIELD(TPFILE,'ALT',CLUOUT,XZZ) + CALL IO_WRITE_FIELD(TPFILE,'ALT',XZZ) ! !* Relative humidity in percent IF (LUSERV) THEN @@ -2070,7 +2070,7 @@ IF (LTPZH .OR. LCOREF) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! TZFIELD%CMNHNAME = 'VPRES' TZFIELD%CSTDNAME = 'water_vapor_partial_pressure_in_air' @@ -2082,7 +2082,7 @@ IF (LTPZH .OR. LCOREF) THEN TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 ZWORK33(:,:,:)=ZWORK33(:,:,:)*ZWORK32(:,:,:)*1E-4 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK33) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK33) ! IF (LCOREF) THEN ZWORK33(:,:,:)=(77.6*( XPABST(:,:,:)*1E-2 & @@ -2097,7 +2097,7 @@ IF (LTPZH .OR. LCOREF) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK33) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK33) ! ZWORK33(:,:,:)=ZWORK33(:,:,:)+MZF(1,IKU,1,XZZ(:,:,:))*1E6/XRADIUS TZFIELD%CMNHNAME = 'MCOREF' @@ -2109,7 +2109,7 @@ IF (LTPZH .OR. LCOREF) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK33) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK33) END IF ELSE PRINT*, 'NO WATER VAPOR IN ',TPFILE%CNAME,' RELATIVE HUMIDITY IS NOT COMPUTED' @@ -2149,7 +2149,7 @@ IF ( LMOIST_V .OR. LMSLP .OR. LBLTOP ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZTHETAV) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTHETAV) END IF ! END IF @@ -2181,7 +2181,7 @@ IF (LVISI) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZVISIKUN) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZVISIKUN) ! IF ((CCLOUD == 'C2R2') .OR. (CCLOUD =='KHKO')) THEN ZVISIGUL(:,:,:) = 10000. @@ -2200,7 +2200,7 @@ IF (LVISI) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZVISIGUL) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZVISIGUL) ! Visibity Zhang TZFIELD%CMNHNAME = 'VISIZHA' TZFIELD%CSTDNAME = '' @@ -2211,7 +2211,7 @@ IF (LVISI) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZVISIZHA) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZVISIZHA) ! DEALLOCATE(ZVISIGUL,ZVISIZHA) END IF @@ -2245,7 +2245,7 @@ IF (( LMOIST_E .OR. LBV_FR ) .AND. (NRR>0)) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZTHETAE) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTHETAE) END IF END IF !------------------------------------------------------------------------------- @@ -2270,7 +2270,7 @@ IF (LMOIST_ES .AND. (NRR>0)) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZTHETAES) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZTHETAES) ENDIF ! !------------------------------------------------------------------------------- @@ -2289,7 +2289,7 @@ IF (LVORT) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! ! Vorticity y ZWORK32(:,:,:)=MZF(1,IKU,1,MXF(MYM(ZVOY(:,:,:)))) @@ -2302,7 +2302,7 @@ IF (LVORT) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! IF (LWIND_ZM) THEN TZFIELD2(1)%CMNHNAME = 'UM1_ZM' @@ -2339,7 +2339,7 @@ IF (LVORT) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! ! Absolute Vorticity ZWORK31(:,:,:)=MYF(MXF(ZVOZ(:,:,:))) + ZCORIOZ(:,:,:) @@ -2352,7 +2352,7 @@ IF (LVORT) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! END IF ! @@ -2383,7 +2383,7 @@ IF ( LMEAN_POVO ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! ! Virtual Potential Vorticity in PV units @@ -2404,7 +2404,7 @@ IF (LMOIST_V .AND. (NRR>0) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK34) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK34) ! IF (LMEAN_POVO) THEN IWORK1(:,:)=0 @@ -2425,7 +2425,7 @@ IF (LMOIST_V .AND. (NRR>0) ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF END IF ! @@ -2448,7 +2448,7 @@ IF (LMOIST_E .AND. (NRR>0) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK34) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK34) ! IF (LMEAN_POVO) THEN IWORK1(:,:)=0 @@ -2469,7 +2469,7 @@ IF (LMOIST_E .AND. (NRR>0) ) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) DEALLOCATE(IWORK1) END IF ! @@ -2493,7 +2493,7 @@ IF (LMOIST_ES .AND. (NRR>0) ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK34) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK34) ENDIF ! ! @@ -2513,7 +2513,7 @@ IF (LDIV) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! IF (LUSERV) THEN TZFIELD%CMNHNAME = 'HMDIV' @@ -2528,7 +2528,7 @@ IF (LDIV) THEN ZWORK31=MXM(XRHODREF*XRT(:,:,:,1))*XUT ZWORK32=MYM(XRHODREF*XRT(:,:,:,1))*XVT ZWORK33=GX_U_M(1,IKU,1,ZWORK31,XDXX,XDZZ,XDZX) + GY_V_M(1,IKU,1,ZWORK32,XDYY,XDZZ,XDZY) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK33) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK33) END IF ! ENDIF @@ -2582,7 +2582,7 @@ IF (LGEO .OR. LAGEO) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! TZFIELD%CMNHNAME = 'VM88' TZFIELD%CSTDNAME = '' @@ -2593,7 +2593,7 @@ IF (LGEO .OR. LAGEO) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! IF (LWIND_ZM) THEN TZFIELD2(1)%CMNHNAME = 'UM88_ZM' @@ -2624,7 +2624,7 @@ IF (LGEO .OR. LAGEO) THEN TZFIELD = TFIELDLIST(IID) TZFIELD%CMNHNAME = 'WM88' TZFIELD%CLONGNAME = 'MesoNH: WM88' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XWT) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XWT) END IF ! IF (LAGEO) THEN @@ -2640,7 +2640,7 @@ IF (LGEO .OR. LAGEO) THEN TZFIELD%NGRID = 2 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! TZFIELD%CMNHNAME = 'VM89' TZFIELD%CSTDNAME = '' @@ -2651,7 +2651,7 @@ IF (LGEO .OR. LAGEO) THEN TZFIELD%NGRID = 3 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! IF (LWIND_ZM) THEN TZFIELD2(1)%CMNHNAME = 'UM89_ZM' @@ -2682,7 +2682,7 @@ IF (LGEO .OR. LAGEO) THEN TZFIELD = TFIELDLIST(IID) TZFIELD%CMNHNAME = 'WM89' TZFIELD%CLONGNAME = 'MesoNH: WM89' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XWT) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XWT) END IF ! END IF @@ -2717,7 +2717,7 @@ IF (LMSLP) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) END IF !------------------------------------------------------------------------------- ! @@ -2741,7 +2741,7 @@ IF (LTHW) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! ZWORK21(:,:) = 0. @@ -2760,7 +2760,7 @@ IF (LTHW) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! ZWORK21(:,:) = 0. @@ -2779,7 +2779,7 @@ IF (LTHW) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! ZWORK21(:,:) = 0. @@ -2798,7 +2798,7 @@ IF (LTHW) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! ZWORK21(:,:) = 0. @@ -2817,7 +2817,7 @@ IF (LTHW) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! ZWORK21(:,:) = 0. @@ -2836,7 +2836,7 @@ IF (LTHW) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! ZWORK21(:,:) = 0. @@ -2894,7 +2894,7 @@ IF (LTOTAL_PR .AND. SIZE (XACPRR)>0 ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ELSE PRINT * ,'YOU WANT TO COMPUTE THE ACCUMULATED RAIN' PRINT * ,'BUT NO RAIN IS PRESENT IN THE MODEL' @@ -2919,7 +2919,7 @@ IF (LTOTAL_PR .AND. SIZE (XACPRR)>0 ) THEN JJ=INT(XMEAN_PR(JK+1)) WRITE(TZFIELD%CMNHNAME,'(A9,2I2.2)')'LS_ACTOPR',JI,JJ TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) END IF END DO ! @@ -2957,7 +2957,7 @@ IF (LTOTAL_PR .AND. SIZE (XACPRR)>0 ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ELSE PRINT * ,'YOU WANT TO COMPUTE THE RAIN RATE' PRINT * ,'BUT NO RAIN IS PRESENT IN THE MODEL' @@ -2976,7 +2976,7 @@ IF (LTOTAL_PR .AND. SIZE (XACPRR)>0 ) THEN TZFIELD%CCOMMENT = 'X_Y_Large Scale INstantaneous TOtal Precipitation Rate' TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) END IF ! END IF @@ -3004,7 +3004,7 @@ IF (NCAPE >=0 .AND. LUSERV) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ! TZFIELD%CMNHNAME = 'CINMAX' TZFIELD%CSTDNAME = '' @@ -3015,7 +3015,7 @@ IF (NCAPE >=0 .AND. LUSERV) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) ! IF (NCAPE >=1) THEN TZFIELD%CMNHNAME = 'CAPE3D' @@ -3027,7 +3027,7 @@ IF (NCAPE >=0 .AND. LUSERV) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! TZFIELD%CMNHNAME = 'CIN3D' TZFIELD%CSTDNAME = 'atmosphere_convective_inhibition' @@ -3038,7 +3038,7 @@ IF (NCAPE >=0 .AND. LUSERV) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK33) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK33) ! TZFIELD%CMNHNAME = 'DCAPE3D' TZFIELD%CSTDNAME = '' @@ -3049,7 +3049,7 @@ IF (NCAPE >=0 .AND. LUSERV) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK34) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK34) END IF ! IF (NCAPE >=2) THEN @@ -3066,7 +3066,7 @@ IF (NCAPE >=0 .AND. LUSERV) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF ENDIF ! @@ -3097,7 +3097,7 @@ IF (LBV_FR) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! IF (NRR > 0) THEN ZWORK32(:,:,:)=DZM(1,IKU,1,ZTHETAE(:,:,:))/ MZM(1,IKU,1,ZTHETAE(:,:,:)) @@ -3122,7 +3122,7 @@ IF (LBV_FR) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF END IF ! @@ -3149,7 +3149,7 @@ IF ( NGPS>=0 ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) ! IF (NGPS>=1) THEN TZFIELD%CMNHNAME = 'ZHD' @@ -3161,7 +3161,7 @@ IF ( NGPS>=0 ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK23) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK23) ! TZFIELD%CMNHNAME = 'ZWD' TZFIELD%CSTDNAME = '' @@ -3172,7 +3172,7 @@ IF ( NGPS>=0 ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK24) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK24) ! END IF ! @@ -3216,7 +3216,7 @@ IF(LRADAR .AND. LUSERR) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! TZFIELD%CMNHNAME = 'VDOP' TZFIELD%CSTDNAME = '' @@ -3227,7 +3227,7 @@ IF(LRADAR .AND. LUSERR) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! TZFIELD%CMNHNAME = 'ZDR' TZFIELD%CSTDNAME = '' @@ -3238,7 +3238,7 @@ IF(LRADAR .AND. LUSERR) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK33) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK33) ! TZFIELD%CMNHNAME = 'KDP' TZFIELD%CSTDNAME = '' @@ -3249,7 +3249,7 @@ IF(LRADAR .AND. LUSERR) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK34) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK34) ! ELSE ! @@ -3520,7 +3520,7 @@ IF (LLIDAR) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! TZFIELD%CMNHNAME = 'LIPAR' TZFIELD%CSTDNAME = '' @@ -3531,7 +3531,7 @@ IF (LLIDAR) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK32) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK32) ! END IF ! @@ -3555,10 +3555,10 @@ IF (ALLOCATED(ZTHETAV)) DEALLOCATE(ZTHETAV) !* Ligthning ! IF ( LCH_CONV_LINOX ) THEN - CALL IO_WRITE_FIELD(TPFILE,'IC_RATE', CLUOUT,XIC_RATE) - CALL IO_WRITE_FIELD(TPFILE,'CG_RATE', CLUOUT,XCG_RATE) - CALL IO_WRITE_FIELD(TPFILE,'IC_TOTAL_NB',CLUOUT,XIC_TOTAL_NUMBER) - CALL IO_WRITE_FIELD(TPFILE,'CG_TOTAL_NB',CLUOUT,XCG_TOTAL_NUMBER) + CALL IO_WRITE_FIELD(TPFILE,'IC_RATE', XIC_RATE) + CALL IO_WRITE_FIELD(TPFILE,'CG_RATE', XCG_RATE) + CALL IO_WRITE_FIELD(TPFILE,'IC_TOTAL_NB',XIC_TOTAL_NUMBER) + CALL IO_WRITE_FIELD(TPFILE,'CG_TOTAL_NB',XCG_TOTAL_NUMBER) END IF !------------------------------------------------------------------------------- !------------------------------------------------------------------------------- diff --git a/src/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90 index 85f7e8747..789000c8b 100644 --- a/src/MNH/write_lfifm1_for_diag_supp.f90 +++ b/src/MNH/write_lfifm1_for_diag_supp.f90 @@ -219,8 +219,8 @@ ZTEMP(:,:,:)=XTHT(:,:,:)*(XPABST(:,:,:)/ XP00) **(XRD/XCPD) ! ! #ifdef MNH_NCWRIT ! IF (LNETCDF.AND..NOT.LCARTESIAN) THEN -! CALL IO_WRITE_FIELD(TPFILE,'LAT',CLUOUT,XLAT) -! CALL IO_WRITE_FIELD(TPFILE,'LON',CLUOUT,XLON) +! CALL IO_WRITE_FIELD(TPFILE,'LAT',XLAT) +! CALL IO_WRITE_FIELD(TPFILE,'LON',XLON) ! END IF ! #endif ! @@ -233,7 +233,7 @@ ZTEMP(:,:,:)=XTHT(:,:,:)*(XPABST(:,:,:)/ XP00) **(XRD/XCPD) ! IF (NCONV_KF >= 0) THEN ! - CALL IO_WRITE_FIELD(TPFILE,'CAPE',CLUOUT,XCAPE) + CALL IO_WRITE_FIELD(TPFILE,'CAPE',XCAPE) ! ! top height (km) of convective clouds ZWORK21(:,:)= 0. @@ -251,7 +251,7 @@ IF (NCONV_KF >= 0) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ! ! base height (km) of convective clouds ZWORK21(:,:)= 0. @@ -269,15 +269,15 @@ IF (NCONV_KF >= 0) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ! END IF IF (NCONV_KF >= 1) THEN ! - CALL IO_WRITE_FIELD(TPFILE,'DTHCONV',CLUOUT,XDTHCONV) - CALL IO_WRITE_FIELD(TPFILE,'DRVCONV',CLUOUT,XDRVCONV) - CALL IO_WRITE_FIELD(TPFILE,'DRCCONV',CLUOUT,XDRCCONV) - CALL IO_WRITE_FIELD(TPFILE,'DRICONV',CLUOUT,XDRICONV) + CALL IO_WRITE_FIELD(TPFILE,'DTHCONV',XDTHCONV) + CALL IO_WRITE_FIELD(TPFILE,'DRVCONV',XDRVCONV) + CALL IO_WRITE_FIELD(TPFILE,'DRCCONV',XDRCCONV) + CALL IO_WRITE_FIELD(TPFILE,'DRICONV',XDRICONV) ! IF ( LCHTRANS .AND. NSV > 0 ) THEN ! User scalar variables @@ -293,7 +293,7 @@ IF (NCONV_KF >= 1) THEN WRITE(TZFIELD%CMNHNAME,'(A7,I3.3)')'DSVCONV',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A2,I3.3,A20)')'X_Y_Z_','SV',JSV,' CONVective tendency' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF ! microphysical C2R2 scheme scalar variables @@ -309,7 +309,7 @@ IF (NCONV_KF >= 1) THEN TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))//' CONVective tendency (1/s)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF ! microphysical C3R5 scheme additional scalar variables @@ -325,7 +325,7 @@ IF (NCONV_KF >= 1) THEN TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))//' CONVective tendency (1/s)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF ! electrical scalar variables @@ -341,7 +341,7 @@ IF (NCONV_KF >= 1) THEN TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(CELECNAMES(JSV-NSV_ELECBEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(CELECNAMES(JSV-NSV_ELECBEG+1))//' CONVective tendency (1/s)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF ! chemical scalar variables @@ -357,7 +357,7 @@ IF (NCONV_KF >= 1) THEN TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(CNAMES(JSV-NSV_CHEMBEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(CNAMES(JSV-NSV_CHEMBEG+1))//' CONVective tendency (1/s)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF ! lagrangian variables @@ -373,17 +373,17 @@ IF (NCONV_KF >= 1) THEN TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(CLGNAMES(JSV-NSV_LGBEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(CLGNAMES(JSV-NSV_LGBEG+1))//' CONVective tendency (1/s)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF END IF ! END IF IF (NCONV_KF >= 2) THEN - CALL IO_WRITE_FIELD(TPFILE,'PRLFLXCONV',CLUOUT,XPRLFLXCONV) - CALL IO_WRITE_FIELD(TPFILE,'PRSFLXCONV',CLUOUT,XPRSFLXCONV) - CALL IO_WRITE_FIELD(TPFILE,'UMFCONV', CLUOUT,XUMFCONV) - CALL IO_WRITE_FIELD(TPFILE,'DMFCONV', CLUOUT,XDMFCONV) + CALL IO_WRITE_FIELD(TPFILE,'PRLFLXCONV',XPRLFLXCONV) + CALL IO_WRITE_FIELD(TPFILE,'PRSFLXCONV',XPRSFLXCONV) + CALL IO_WRITE_FIELD(TPFILE,'UMFCONV', XUMFCONV) + CALL IO_WRITE_FIELD(TPFILE,'DMFCONV', XDMFCONV) END IF !------------------------------------------------------------------------------- ! @@ -443,7 +443,7 @@ IF (LCLD_COV .AND. LUSERC) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ! ! Higher top of the different species of clouds ! @@ -479,7 +479,7 @@ IF (LCLD_COV .AND. LUSERC) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) ENDIF ! TZFIELD%CMNHNAME = 'TCL' @@ -491,9 +491,9 @@ IF (LCLD_COV .AND. LUSERC) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK22) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK22) ! - CALL IO_WRITE_FIELD(TPFILE,'CLDFR',CLUOUT,XCLDFR) + CALL IO_WRITE_FIELD(TPFILE,'CLDFR',XCLDFR) ! ! Visibility ! @@ -511,7 +511,7 @@ IF (LCLD_COV .AND. LUSERC) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) ! DEALLOCATE(IWORK1,IWORK2,ICL_HE_ST,GMASK2,ZWORK22) END IF @@ -523,18 +523,18 @@ END IF ! IF (NRAD_3D >= 0) THEN IF (CRAD /= 'NONE') THEN - CALL IO_WRITE_FIELD(TPFILE,'DTHRAD', CLUOUT,XDTHRAD) - CALL IO_WRITE_FIELD(TPFILE,'FLALWD', CLUOUT,XFLALWD) - CALL IO_WRITE_FIELD(TPFILE,'DIRFLASWD', CLUOUT,XDIRFLASWD) - CALL IO_WRITE_FIELD(TPFILE,'SCAFLASWD', CLUOUT,XSCAFLASWD) - CALL IO_WRITE_FIELD(TPFILE,'DIRSRFSWD', CLUOUT,XDIRSRFSWD) - CALL IO_WRITE_FIELD(TPFILE,'CLEARCOL_TM1',CLUOUT,NCLEARCOL_TM1) - CALL IO_WRITE_FIELD(TPFILE,'ZENITH', CLUOUT,XZENITH) - CALL IO_WRITE_FIELD(TPFILE,'AZIM', CLUOUT,XAZIM) - CALL IO_WRITE_FIELD(TPFILE,'DIR_ALB', CLUOUT,XDIR_ALB) - CALL IO_WRITE_FIELD(TPFILE,'SCA_ALB', CLUOUT,XSCA_ALB) - CALL IO_WRITE_FIELD(TPFILE,'EMIS', CLUOUT,XEMIS) - CALL IO_WRITE_FIELD(TPFILE,'TSRAD', CLUOUT,XTSRAD) + CALL IO_WRITE_FIELD(TPFILE,'DTHRAD', XDTHRAD) + CALL IO_WRITE_FIELD(TPFILE,'FLALWD', XFLALWD) + CALL IO_WRITE_FIELD(TPFILE,'DIRFLASWD', XDIRFLASWD) + CALL IO_WRITE_FIELD(TPFILE,'SCAFLASWD', XSCAFLASWD) + CALL IO_WRITE_FIELD(TPFILE,'DIRSRFSWD', XDIRSRFSWD) + CALL IO_WRITE_FIELD(TPFILE,'CLEARCOL_TM1',NCLEARCOL_TM1) + CALL IO_WRITE_FIELD(TPFILE,'ZENITH', XZENITH) + CALL IO_WRITE_FIELD(TPFILE,'AZIM', XAZIM) + CALL IO_WRITE_FIELD(TPFILE,'DIR_ALB', XDIR_ALB) + CALL IO_WRITE_FIELD(TPFILE,'SCA_ALB', XSCA_ALB) + CALL IO_WRITE_FIELD(TPFILE,'EMIS', XEMIS) + CALL IO_WRITE_FIELD(TPFILE,'TSRAD', XTSRAD) ELSE PRINT*,'YOU WANT DIAGNOSTICS RELATED TO RADIATION' PRINT*,' BUT NO RADIATIVE SCHEME WAS ACTIVATED IN THE MODEL' @@ -557,7 +557,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) !Dust optical depth ZWORK21(:,:)=0.0 DO JK=IKB,IKE @@ -577,7 +577,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) !Dust extinction (optical depth per km) DO JK=IKB,IKE IKRAD = JK - JPVEXT @@ -592,7 +592,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF IF (LSALT) THEN !Salt optical depth between two vertical levels @@ -610,7 +610,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) !Salt optical depth ZWORK21(:,:)=0.0 DO JK=IKB,IKE @@ -630,7 +630,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) !Salt extinction (optical depth per km) DO JK=IKB,IKE IKRAD = JK - JPVEXT @@ -645,7 +645,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF IF (LORILAM) THEN !Orilam anthropogenic optical depth between two vertical levels @@ -663,7 +663,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) !Orilam anthropogenic optical depth ZWORK21(:,:)=0.0 DO JK=IKB,IKE @@ -683,7 +683,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) !Orilam anthropogenic extinction (optical depth per km) DO JK=IKB,IKE IKRAD = JK - JPVEXT @@ -698,7 +698,7 @@ IF (NRAD_3D >= 1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK31) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK31) END IF END IF ! @@ -759,7 +759,7 @@ IF (LEN_TRIM(CRAD_SAT) /= 0 .AND. NRR /=0) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZIRBT) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZIRBT) ! TZFIELD%CMNHNAME = TRIM(YNAM_SAT(JI))//'_WVBT' TZFIELD%CSTDNAME = '' @@ -770,7 +770,7 @@ IF (LEN_TRIM(CRAD_SAT) /= 0 .AND. NRR /=0) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWVBT) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWVBT) END DO DEALLOCATE(ZIRBT,ZWVBT) END IF @@ -864,7 +864,7 @@ IF (CSURF=='EXTE') THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XCURRENT_ZON10M) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XCURRENT_ZON10M) ! TZFIELD%CMNHNAME = 'VM10' TZFIELD%CSTDNAME = '' @@ -875,7 +875,7 @@ IF (CSURF=='EXTE') THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XCURRENT_MER10M) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XCURRENT_MER10M) ENDIF ! IF (SIZE(XTKET)>0) THEN @@ -890,7 +890,7 @@ IF (CSURF=='EXTE') THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK21) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK21) END IF ! IF(ANY(XCURRENT_SFCO2/=XUNDEF))THEN @@ -903,7 +903,7 @@ IF (CSURF=='EXTE') THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XCURRENT_SFCO2) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XCURRENT_SFCO2) END IF ! IF(ANY(XCURRENT_SW/=XUNDEF))THEN @@ -916,7 +916,7 @@ IF (CSURF=='EXTE') THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XCURRENT_SW) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XCURRENT_SW) END IF ! IF(ANY(XCURRENT_LW/=XUNDEF))THEN @@ -929,7 +929,7 @@ IF (CSURF=='EXTE') THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XCURRENT_LW) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XCURRENT_LW) END IF END IF @@ -987,7 +987,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'K' TZFIELD%CCOMMENT = 'X_Y_potential temperature '//TRIM(YPRES(JK))//' hPa' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWRES(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWRES(:,:,JK)) END DO ! ********************* ! Wind @@ -1000,7 +1000,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_U component of wind '//TRIM(YPRES(JK))//' hPa' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWRES(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWRES(:,:,JK)) END DO ! ZWORK31(:,:,:) = MYF(XVT(:,:,:)) @@ -1011,7 +1011,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_V component of wind '//TRIM(YPRES(JK))//' hPa' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWRES(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWRES(:,:,JK)) END DO ! ********************* ! Water Vapour Mixing Ratio @@ -1023,7 +1023,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'g kg-1' TZFIELD%CCOMMENT = 'X_Y_Vapor Mixing Ratio '//TRIM(YPRES(JK))//' hPa' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWRES(:,:,JK)*1.E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWRES(:,:,JK)*1.E3) END DO ! ********************* ! Geopotential in meters @@ -1036,7 +1036,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'm' TZFIELD%CCOMMENT = 'X_Y_ALTitude '//TRIM(YPRES(JK))//' hPa' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWRES(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWRES(:,:,JK)) END DO ! DEALLOCATE(ZWRES,ZPRES,ZWORK32,ZWORK33,ZWORK34) @@ -1090,7 +1090,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'Pa' TZFIELD%CCOMMENT = 'X_Y_pressure '//TRIM(YTH(JK))//' K' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWTH(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWTH(:,:,JK)) END DO ! ********************* ! Potential Vorticity @@ -1118,7 +1118,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'PVU' TZFIELD%CCOMMENT = 'X_Y_POtential VOrticity '//TRIM(YTH(JK))//' K' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWTH(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWTH(:,:,JK)) END DO ! ********************* ! Wind @@ -1130,7 +1130,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_U component of wind '//TRIM(YTH(JK))//' K' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWTH(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWTH(:,:,JK)) END DO ! ZWORK31(:,:,:) = MYF(XVT(:,:,:)) @@ -1140,7 +1140,7 @@ ALLOCATE(ZWORK34(IIU,IJU,IKU)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_V component of wind '//TRIM(YTH(JK))//' K' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWTH(:,:,JK)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWTH(:,:,JK)) END DO ! DEALLOCATE(ZWTH,ZTH,ZWORK32,ZWORK33,ZWORK34) @@ -1164,7 +1164,7 @@ IF (NEQ_BUDGET>0) THEN TZFIELD%CMNHNAME = TRIM(CNAMES_BUDGET(JSV))//'_BUDGET' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(CNAMES_BUDGET(JSV))//'_BUDGET' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTCHEM(JSV)%XB_REAC(:,:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTCHEM(JSV)%XB_REAC(:,:,:,:)) END DO ! TZFIELD%CUNITS = '' @@ -1175,7 +1175,7 @@ IF (NEQ_BUDGET>0) THEN TZFIELD%CMNHNAME = TRIM(CNAMES_BUDGET(JSV))//'_CHREACLIST' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = TRIM(CNAMES_BUDGET(JSV))//'_REACTION_LIST' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTCHEM(JSV)%NB_REAC(:)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTCHEM(JSV)%NB_REAC(:)) END DO END IF ! @@ -1193,12 +1193,12 @@ IF (NEQ_PLT>0) THEN TZFIELD%CMNHNAME = TRIM(CNAMES_PRODLOSST(JSV))//'_PROD' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(CNAMES_PRODLOSST(JSV))//'_PROD' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPROD(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPROD(:,:,:,JSV)) ! TZFIELD%CMNHNAME = TRIM(CNAMES_PRODLOSST(JSV))//'_LOSS' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(CNAMES_PRODLOSST(JSV))//'_LOSS' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XLOSS(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XLOSS(:,:,:,JSV)) END DO END IF ! diff --git a/src/MNH/write_lfifmn_fordiachron.f90 b/src/MNH/write_lfifmn_fordiachron.f90 index 7a6d41bd6..8a7647d2c 100644 --- a/src/MNH/write_lfifmn_fordiachron.f90 +++ b/src/MNH/write_lfifmn_fordiachron.f90 @@ -136,26 +136,26 @@ LPACK=.FALSE. ! !* 1.0 Version : ! -CALL IO_WRITE_FIELD(TPFILE,'L1D', CLUOUT,L1D) -CALL IO_WRITE_FIELD(TPFILE,'L2D', CLUOUT,L2D) -CALL IO_WRITE_FIELD(TPFILE,'PACK',CLUOUT,LPACK) -CALL IO_WRITE_FIELD(TPFILE,'SURF',CLUOUT,CSURF) +CALL IO_WRITE_FIELD(TPFILE,'L1D', L1D) +CALL IO_WRITE_FIELD(TPFILE,'L2D', L2D) +CALL IO_WRITE_FIELD(TPFILE,'PACK',LPACK) +CALL IO_WRITE_FIELD(TPFILE,'SURF',CSURF) ! !* 1.1 Dimensions : ! -CALL IO_WRITE_FIELD(TPFILE,'IMAX',CLUOUT,NIMAX_ll) -CALL IO_WRITE_FIELD(TPFILE,'JMAX',CLUOUT,NJMAX_ll) -CALL IO_WRITE_FIELD(TPFILE,'KMAX',CLUOUT,NKMAX) +CALL IO_WRITE_FIELD(TPFILE,'IMAX',NIMAX_ll) +CALL IO_WRITE_FIELD(TPFILE,'JMAX',NJMAX_ll) +CALL IO_WRITE_FIELD(TPFILE,'KMAX',NKMAX) ! -CALL IO_WRITE_FIELD(TPFILE,'JPHEXT',CLUOUT,JPHEXT) +CALL IO_WRITE_FIELD(TPFILE,'JPHEXT',JPHEXT) ! !* 1.2 Grid variables : ! IF (.NOT.LCARTESIAN) THEN ! - CALL IO_WRITE_FIELD(TPFILE,'RPK', CLUOUT,XRPK) - CALL IO_WRITE_FIELD(TPFILE,'LONORI',CLUOUT,XLONORI) - CALL IO_WRITE_FIELD(TPFILE,'LATORI',CLUOUT,XLATORI) + CALL IO_WRITE_FIELD(TPFILE,'RPK', XRPK) + CALL IO_WRITE_FIELD(TPFILE,'LONORI',XLONORI) + CALL IO_WRITE_FIELD(TPFILE,'LATORI',XLATORI) ! !* diagnostic of 1st mass point ! @@ -177,59 +177,59 @@ IF (.NOT.LCARTESIAN) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLONOR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLONOR) ! TZFIELD%CMNHNAME = 'LATOR' TZFIELD%CLONGNAME = 'MesoNH: LATOR' TZFIELD%CCOMMENT = 'Latitude of 1st mass point' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLATOR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLATOR) ! ! #ifdef MNH_NCWRIT ! IF (LNETCDF) THEN ! LLFIFM = .FALSE. -! CALL IO_WRITE_FIELD(TPFILE,'LAT',CLUOUT,XLAT) -! CALL IO_WRITE_FIELD(TPFILE,'LON',CLUOUT,XLON) +! CALL IO_WRITE_FIELD(TPFILE,'LAT',XLAT) +! CALL IO_WRITE_FIELD(TPFILE,'LON',XLON) ! LLFIFM = .TRUE. ! END IF ! #endif END IF ! -CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',CLUOUT,LTHINSHELL) -CALL IO_WRITE_FIELD(TPFILE,'LAT0',CLUOUT,XLAT0) -CALL IO_WRITE_FIELD(TPFILE,'LON0',CLUOUT,XLON0) -CALL IO_WRITE_FIELD(TPFILE,'BETA',CLUOUT,XBETA) +CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',LTHINSHELL) +CALL IO_WRITE_FIELD(TPFILE,'LAT0',XLAT0) +CALL IO_WRITE_FIELD(TPFILE,'LON0',XLON0) +CALL IO_WRITE_FIELD(TPFILE,'BETA',XBETA) ! -CALL IO_WRITE_FIELD(TPFILE,'XHAT',CLUOUT,XXHAT) -CALL IO_WRITE_FIELD(TPFILE,'YHAT',CLUOUT,XYHAT) -CALL IO_WRITE_FIELD(TPFILE,'ZHAT',CLUOUT,XZHAT) +CALL IO_WRITE_FIELD(TPFILE,'XHAT',XXHAT) +CALL IO_WRITE_FIELD(TPFILE,'YHAT',XYHAT) +CALL IO_WRITE_FIELD(TPFILE,'ZHAT',XZHAT) ! -CALL IO_WRITE_FIELD(TPFILE,'ZS', CLUOUT,XZS) -CALL IO_WRITE_FIELD(TPFILE,'ZSMT', CLUOUT,XZSMT) -CALL IO_WRITE_FIELD(TPFILE,'SLEVE',CLUOUT,LSLEVE) +CALL IO_WRITE_FIELD(TPFILE,'ZS', XZS) +CALL IO_WRITE_FIELD(TPFILE,'ZSMT', XZSMT) +CALL IO_WRITE_FIELD(TPFILE,'SLEVE',LSLEVE) ! IF (LSLEVE) THEN - CALL IO_WRITE_FIELD(TPFILE,'LEN1',CLUOUT,XLEN1) - CALL IO_WRITE_FIELD(TPFILE,'LEN2',CLUOUT,XLEN2) + CALL IO_WRITE_FIELD(TPFILE,'LEN1',XLEN1) + CALL IO_WRITE_FIELD(TPFILE,'LEN2',XLEN2) END IF ! -CALL IO_WRITE_FIELD(TPFILE,'DTMOD',CLUOUT,TDTMOD) -CALL IO_WRITE_FIELD(TPFILE,'DTCUR',CLUOUT,TDTCUR) -CALL IO_WRITE_FIELD(TPFILE,'DTEXP',CLUOUT,TDTEXP) -CALL IO_WRITE_FIELD(TPFILE,'DTSEG',CLUOUT,TDTSEG) +CALL IO_WRITE_FIELD(TPFILE,'DTMOD',TDTMOD) +CALL IO_WRITE_FIELD(TPFILE,'DTCUR',TDTCUR) +CALL IO_WRITE_FIELD(TPFILE,'DTEXP',TDTEXP) +CALL IO_WRITE_FIELD(TPFILE,'DTSEG',TDTSEG) ! !* 1.3 Configuration variables : ! -CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',CLUOUT,LCARTESIAN) -CALL IO_WRITE_FIELD(TPFILE,'LBOUSS', CLUOUT,LBOUSS) +CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',LCARTESIAN) +CALL IO_WRITE_FIELD(TPFILE,'LBOUSS', LBOUSS) ! !* 1.6 Reference state variables : ! -CALL IO_WRITE_FIELD(TPFILE,'RHOREFZ',CLUOUT,XRHODREFZ) -CALL IO_WRITE_FIELD(TPFILE,'THVREFZ',CLUOUT,XTHVREFZ) -CALL IO_WRITE_FIELD(TPFILE,'EXNTOP', CLUOUT,XEXNTOP) +CALL IO_WRITE_FIELD(TPFILE,'RHOREFZ',XRHODREFZ) +CALL IO_WRITE_FIELD(TPFILE,'THVREFZ',XTHVREFZ) +CALL IO_WRITE_FIELD(TPFILE,'EXNTOP', XEXNTOP) ! -CALL IO_WRITE_FIELD(TPFILE,'RHODREF',CLUOUT,XRHODREF) -CALL IO_WRITE_FIELD(TPFILE,'THVREF', CLUOUT,XTHVREF) +CALL IO_WRITE_FIELD(TPFILE,'RHODREF',XRHODREF) +CALL IO_WRITE_FIELD(TPFILE,'THVREF', XTHVREF) ! LPACK=GPACK ! diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90 index 6a8ed887a..1bba6a859 100644 --- a/src/MNH/write_lfin.f90 +++ b/src/MNH/write_lfin.f90 @@ -337,29 +337,29 @@ IKE=IKU-JPVEXT ! !* 1.0 File and HDADFILE writing : ! -CALL IO_WRITE_FIELD(TPFILE,'FILETYPE',CLUOUT,TPFILE%CTYPE) +CALL IO_WRITE_FIELD(TPFILE,'FILETYPE',TPFILE%CTYPE) ! IF (LEN_TRIM(HDADFILE)>0) THEN - CALL IO_WRITE_FIELD(TPFILE,'DXRATIO',CLUOUT,NDXRATIO_ALL(IMI)) - CALL IO_WRITE_FIELD(TPFILE,'DYRATIO',CLUOUT,NDYRATIO_ALL(IMI)) - CALL IO_WRITE_FIELD(TPFILE,'XOR', CLUOUT,NXOR_ALL(IMI)) - CALL IO_WRITE_FIELD(TPFILE,'YOR', CLUOUT,NYOR_ALL(IMI)) + CALL IO_WRITE_FIELD(TPFILE,'DXRATIO',NDXRATIO_ALL(IMI)) + CALL IO_WRITE_FIELD(TPFILE,'DYRATIO',NDYRATIO_ALL(IMI)) + CALL IO_WRITE_FIELD(TPFILE,'XOR', NXOR_ALL(IMI)) + CALL IO_WRITE_FIELD(TPFILE,'YOR', NYOR_ALL(IMI)) END IF ! !* 1.1 Type and Dimensions : ! -CALL IO_WRITE_FIELD(TPFILE,'IMAX',CLUOUT,NIMAX_ll) -CALL IO_WRITE_FIELD(TPFILE,'JMAX',CLUOUT,NJMAX_ll) -CALL IO_WRITE_FIELD(TPFILE,'KMAX',CLUOUT,NKMAX) +CALL IO_WRITE_FIELD(TPFILE,'IMAX',NIMAX_ll) +CALL IO_WRITE_FIELD(TPFILE,'JMAX',NJMAX_ll) +CALL IO_WRITE_FIELD(TPFILE,'KMAX',NKMAX) ! -CALL IO_WRITE_FIELD(TPFILE,'JPHEXT',CLUOUT,JPHEXT) +CALL IO_WRITE_FIELD(TPFILE,'JPHEXT',JPHEXT) ! !* 1.2 Grid variables : ! IF (.NOT.LCARTESIAN) THEN - CALL IO_WRITE_FIELD(TPFILE,'RPK', CLUOUT,XRPK) - CALL IO_WRITE_FIELD(TPFILE,'LONORI',CLUOUT,XLONORI) - CALL IO_WRITE_FIELD(TPFILE,'LATORI',CLUOUT,XLATORI) + CALL IO_WRITE_FIELD(TPFILE,'RPK', XRPK) + CALL IO_WRITE_FIELD(TPFILE,'LONORI',XLONORI) + CALL IO_WRITE_FIELD(TPFILE,'LATORI',XLATORI) ! !* diagnostic of 1st mass point ! @@ -381,61 +381,61 @@ IF (.NOT.LCARTESIAN) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLONOR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLONOR) ! TZFIELD%CMNHNAME = 'LATOR' TZFIELD%CLONGNAME = 'MesoNH: LATOR' TZFIELD%CCOMMENT = 'Latitude of 1st mass point' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZLATOR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZLATOR) END IF ! -CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',CLUOUT,LTHINSHELL) -CALL IO_WRITE_FIELD(TPFILE,'LAT0',CLUOUT,XLAT0) -CALL IO_WRITE_FIELD(TPFILE,'LON0',CLUOUT,XLON0) -CALL IO_WRITE_FIELD(TPFILE,'BETA',CLUOUT,XBETA) +CALL IO_WRITE_FIELD(TPFILE,'THINSHELL',LTHINSHELL) +CALL IO_WRITE_FIELD(TPFILE,'LAT0',XLAT0) +CALL IO_WRITE_FIELD(TPFILE,'LON0',XLON0) +CALL IO_WRITE_FIELD(TPFILE,'BETA',XBETA) ! -CALL IO_WRITE_FIELD(TPFILE,'XHAT',CLUOUT,XXHAT) -CALL IO_WRITE_FIELD(TPFILE,'YHAT',CLUOUT,XYHAT) -CALL IO_WRITE_FIELD(TPFILE,'ZHAT',CLUOUT,XZHAT) +CALL IO_WRITE_FIELD(TPFILE,'XHAT',XXHAT) +CALL IO_WRITE_FIELD(TPFILE,'YHAT',XYHAT) +CALL IO_WRITE_FIELD(TPFILE,'ZHAT',XZHAT) ! ! #ifdef MNH_NCWRIT ! ! ! !*SB*MAY2012 ! !*SB* * WRITE ALT -! IF (LNETCDF) CALL IO_WRITE_FIELD(TPFILE,'ALT',CLUOUT,XZZ) +! IF (LNETCDF) CALL IO_WRITE_FIELD(TPFILE,'ALT',XZZ) ! #endif ! IF (.NOT.LCARTESIAN) THEN - CALL IO_WRITE_FIELD(TPFILE,'LAT',CLUOUT,XLAT) - CALL IO_WRITE_FIELD(TPFILE,'LON',CLUOUT,XLON) + CALL IO_WRITE_FIELD(TPFILE,'LAT',XLAT) + CALL IO_WRITE_FIELD(TPFILE,'LON',XLON) END IF ! -CALL IO_WRITE_FIELD(TPFILE,'ZS', CLUOUT,XZS) -CALL IO_WRITE_FIELD(TPFILE,'ZSMT', CLUOUT,XZSMT) -CALL IO_WRITE_FIELD(TPFILE,'SLEVE',CLUOUT,LSLEVE) +CALL IO_WRITE_FIELD(TPFILE,'ZS', XZS) +CALL IO_WRITE_FIELD(TPFILE,'ZSMT', XZSMT) +CALL IO_WRITE_FIELD(TPFILE,'SLEVE',LSLEVE) ! IF (LSLEVE) THEN - CALL IO_WRITE_FIELD(TPFILE,'LEN1',CLUOUT,XLEN1) - CALL IO_WRITE_FIELD(TPFILE,'LEN2',CLUOUT,XLEN2) + CALL IO_WRITE_FIELD(TPFILE,'LEN1',XLEN1) + CALL IO_WRITE_FIELD(TPFILE,'LEN2',XLEN2) END IF ! ! -CALL IO_WRITE_FIELD(TPFILE,'DTMOD',CLUOUT,TDTMOD) -CALL IO_WRITE_FIELD(TPFILE,'DTCUR',CLUOUT,TDTCUR) -CALL IO_WRITE_FIELD(TPFILE,'DTEXP',CLUOUT,TDTEXP) -CALL IO_WRITE_FIELD(TPFILE,'DTSEG',CLUOUT,TDTSEG) +CALL IO_WRITE_FIELD(TPFILE,'DTMOD',TDTMOD) +CALL IO_WRITE_FIELD(TPFILE,'DTCUR',TDTCUR) +CALL IO_WRITE_FIELD(TPFILE,'DTEXP',TDTEXP) +CALL IO_WRITE_FIELD(TPFILE,'DTSEG',TDTSEG) ! !* 1.3 Configuration variables : ! -CALL IO_WRITE_FIELD(TPFILE,'L1D', CLUOUT,L1D) -CALL IO_WRITE_FIELD(TPFILE,'L2D', CLUOUT,L2D) -CALL IO_WRITE_FIELD(TPFILE,'PACK', CLUOUT,LPACK) -CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',CLUOUT,LCARTESIAN) -CALL IO_WRITE_FIELD(TPFILE,'LBOUSS', CLUOUT,LBOUSS) +CALL IO_WRITE_FIELD(TPFILE,'L1D', L1D) +CALL IO_WRITE_FIELD(TPFILE,'L2D', L2D) +CALL IO_WRITE_FIELD(TPFILE,'PACK', LPACK) +CALL IO_WRITE_FIELD(TPFILE,'CARTESIAN',LCARTESIAN) +CALL IO_WRITE_FIELD(TPFILE,'LBOUSS', LBOUSS) ! -CALL IO_WRITE_FIELD(TPFILE,'SURF', CLUOUT,CSURF) -CALL IO_WRITE_FIELD(TPFILE,'CPL_AROME',CLUOUT,LCPL_AROME) -CALL IO_WRITE_FIELD(TPFILE,'COUPLING', CLUOUT,LCOUPLING) +CALL IO_WRITE_FIELD(TPFILE,'SURF', CSURF) +CALL IO_WRITE_FIELD(TPFILE,'CPL_AROME',LCPL_AROME) +CALL IO_WRITE_FIELD(TPFILE,'COUPLING', LCOUPLING) ! !* 1.4 Prognostic variables : ! @@ -448,26 +448,26 @@ CALL IO_WRITE_FIELD(TPFILE,'COUPLING', CLUOUT,LCOUPLING) ! CALL EXTRAPOL('N',XUT) ! CALL EXTRAPOL('S',XUT) CALL MPPDB_CHECK3D(XUT,"write_lfifmn before IO_WRITE_FIELD::XUT",PRECISION) -CALL IO_WRITE_FIELD(TPFILE,'UT',CLUOUT,XUT) +CALL IO_WRITE_FIELD(TPFILE,'UT',XUT) CALL MPPDB_CHECK3D(XUT,"write_lfifmn after IO_WRITE_FIELD::XUT",PRECISION) ! !20131128 check XVT-> X_Y_W_V wind component for PRC CALL MPPDB_CHECK3D(XVT,"write_lfifmn::XVT",PRECISION) ! -CALL IO_WRITE_FIELD(TPFILE,'VT',CLUOUT,XVT) -CALL IO_WRITE_FIELD(TPFILE,'WT',CLUOUT,XWT) +CALL IO_WRITE_FIELD(TPFILE,'VT',XVT) +CALL IO_WRITE_FIELD(TPFILE,'WT',XWT) ! -CALL IO_WRITE_FIELD(TPFILE,'THT',CLUOUT,XTHT) +CALL IO_WRITE_FIELD(TPFILE,'THT',XTHT) ! !* 1.4.2 Time t-dt: ! IF ( (CUVW_ADV_SCHEME == 'CEN4TH') .AND. (CTEMP_SCHEME == 'LEFR') ) THEN - CALL IO_WRITE_FIELD(TPFILE,'UM', CLUOUT,XUM) - CALL IO_WRITE_FIELD(TPFILE,'VM', CLUOUT,XVM) - CALL IO_WRITE_FIELD(TPFILE,'WM', CLUOUT,XWM) - CALL IO_WRITE_FIELD(TPFILE,'DUM',CLUOUT,XDUM) - CALL IO_WRITE_FIELD(TPFILE,'DVM',CLUOUT,XDVM) - CALL IO_WRITE_FIELD(TPFILE,'DWM',CLUOUT,XDWM) + CALL IO_WRITE_FIELD(TPFILE,'UM', XUM) + CALL IO_WRITE_FIELD(TPFILE,'VM', XVM) + CALL IO_WRITE_FIELD(TPFILE,'WM', XWM) + CALL IO_WRITE_FIELD(TPFILE,'DUM',XDUM) + CALL IO_WRITE_FIELD(TPFILE,'DVM',XDVM) + CALL IO_WRITE_FIELD(TPFILE,'DWM',XDWM) END IF ! IF (MEAN_COUNT /= 0) THEN @@ -484,20 +484,20 @@ IF (MEAN_COUNT /= 0) THEN TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_Z_U component of mean wind' ZWORK3D = XUM_MEAN/MEAN_COUNT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'U2ME' TZFIELD%CLONGNAME = 'MesoNH: U2ME' TZFIELD%CUNITS = 'm2 s-2' TZFIELD%CCOMMENT = 'X_Y_Z_U component of mean wind variance' ZWORK3D = XU2_MEAN/MEAN_COUNT-XUM_MEAN**2/MEAN_COUNT**2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'UMMA' TZFIELD%CLONGNAME = 'MesoNH: UMMA' TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_Z_U component of max wind' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XUM_MAX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XUM_MAX) ! TZFIELD%NGRID = 3 ! @@ -506,20 +506,20 @@ IF (MEAN_COUNT /= 0) THEN TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_Z_V component of mean wind' ZWORK3D = XVM_MEAN/MEAN_COUNT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'V2ME' TZFIELD%CLONGNAME = 'MesoNH: V2ME' TZFIELD%CUNITS = 'm2 s-2' TZFIELD%CCOMMENT = 'X_Y_Z_V component of mean wind variance' ZWORK3D = XV2_MEAN/MEAN_COUNT-XVM_MEAN**2/MEAN_COUNT**2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'VMMA' TZFIELD%CLONGNAME = 'MesoNH: VMMA' TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_Z_V component of max wind' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XVM_MAX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XVM_MAX) ! TZFIELD%NGRID = 4 ! @@ -528,20 +528,20 @@ IF (MEAN_COUNT /= 0) THEN TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_Z_vertical mean wind' ZWORK3D = XWM_MEAN/MEAN_COUNT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'W2ME' TZFIELD%CLONGNAME = 'MesoNH: W2ME' TZFIELD%CUNITS = 'm2 s-2' TZFIELD%CCOMMENT = 'X_Y_Z_vertical mean wind variance' ZWORK3D = XW2_MEAN/MEAN_COUNT-XWM_MEAN**2/MEAN_COUNT**2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'WMMA' TZFIELD%CLONGNAME = 'MesoNH: WMMA' TZFIELD%CUNITS = 'm s-1' TZFIELD%CCOMMENT = 'X_Y_Z_vertical max wind' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XWM_MAX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XWM_MAX) ! TZFIELD%NGRID = 1 ! @@ -550,60 +550,60 @@ IF (MEAN_COUNT /= 0) THEN TZFIELD%CUNITS = 'K' TZFIELD%CCOMMENT = 'X_Y_Z_mean potential temperature' ZWORK3D = XTHM_MEAN/MEAN_COUNT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'TH2ME' TZFIELD%CLONGNAME = 'MesoNH: TH2ME' TZFIELD%CUNITS = 'K2' TZFIELD%CCOMMENT = 'X_Y_Z_mean potential temperature variance' ZWORK3D = XTH2_MEAN/MEAN_COUNT-XTHM_MEAN**2/MEAN_COUNT**2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'THMMA' TZFIELD%CLONGNAME = 'MesoNH: THMMA' TZFIELD%CUNITS = 'K' TZFIELD%CCOMMENT = 'X_Y_Z_max potential temperature' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTHM_MAX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTHM_MAX) ! TZFIELD%CMNHNAME = 'TEMPMME' TZFIELD%CLONGNAME = 'MesoNH: TEMPMME' TZFIELD%CUNITS = 'K' TZFIELD%CCOMMENT = 'X_Y_Z_mean temperature' ZWORK3D = XTEMPM_MEAN/MEAN_COUNT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'TEMP2ME' TZFIELD%CLONGNAME = 'MesoNH: TEMP2ME' TZFIELD%CUNITS = 'K2' TZFIELD%CCOMMENT = 'X_Y_Z_mean temperature variance' ZWORK3D = XTEMP2_MEAN/MEAN_COUNT-XTEMPM_MEAN**2/MEAN_COUNT**2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'TEMPMMA' TZFIELD%CLONGNAME = 'MesoNH: TEMPMMA' TZFIELD%CUNITS = 'K' TZFIELD%CCOMMENT = 'X_Y_Z_max temperature' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTEMPM_MAX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTEMPM_MAX) ! TZFIELD%CMNHNAME = 'PABSMME' TZFIELD%CLONGNAME = 'MesoNH: PABSMME' TZFIELD%CUNITS = 'Pa' TZFIELD%CCOMMENT = 'X_Y_Z_mean ABSolute Pressure' ZWORK3D = XPABSM_MEAN/MEAN_COUNT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'PABS2ME' TZFIELD%CLONGNAME = 'MesoNH: PABS2ME' TZFIELD%CUNITS = 'Pa2' TZFIELD%CCOMMENT = 'X_Y_Z_mean ABSolute Pressure variance' ZWORK3D = XPABS2_MEAN/MEAN_COUNT-XPABSM_MEAN**2/MEAN_COUNT**2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'PABSMMA' TZFIELD%CLONGNAME = 'MesoNH: PABSMMA' TZFIELD%CUNITS = 'Pa' TZFIELD%CCOMMENT = 'X_Y_Z_max ABSolute Pressure' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPABSM_MAX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPABSM_MAX) ! IF (CTURB /= 'NONE') THEN TZFIELD%CMNHNAME = 'TKEMME' @@ -611,52 +611,52 @@ IF (MEAN_COUNT /= 0) THEN TZFIELD%CUNITS = 'm2 s-2' TZFIELD%CCOMMENT = 'X_Y_Z_mean kinetic energy' ZWORK3D= XTKEM_MEAN/MEAN_COUNT - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! TZFIELD%CMNHNAME = 'TKEMMA' TZFIELD%CLONGNAME = 'MesoNH: TKEMMA' TZFIELD%CUNITS = 'm2 s-2' TZFIELD%CCOMMENT = 'X_Y_Z_max kinetic energy' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTKEM_MAX) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTKEM_MAX) END IF ! END IF ! ! IF (CTURB /= 'NONE') THEN - CALL IO_WRITE_FIELD(TPFILE,'TKET',CLUOUT,XTKET) - IF (CPROGRAM == 'MESONH') CALL IO_WRITE_FIELD(TPFILE,'TKEMS',CLUOUT,XRTKEMS) + CALL IO_WRITE_FIELD(TPFILE,'TKET',XTKET) + IF (CPROGRAM == 'MESONH') CALL IO_WRITE_FIELD(TPFILE,'TKEMS',XRTKEMS) END IF ! ! -CALL IO_WRITE_FIELD(TPFILE,'PABST',CLUOUT,XPABST) +CALL IO_WRITE_FIELD(TPFILE,'PABST',XPABST) ! IF (NRR >=1) THEN - IF (LUSERV) CALL IO_WRITE_FIELD(TPFILE,'RVT',CLUOUT,XRT(:,:,:,IDX_RVT)) + IF (LUSERV) CALL IO_WRITE_FIELD(TPFILE,'RVT',XRT(:,:,:,IDX_RVT)) IF (LUSERC) THEN - CALL IO_WRITE_FIELD(TPFILE,'RCT',CLUOUT,XRT(:,:,:,IDX_RCT)) + CALL IO_WRITE_FIELD(TPFILE,'RCT',XRT(:,:,:,IDX_RCT)) WRITE (ILUOUT,*) IDX_RCT,' RC min-max ',MIN_ll(XRT(:,:,:,IDX_RCT),INFO_ll),MAX_ll(XRT(:,:,:,IDX_RCT),INFO_ll) END IF IF (LUSERR) THEN - CALL IO_WRITE_FIELD(TPFILE,'RRT',CLUOUT,XRT(:,:,:,IDX_RRT)) + CALL IO_WRITE_FIELD(TPFILE,'RRT',XRT(:,:,:,IDX_RRT)) WRITE (ILUOUT,*) IDX_RRT,' RR min-max ',MIN_ll(XRT(:,:,:,IDX_RRT),INFO_ll),MAX_ll(XRT(:,:,:,IDX_RRT),INFO_ll) END IF IF (LUSERI) THEN - CALL IO_WRITE_FIELD(TPFILE,'RIT',CLUOUT,XRT(:,:,:,IDX_RIT)) + CALL IO_WRITE_FIELD(TPFILE,'RIT',XRT(:,:,:,IDX_RIT)) WRITE (ILUOUT,*) IDX_RIT,' RI min-max ',MIN_ll(XRT(:,:,:,IDX_RIT),INFO_ll),MAX_ll(XRT(:,:,:,IDX_RIT),INFO_ll) IF ( CPROGRAM == 'MESONH' .AND. CCLOUD(1:3) == 'ICE') THEN - CALL IO_WRITE_FIELD(TPFILE,'CIT',CLUOUT,XCIT(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,'CIT',XCIT(:,:,:)) END IF END IF IF (LUSERS) THEN - CALL IO_WRITE_FIELD(TPFILE,'RST',CLUOUT,XRT(:,:,:,IDX_RST)) + CALL IO_WRITE_FIELD(TPFILE,'RST',XRT(:,:,:,IDX_RST)) WRITE (ILUOUT,*) IDX_RST,' RS min-max ',MINVAL(XRT(:,:,:,IDX_RST)),MAXVAL(XRT(:,:,:,IDX_RST)) END IF IF (LUSERG) THEN - CALL IO_WRITE_FIELD(TPFILE,'RGT',CLUOUT,XRT(:,:,:,IDX_RGT)) + CALL IO_WRITE_FIELD(TPFILE,'RGT',XRT(:,:,:,IDX_RGT)) WRITE (ILUOUT,*) IDX_RGT,' RG min-max ',MINVAL(XRT(:,:,:,IDX_RGT)),MAXVAL(XRT(:,:,:,IDX_RGT)) END IF - IF (LUSERH) CALL IO_WRITE_FIELD(TPFILE,'RHT',CLUOUT,XRT(:,:,:,IDX_RHT)) + IF (LUSERH) CALL IO_WRITE_FIELD(TPFILE,'RHT',XRT(:,:,:,IDX_RHT)) END IF ! IF (NSV >=1) THEN @@ -674,7 +674,7 @@ IF (NSV >=1) THEN WRITE(TZFIELD%CMNHNAME,'(A3,I3.3)')'SVT',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) JSA=JSA+1 END DO END IF @@ -691,7 +691,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) JSA=JSA+1 END DO END IF @@ -708,7 +708,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) JSA=JSA+1 END DO END IF @@ -778,7 +778,7 @@ IF (NSV >=1) THEN END IF ! TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) ! JSA=JSA+1 END DO @@ -786,7 +786,7 @@ IF (NSV >=1) THEN IF (LSCAV .AND. LAERO_MASS) THEN IF (ASSOCIATED(XINPAP)) THEN IF (SIZE(XINPAP) /= 0 ) THEN - CALL IO_WRITE_FIELD(TPFILE,'INPAP',CLUOUT,XINPAP) + CALL IO_WRITE_FIELD(TPFILE,'INPAP',XINPAP) ! ZWORK2D(:,:) = XRHOLW*XINPRR(:,:)*XSVT(:,:,2,NSV_LIMA_SCAVMASS)/ & max( 1.e-20,XRT(:,:,2,3) ) !~2=at ground level @@ -799,9 +799,9 @@ IF (NSV >=1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK2D) ! - CALL IO_WRITE_FIELD(TPFILE,'ACPAP',CLUOUT,XACPAP) + CALL IO_WRITE_FIELD(TPFILE,'ACPAP',XACPAP) END IF END IF END IF @@ -826,15 +826,15 @@ IF (NSV >=1) THEN WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (nb ions/m3)' END IF ZWORK3D(:,:,:) = XSVT(:,:,:,JSV) * XRHODREF(:,:,:) ! C/kg --> C/m3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) JSA=JSA+1 END DO END IF ! IF (CELEC /= 'NONE') THEN - CALL IO_WRITE_FIELD(TPFILE,'EFIELDU',CLUOUT,XEFIELDU) - CALL IO_WRITE_FIELD(TPFILE,'EFIELDV',CLUOUT,XEFIELDV) - CALL IO_WRITE_FIELD(TPFILE,'EFIELDW',CLUOUT,XEFIELDW) + CALL IO_WRITE_FIELD(TPFILE,'EFIELDU',XEFIELDU) + CALL IO_WRITE_FIELD(TPFILE,'EFIELDV',XEFIELDV) + CALL IO_WRITE_FIELD(TPFILE,'EFIELDW',XEFIELDW) ! TZFIELD%CMNHNAME = 'EMODULE' TZFIELD%CSTDNAME = '' @@ -846,34 +846,34 @@ IF (NSV >=1) THEN TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 ZWORK3D(:,:,:) = (XEFIELDU**2 + XEFIELDV**2 + XEFIELDW**2)**0.5 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK3D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK3D) ! CALL FIND_FIELD_ID_FROM_MNHNAME('NI_IAGGS',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'pC m-3 s-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XNI_IAGGS*1.E12) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XNI_IAGGS*1.E12) ! CALL FIND_FIELD_ID_FROM_MNHNAME('NI_IDRYG',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'pC m-3 s-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XNI_IDRYG*1.E12) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XNI_IDRYG*1.E12) ! CALL FIND_FIELD_ID_FROM_MNHNAME('NI_SDRYG',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'pC m-3 s-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XNI_SDRYG*1.E12) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XNI_SDRYG*1.E12) ! CALL FIND_FIELD_ID_FROM_MNHNAME('INDUC_CG',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'pC m-3 s-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XIND_RATE*1.E12) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XIND_RATE*1.E12) ! - CALL IO_WRITE_FIELD(TPFILE,'TRIG_IC', CLUOUT,NMAP_TRIG_IC) - CALL IO_WRITE_FIELD(TPFILE,'IMPACT_CG', CLUOUT,NMAP_IMPACT_CG) - CALL IO_WRITE_FIELD(TPFILE,'AREA_CG', CLUOUT,NMAP_2DAREA_CG) - CALL IO_WRITE_FIELD(TPFILE,'AREA_IC', CLUOUT,NMAP_2DAREA_IC) - CALL IO_WRITE_FIELD(TPFILE,'FLASH_3DCG',CLUOUT,NMAP_3DCG) - CALL IO_WRITE_FIELD(TPFILE,'FLASH_3DIC',CLUOUT,NMAP_3DIC) + CALL IO_WRITE_FIELD(TPFILE,'TRIG_IC', NMAP_TRIG_IC) + CALL IO_WRITE_FIELD(TPFILE,'IMPACT_CG', NMAP_IMPACT_CG) + CALL IO_WRITE_FIELD(TPFILE,'AREA_CG', NMAP_2DAREA_CG) + CALL IO_WRITE_FIELD(TPFILE,'AREA_IC', NMAP_2DAREA_IC) + CALL IO_WRITE_FIELD(TPFILE,'FLASH_3DCG',NMAP_3DCG) + CALL IO_WRITE_FIELD(TPFILE,'FLASH_3DIC',NMAP_3DIC) ! IF (LLNOX_EXPLICIT) THEN TZFIELD%CMNHNAME = 'LINOX' @@ -885,7 +885,7 @@ IF (NSV >=1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,NSV_LNOXEND)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,NSV_LNOXEND)) JSA=JSA+1 END IF END IF @@ -902,7 +902,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(CLGNAMES(JSV-NSV_LGBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) JSA=JSA+1 END DO END IF @@ -919,18 +919,18 @@ IF (NSV >=1) THEN WRITE(TZFIELD%CMNHNAME,'(A3,I3.3)')'SVT',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) JSA=JSA+1 END DO END IF ! IF ( ((CCLOUD == 'KHKO') .OR.(CCLOUD == 'C2R2')) .AND. (.NOT. LSUPSAT)) THEN - CALL IO_WRITE_FIELD(TPFILE,'SUPSATMAX',CLUOUT,XSUPSAT(:,:,:)) - CALL IO_WRITE_FIELD(TPFILE,'NACT', CLUOUT,XNACT(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,'SUPSATMAX',XSUPSAT(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,'NACT', XNACT(:,:,:)) END IF IF ( ((CCLOUD == 'KHKO') .OR.(CCLOUD == 'C2R2')) .AND. LSUPSAT) THEN - CALL IO_WRITE_FIELD(TPFILE,'SSPRO',CLUOUT,XSSPRO(:,:,:)) - CALL IO_WRITE_FIELD(TPFILE,'NPRO', CLUOUT,XNPRO(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,'SSPRO',XSSPRO(:,:,:)) + CALL IO_WRITE_FIELD(TPFILE,'NPRO', XNPRO(:,:,:)) END IF ! #ifdef MNH_FOREFIRE @@ -947,7 +947,7 @@ IF (NSV >=1) THEN WRITE(TZFIELD%CMNHNAME,'(A3,I3.3)')'SVT',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) JSA=JSA+1 END DO END IF @@ -965,7 +965,7 @@ IF (NSV >=1) THEN WRITE(TZFIELD%CMNHNAME,'(A3,I3.3)')'SVT',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) JSA=JSA+1 END DO ! @@ -996,7 +996,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CNAMES(JSV-NSV_CHEMBEG+1)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) ! YCHNAMES(JSV-JSA)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) ! without T END DO @@ -1006,7 +1006,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CICNAMES(JSV-NSV_CHICBEG+1)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3,A8)')'X_Y_Z_','SVT',JSV,' (ppp)' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) ! YCHNAMES(JSV-JSA)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) ! without M END DO @@ -1019,14 +1019,14 @@ IF (NSV >=1) THEN TZFIELD%CUNITS = 'mol i m-2' TZFIELD%CCOMMENT = 'X_Y_Accumulated moles of aqueous species at the surface' ZWORK2D(:,:) = XACPRAQ(:,:,JSV-NSV_CHACBEG-NSV_CHAC/2+1) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK2D) END DO TZFIELD%NDIMS = 3 END IF IF (LUSECHAQ.AND.LCH_PH) THEN ! pH values in cloud - CALL IO_WRITE_FIELD(TPFILE,'PHC',CLUOUT,XPHC) + CALL IO_WRITE_FIELD(TPFILE,'PHC',XPHC) IF (NRR>=3) THEN - CALL IO_WRITE_FIELD(TPFILE,'PHR',CLUOUT,XPHR) + CALL IO_WRITE_FIELD(TPFILE,'PHR',XPHR) ! compute mean pH in accumulated surface water !ZWORK2D(:,:) = 10**(-XCH_PHINIT) WHERE (XACPRR > 0.) @@ -1046,7 +1046,7 @@ IF (NSV >=1) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK2D) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK2D) ENDIF ENDIF ELSE IF (LCH_CONV_LINOX) THEN @@ -1061,7 +1061,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = 'LINOXT' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)') 'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) YCHNAMES(JSV-JSA)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) END DO ENDIF @@ -1083,7 +1083,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(UPCASE(CAERONAMES(JSV-NSV_AERBEG+1)))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) IF (JSV==NSV_AERBEG) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_AERBEG ',JSV IF (JSV==NSV_AEREND) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_AEREND ',JSV YCHNAMES(JSV-JSA)= TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) @@ -1101,7 +1101,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(CDEAERNAMES(JSV-NSV_AERDEPBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) IF (JSV==NSV_AERDEPBEG) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_AERDEPBEG ',JSV IF (JSV==NSV_AERDEPEND) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_AERDEPEND ',JSV YCHNAMES(JSV-JSA) = TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) @@ -1148,7 +1148,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(YPDUST_INI(ISV_NAME_IDX))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) YDSTNAMES((JMODE-1)*IMOMENTS+1)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) END DO ! Loop on mode ELSE @@ -1161,7 +1161,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(YPDUST_INI(ISV_NAME_IDX))//'T' !The refererence which will be written to file TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) YDSTNAMES((JMODE-1)*IMOMENTS+JMOM)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) END DO ! Loop on moment END DO ! loop on mode @@ -1186,7 +1186,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(CDUSTNAMES(JSV-NSV_DSTBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) IF (JSV==NSV_DSTBEG) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_DSTBEG ',JSV IF (JSV==NSV_DSTEND) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_DSTEND ',JSV YCHNAMES(JSV-JSA) = TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) @@ -1204,7 +1204,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(CDEDSTNAMES(JSV-NSV_DSTDEPBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) IF (JSV==NSV_DSTDEPBEG) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_DSTDEPBEG ',JSV IF (JSV==NSV_DSTDEPEND) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_DSTDEPEND ',JSV YCHNAMES(JSV-JSA) = TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) @@ -1252,7 +1252,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(YPSALT_INI(ISV_NAME_IDX))//'T' !The refererence which will be written to file TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) YSLTNAMES((JMODE-1)*IMOMENTS+JMOM)=TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) END DO ! Loop on moments END DO ! Loop on modes @@ -1275,7 +1275,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(CSALTNAMES(JSV-NSV_SLTBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) IF (JSV==NSV_SLTBEG) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_SLTBEG ',JSV IF (JSV==NSV_SLTEND) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_SLTEND ',JSV YCHNAMES(JSV-JSA) = TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) @@ -1293,7 +1293,7 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(CDESLTNAMES(JSV-NSV_SLTDEPBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) IF (JSV==NSV_SLTDEPBEG) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_SLTDEPBEG ',JSV IF (JSV==NSV_SLTDEPEND) WRITE(ILUOUT,*)'MNHC: write_lfin:NSV_SLTDEPEND ',JSV YCHNAMES(JSV-JSA) = TZFIELD%CMNHNAME(1:LEN_TRIM(TZFIELD%CMNHNAME)-1) @@ -1313,7 +1313,7 @@ IF (NSV >=1) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ICH_NBR) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ICH_NBR) ! IF (ICH_NBR/=0) THEN TZFIELD%CMNHNAME = 'NSV.TITRE' @@ -1333,7 +1333,7 @@ IF (NSV >=1) THEN ICH_NAMES(ILREC*(JSV-1)+JT) = ICHAR(YCHNAMES(JSV)(JT:JT)) ENDDO ENDDO - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ICH_NAMES) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ICH_NAMES) DEALLOCATE(YCHNAMES,ICH_NAMES) END IF ! @@ -1350,63 +1350,63 @@ IF (NSV >=1) THEN TZFIELD%CMNHNAME = TRIM(CLGNAMES(JSV-NSV_LGBEG+1))//'T' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A3,I3.3)')'X_Y_Z_','SVT',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XSVT(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XSVT(:,:,:,JSV)) END DO END IF END IF ! ! -CALL IO_WRITE_FIELD(TPFILE,'LSUM', CLUOUT,XLSUM) -CALL IO_WRITE_FIELD(TPFILE,'LSVM', CLUOUT,XLSVM) -CALL IO_WRITE_FIELD(TPFILE,'LSWM', CLUOUT,XLSWM) -CALL IO_WRITE_FIELD(TPFILE,'LSTHM',CLUOUT,XLSTHM) -IF (LUSERV) CALL IO_WRITE_FIELD(TPFILE,'LSRVM',CLUOUT,XLSRVM) +CALL IO_WRITE_FIELD(TPFILE,'LSUM', XLSUM) +CALL IO_WRITE_FIELD(TPFILE,'LSVM', XLSVM) +CALL IO_WRITE_FIELD(TPFILE,'LSWM', XLSWM) +CALL IO_WRITE_FIELD(TPFILE,'LSTHM',XLSTHM) +IF (LUSERV) CALL IO_WRITE_FIELD(TPFILE,'LSRVM',XLSRVM) ! CALL WRITE_LB_n(TPFILE) ! ! -CALL IO_WRITE_FIELD(TPFILE,'DRYMASST',CLUOUT,XDRYMASST) +CALL IO_WRITE_FIELD(TPFILE,'DRYMASST',XDRYMASST) ! IF( CTURB /= 'NONE' .AND. CTOM=='TM06') THEN - CALL IO_WRITE_FIELD(TPFILE,'BL_DEPTH',CLUOUT,XBL_DEPTH) + CALL IO_WRITE_FIELD(TPFILE,'BL_DEPTH',XBL_DEPTH) END IF ! IF( CTURB /= 'NONE' .AND. LRMC01) THEN - CALL IO_WRITE_FIELD(TPFILE,'SBL_DEPTH',CLUOUT,XBL_DEPTH) + CALL IO_WRITE_FIELD(TPFILE,'SBL_DEPTH',XBL_DEPTH) END IF ! IF( CTURB /= 'NONE' .AND. (CPROGRAM == 'MESONH' .OR. CPROGRAM == 'DIAG')) THEN - CALL IO_WRITE_FIELD(TPFILE,'WTHVMF',CLUOUT,XWTHVMF) + CALL IO_WRITE_FIELD(TPFILE,'WTHVMF',XWTHVMF) END IF ! IF( NRR > 1 .AND. CTURB /= 'NONE' ) THEN - CALL IO_WRITE_FIELD(TPFILE,'SRCT',CLUOUT,XSRCT) - CALL IO_WRITE_FIELD(TPFILE,'SIGS',CLUOUT,XSIGS) + CALL IO_WRITE_FIELD(TPFILE,'SRCT',XSRCT) + CALL IO_WRITE_FIELD(TPFILE,'SIGS',XSIGS) END IF ! !* 1.5 Reference state variables : ! -CALL IO_WRITE_FIELD(TPFILE,'RHOREFZ',CLUOUT,XRHODREFZ) -CALL IO_WRITE_FIELD(TPFILE,'THVREFZ',CLUOUT,XTHVREFZ) -CALL IO_WRITE_FIELD(TPFILE,'EXNTOP', CLUOUT,XEXNTOP) +CALL IO_WRITE_FIELD(TPFILE,'RHOREFZ',XRHODREFZ) +CALL IO_WRITE_FIELD(TPFILE,'THVREFZ',XTHVREFZ) +CALL IO_WRITE_FIELD(TPFILE,'EXNTOP', XEXNTOP) ! ! !* 1.6 Tendencies ! IF (CPROGRAM == 'MESONH') THEN - CALL IO_WRITE_FIELD(TPFILE,'US_PRES',CLUOUT,XRUS_PRES) - CALL IO_WRITE_FIELD(TPFILE,'VS_PRES',CLUOUT,XRVS_PRES) - CALL IO_WRITE_FIELD(TPFILE,'WS_PRES',CLUOUT,XRWS_PRES) - CALL IO_WRITE_FIELD(TPFILE,'THS_CLD',CLUOUT,XRTHS_CLD) + CALL IO_WRITE_FIELD(TPFILE,'US_PRES',XRUS_PRES) + CALL IO_WRITE_FIELD(TPFILE,'VS_PRES',XRVS_PRES) + CALL IO_WRITE_FIELD(TPFILE,'WS_PRES',XRWS_PRES) + CALL IO_WRITE_FIELD(TPFILE,'THS_CLD',XRTHS_CLD) ! IF (NRR >=1) THEN - IF (LUSERV) CALL IO_WRITE_FIELD(TPFILE,'RVS_CLD',CLUOUT,XRRS_CLD(:,:,:,IDX_RVT)) - IF (LUSERC) CALL IO_WRITE_FIELD(TPFILE,'RCS_CLD',CLUOUT,XRRS_CLD(:,:,:,IDX_RCT)) - IF (LUSERR) CALL IO_WRITE_FIELD(TPFILE,'RRS_CLD',CLUOUT,XRRS_CLD(:,:,:,IDX_RRT)) - IF (LUSERI) CALL IO_WRITE_FIELD(TPFILE,'RIS_CLD',CLUOUT,XRRS_CLD(:,:,:,IDX_RIT)) - IF (LUSERS) CALL IO_WRITE_FIELD(TPFILE,'RSS_CLD',CLUOUT,XRRS_CLD(:,:,:,IDX_RST)) - IF (LUSERG) CALL IO_WRITE_FIELD(TPFILE,'RGS_CLD',CLUOUT,XRRS_CLD(:,:,:,IDX_RGT)) - IF (LUSERH) CALL IO_WRITE_FIELD(TPFILE,'RHS_CLD',CLUOUT,XRRS_CLD(:,:,:,IDX_RHT)) + IF (LUSERV) CALL IO_WRITE_FIELD(TPFILE,'RVS_CLD',XRRS_CLD(:,:,:,IDX_RVT)) + IF (LUSERC) CALL IO_WRITE_FIELD(TPFILE,'RCS_CLD',XRRS_CLD(:,:,:,IDX_RCT)) + IF (LUSERR) CALL IO_WRITE_FIELD(TPFILE,'RRS_CLD',XRRS_CLD(:,:,:,IDX_RRT)) + IF (LUSERI) CALL IO_WRITE_FIELD(TPFILE,'RIS_CLD',XRRS_CLD(:,:,:,IDX_RIT)) + IF (LUSERS) CALL IO_WRITE_FIELD(TPFILE,'RSS_CLD',XRRS_CLD(:,:,:,IDX_RST)) + IF (LUSERG) CALL IO_WRITE_FIELD(TPFILE,'RGS_CLD',XRRS_CLD(:,:,:,IDX_RGT)) + IF (LUSERH) CALL IO_WRITE_FIELD(TPFILE,'RHS_CLD',XRRS_CLD(:,:,:,IDX_RHT)) END IF END IF ! @@ -1423,7 +1423,7 @@ END IF ! TZFIELD%NGRID = 1 ! TZFIELD%NTYPE = TYPEREAL ! TZFIELD%NDIMS = 3 -! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRRS_CLD(:,:,:,IRR)) +! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRRS_CLD(:,:,:,IRR)) ! END IF ! IF (JSV == NSV_C2R2END ) THEN ! TZFIELD%CMNHNAME = 'RSVS_CLD2' @@ -1435,7 +1435,7 @@ END IF ! TZFIELD%NGRID = 1 ! TZFIELD%NTYPE = TYPEREAL ! TZFIELD%NDIMS = 3 -! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRRS_CLD(:,:,:,IRR)) +! CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRRS_CLD(:,:,:,IRR)) ! END IF ! END DO ! END IF @@ -1444,25 +1444,25 @@ END IF ! ! IF (CRAD /= 'NONE') THEN - CALL IO_WRITE_FIELD(TPFILE,'DTRAD_FULL',CLUOUT,TDTRAD_FULL) - CALL IO_WRITE_FIELD(TPFILE,'DTRAD_CLLY',CLUOUT,TDTRAD_CLONLY) -! - CALL IO_WRITE_FIELD(TPFILE,'DTHRAD', CLUOUT,XDTHRAD) - CALL IO_WRITE_FIELD(TPFILE,'FLALWD', CLUOUT,XFLALWD) - CALL IO_WRITE_FIELD(TPFILE,'DIRFLASWD', CLUOUT,XDIRFLASWD) - CALL IO_WRITE_FIELD(TPFILE,'SCAFLASWD', CLUOUT,XSCAFLASWD) - CALL IO_WRITE_FIELD(TPFILE,'DIRSRFSWD', CLUOUT,XDIRSRFSWD) - CALL IO_WRITE_FIELD(TPFILE,'CLEARCOL_TM1',CLUOUT,NCLEARCOL_TM1) - CALL IO_WRITE_FIELD(TPFILE,'ZENITH', CLUOUT,XZENITH) - CALL IO_WRITE_FIELD(TPFILE,'AZIM', CLUOUT,XAZIM) - CALL IO_WRITE_FIELD(TPFILE,'DIR_ALB', CLUOUT,XDIR_ALB) - CALL IO_WRITE_FIELD(TPFILE,'SCA_ALB', CLUOUT,XSCA_ALB) - CALL IO_WRITE_FIELD(TPFILE,'EMIS', CLUOUT,XEMIS) - CALL IO_WRITE_FIELD(TPFILE,'TSRAD', CLUOUT,XTSRAD) + CALL IO_WRITE_FIELD(TPFILE,'DTRAD_FULL',TDTRAD_FULL) + CALL IO_WRITE_FIELD(TPFILE,'DTRAD_CLLY',TDTRAD_CLONLY) +! + CALL IO_WRITE_FIELD(TPFILE,'DTHRAD', XDTHRAD) + CALL IO_WRITE_FIELD(TPFILE,'FLALWD', XFLALWD) + CALL IO_WRITE_FIELD(TPFILE,'DIRFLASWD', XDIRFLASWD) + CALL IO_WRITE_FIELD(TPFILE,'SCAFLASWD', XSCAFLASWD) + CALL IO_WRITE_FIELD(TPFILE,'DIRSRFSWD', XDIRSRFSWD) + CALL IO_WRITE_FIELD(TPFILE,'CLEARCOL_TM1',NCLEARCOL_TM1) + CALL IO_WRITE_FIELD(TPFILE,'ZENITH', XZENITH) + CALL IO_WRITE_FIELD(TPFILE,'AZIM', XAZIM) + CALL IO_WRITE_FIELD(TPFILE,'DIR_ALB', XDIR_ALB) + CALL IO_WRITE_FIELD(TPFILE,'SCA_ALB', XSCA_ALB) + CALL IO_WRITE_FIELD(TPFILE,'EMIS', XEMIS) + CALL IO_WRITE_FIELD(TPFILE,'TSRAD', XTSRAD) ENDIF ! IF (NRR > 1 .AND. CPROGRAM == 'MESONH') THEN - CALL IO_WRITE_FIELD(TPFILE,'CLDFR',CLUOUT,XCLDFR) + CALL IO_WRITE_FIELD(TPFILE,'CLDFR',XCLDFR) END IF ! ! @@ -1473,33 +1473,33 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN ! ! ! - CALL IO_WRITE_FIELD(TPFILE,'DTDCONV', CLUOUT,TDTDCONV) - CALL IO_WRITE_FIELD(TPFILE,'COUNTCONV',CLUOUT,NCOUNTCONV) - CALL IO_WRITE_FIELD(TPFILE,'DTHCONV', CLUOUT,XDTHCONV) - CALL IO_WRITE_FIELD(TPFILE,'DRVCONV', CLUOUT,XDRVCONV) - CALL IO_WRITE_FIELD(TPFILE,'DRCCONV', CLUOUT,XDRCCONV) - CALL IO_WRITE_FIELD(TPFILE,'DRICONV', CLUOUT,XDRICONV) + CALL IO_WRITE_FIELD(TPFILE,'DTDCONV', TDTDCONV) + CALL IO_WRITE_FIELD(TPFILE,'COUNTCONV',NCOUNTCONV) + CALL IO_WRITE_FIELD(TPFILE,'DTHCONV', XDTHCONV) + CALL IO_WRITE_FIELD(TPFILE,'DRVCONV', XDRVCONV) + CALL IO_WRITE_FIELD(TPFILE,'DRCCONV', XDRCCONV) + CALL IO_WRITE_FIELD(TPFILE,'DRICONV', XDRICONV) ! CALL FIND_FIELD_ID_FROM_MNHNAME('PRCONV',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPRCONV*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPRCONV*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('PACCONV',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPACCONV*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPACCONV*1.0E3) ! CALL FIND_FIELD_ID_FROM_MNHNAME('PRSCONV',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPRSCONV*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPRSCONV*3.6E6) ! IF ( LCH_CONV_LINOX ) THEN - CALL IO_WRITE_FIELD(TPFILE,'IC_RATE', CLUOUT,XIC_RATE) - CALL IO_WRITE_FIELD(TPFILE,'CG_RATE', CLUOUT,XCG_RATE) - CALL IO_WRITE_FIELD(TPFILE,'IC_TOTAL_NB',CLUOUT,XIC_TOTAL_NUMBER) - CALL IO_WRITE_FIELD(TPFILE,'CG_TOTAL_NB',CLUOUT,XCG_TOTAL_NUMBER) + CALL IO_WRITE_FIELD(TPFILE,'IC_RATE', XIC_RATE) + CALL IO_WRITE_FIELD(TPFILE,'CG_RATE', XCG_RATE) + CALL IO_WRITE_FIELD(TPFILE,'IC_TOTAL_NB',XIC_TOTAL_NUMBER) + CALL IO_WRITE_FIELD(TPFILE,'CG_TOTAL_NB',XCG_TOTAL_NUMBER) END IF ! IF ( LCHTRANS .AND. NSV > 0 ) THEN @@ -1516,31 +1516,31 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN WRITE(TZFIELD%CMNHNAME,'(A7,I3.3)')'DSVCONV',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO DO JSV = NSV_C2R2BEG, NSV_C2R2END TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(C2R2NAMES(JSV-NSV_C2R2BEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO DO JSV = NSV_C1R3BEG, NSV_C1R3END TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(C1R3NAMES(JSV-NSV_C1R3BEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO DO JSV = NSV_ELECBEG, NSV_ELECEND TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(CELECNAMES(JSV-NSV_ELECBEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO DO JSV = NSV_PPBEG, NSV_PPEND WRITE(TZFIELD%CMNHNAME,'(A7,I3.3)')'DSVCONV',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO #ifdef MNH_FOREFIRE IF (LFOREFIRE) THEN @@ -1548,7 +1548,7 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN WRITE(TZFIELD%CMNHNAME,'(A7,I3.3)')'DSVCONV',JSV TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF #endif @@ -1557,14 +1557,14 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(UPCASE(CNAMES(JSV-NSV_CHEMBEG+1))) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO IF (LORILAM) THEN DO JSV = NSV_AERBEG, NSV_AEREND TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(UPCASE(CAERONAMES(JSV-NSV_AERBEG+1))) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF ! linox scalar variables @@ -1573,26 +1573,26 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN TZFIELD%CMNHNAME = 'DSVCONV_LINOX' TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF DO JSV = NSV_LGBEG, NSV_LGEND TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(CLGNAMES(JSV-NSV_LGBEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO DO JSV = NSV_DSTBEG, NSV_DSTEND TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(CDUSTNAMES(JSV-NSV_DSTBEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO DO JSV = NSV_SLTBEG, NSV_SLTEND TZFIELD%CMNHNAME = 'DSVCONV_'//TRIM(CSALTNAMES(JSV-NSV_SLTBEG+1)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) WRITE(TZFIELD%CCOMMENT,'(A6,A7,I3.3)')'X_Y_Z_','DSVCONV',JSV - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDSVCONV(:,:,:,JSV)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDSVCONV(:,:,:,JSV)) END DO END IF ! @@ -1607,12 +1607,12 @@ IF (CPROGRAM /= 'IDEAL') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRC',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRC*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRC*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRC',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRC*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRC*1.0E3) ENDIF ENDIF ! @@ -1621,15 +1621,15 @@ IF (CPROGRAM /= 'IDEAL') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRR',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRR*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRR*3.6E6) ! - CALL IO_WRITE_FIELD(TPFILE,'INPRR3D',CLUOUT,XINPRR3D) - CALL IO_WRITE_FIELD(TPFILE,'EVAP3D', CLUOUT,XEVAP3D) + CALL IO_WRITE_FIELD(TPFILE,'INPRR3D',XINPRR3D) + CALL IO_WRITE_FIELD(TPFILE,'EVAP3D', XEVAP3D) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRR',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRR*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRR*1.0E3) ! ENDIF ENDIF @@ -1639,12 +1639,12 @@ IF (CPROGRAM /= 'IDEAL') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRS',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRS*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRS*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRS',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRS*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRS*1.0E3) END IF END IF ! @@ -1653,12 +1653,12 @@ IF (CPROGRAM /= 'IDEAL') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRG',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRG*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRG*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRG',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRG*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRG*1.0E3) END IF END IF ! @@ -1667,12 +1667,12 @@ IF (CPROGRAM /= 'IDEAL') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRH',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XINPRH*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XINPRH*3.6E6) ! CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRH',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XACPRH*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XACPRH*1.0E3) ENDIF ENDIF ! @@ -1685,7 +1685,7 @@ IF (CPROGRAM /= 'IDEAL') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('INPRT',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm hour-1' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK2D*3.6E6) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK2D*3.6E6) ! ZWORK2D = XACPRR + XACPRS IF (SIZE(XINPRG) /= 0 ) ZWORK2D = ZWORK2D + XACPRG @@ -1694,7 +1694,7 @@ IF (CPROGRAM /= 'IDEAL') THEN CALL FIND_FIELD_ID_FROM_MNHNAME('ACPRT',IID,IRESP) TZFIELD = TFIELDLIST(IID) TZFIELD%CUNITS = 'mm' - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,ZWORK2D*1.0E3) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,ZWORK2D*1.0E3) END IF END IF ! @@ -1715,7 +1715,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,NFRC) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,NFRC) ! DO JT=1,NFRC ! @@ -1730,7 +1730,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEDATE TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,TDTFRC(JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,TDTFRC(JT)) ! TZFIELD%CMNHNAME = 'UFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1741,7 +1741,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XUFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XUFRC(:,JT)) ! TZFIELD%CMNHNAME = 'VFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1752,7 +1752,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XVFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XVFRC(:,JT)) ! TZFIELD%CMNHNAME = 'WFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1763,7 +1763,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XWFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XWFRC(:,JT)) ! TZFIELD%CMNHNAME = 'THFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1774,7 +1774,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'RVFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1785,7 +1785,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRVFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRVFRC(:,JT)) ! TZFIELD%CMNHNAME = 'TENDTHFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1796,7 +1796,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTENDTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTENDTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'TENDRVFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1807,7 +1807,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTENDRVFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTENDRVFRC(:,JT)) ! TZFIELD%CMNHNAME = 'GXTHFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1818,7 +1818,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XGXTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XGXTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'GYTHFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1829,7 +1829,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XGYTHFRC(:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XGYTHFRC(:,JT)) ! TZFIELD%CMNHNAME = 'PGROUNDFRC'//YFRC TZFIELD%CSTDNAME = '' @@ -1840,7 +1840,7 @@ IF (LFORCING) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XPGROUNDFRC(JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XPGROUNDFRC(JT)) ! END DO ! @@ -1859,7 +1859,7 @@ IF ( L2D_ADV_FRC ) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,NADVFRC) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,NADVFRC) ! DO JT=1,NADVFRC ! @@ -1874,7 +1874,7 @@ IF ( L2D_ADV_FRC ) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEDATE TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,TDTADVFRC(JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,TDTADVFRC(JT)) ! TZFIELD%CMNHNAME = 'TH_ADV'//YFRC TZFIELD%CSTDNAME = '' @@ -1885,7 +1885,7 @@ IF ( L2D_ADV_FRC ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDTHFRC(:,:,:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDTHFRC(:,:,:,JT)) ! TZFIELD%CMNHNAME = 'Q_ADV'//YFRC TZFIELD%CSTDNAME = '' @@ -1896,7 +1896,7 @@ IF ( L2D_ADV_FRC ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDRVFRC(:,:,:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDRVFRC(:,:,:,JT)) ! ENDDO ENDIF @@ -1912,7 +1912,7 @@ IF ( L2D_REL_FRC ) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,NRELFRC) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,NRELFRC) ! DO JT=1,NRELFRC ! @@ -1927,7 +1927,7 @@ IF ( L2D_REL_FRC ) THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEDATE TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,TDTRELFRC(JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,TDTRELFRC(JT)) ! TZFIELD%CMNHNAME = 'TH_REL'//YFRC TZFIELD%CSTDNAME = '' @@ -1938,7 +1938,7 @@ IF ( L2D_REL_FRC ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XTHREL(:,:,:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XTHREL(:,:,:,JT)) ! TZFIELD%CMNHNAME = 'Q_REL'//YFRC TZFIELD%CSTDNAME = '' @@ -1949,7 +1949,7 @@ IF ( L2D_REL_FRC ) THEN TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XRVREL(:,:,:,JT)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XRVREL(:,:,:,JT)) ! ENDDO ENDIF @@ -1957,11 +1957,11 @@ ENDIF !* 1.11bis Eddy Fluxes variables ! Modif PP ! IF ( LTH_FLX ) THEN - CALL IO_WRITE_FIELD(TPFILE,'VT_FLX',CLUOUT,XVTH_FLUX_M) - CALL IO_WRITE_FIELD(TPFILE,'WT_FLX',CLUOUT,XWTH_FLUX_M) + CALL IO_WRITE_FIELD(TPFILE,'VT_FLX',XVTH_FLUX_M) + CALL IO_WRITE_FIELD(TPFILE,'WT_FLX',XWTH_FLUX_M) END IF ! -IF ( LUV_FLX) CALL IO_WRITE_FIELD(TPFILE,'VU_FLX',CLUOUT,XVU_FLUX_M) +IF ( LUV_FLX) CALL IO_WRITE_FIELD(TPFILE,'VU_FLX',XVU_FLUX_M) ! !* 1.12 Balloon variables ! @@ -1979,36 +1979,36 @@ IF ( CPROGRAM=='REAL ' ) THEN ! ! i) Total fields (TOT=BASIC+TOTDIS) ! - CALL IO_WRITE_FIELD(TPFILE,'UT15', CLUOUT,XUTOT) - CALL IO_WRITE_FIELD(TPFILE,'VT15', CLUOUT,XVTOT) - CALL IO_WRITE_FIELD(TPFILE,'TEMPTOT',CLUOUT,XTTOT) - IF (INDEX(CFILTERING,'P')/=0) CALL IO_WRITE_FIELD(TPFILE,'PRESTOT',CLUOUT,XPTOT) - IF (INDEX(CFILTERING,'Q')/=0) CALL IO_WRITE_FIELD(TPFILE,'HUMTOT', CLUOUT,XQTOT) + CALL IO_WRITE_FIELD(TPFILE,'UT15', XUTOT) + CALL IO_WRITE_FIELD(TPFILE,'VT15', XVTOT) + CALL IO_WRITE_FIELD(TPFILE,'TEMPTOT',XTTOT) + IF (INDEX(CFILTERING,'P')/=0) CALL IO_WRITE_FIELD(TPFILE,'PRESTOT',XPTOT) + IF (INDEX(CFILTERING,'Q')/=0) CALL IO_WRITE_FIELD(TPFILE,'HUMTOT', XQTOT) ! ! ii) Environmental fields (ENV=TOT-VORDIS) ! - CALL IO_WRITE_FIELD(TPFILE,'UT16', CLUOUT,XUENV) - CALL IO_WRITE_FIELD(TPFILE,'VT16', CLUOUT,XVENV) - CALL IO_WRITE_FIELD(TPFILE,'TEMPENV',CLUOUT,XTENV) - IF (INDEX(CFILTERING,'P')/=0) CALL IO_WRITE_FIELD(TPFILE,'PRESENV',CLUOUT,XPENV) - IF (INDEX(CFILTERING,'Q')/=0) CALL IO_WRITE_FIELD(TPFILE,'HUMENV', CLUOUT,XQENV) + CALL IO_WRITE_FIELD(TPFILE,'UT16', XUENV) + CALL IO_WRITE_FIELD(TPFILE,'VT16', XVENV) + CALL IO_WRITE_FIELD(TPFILE,'TEMPENV',XTENV) + IF (INDEX(CFILTERING,'P')/=0) CALL IO_WRITE_FIELD(TPFILE,'PRESENV',XPENV) + IF (INDEX(CFILTERING,'Q')/=0) CALL IO_WRITE_FIELD(TPFILE,'HUMENV', XQENV) ! END IF IF (NDIAG_FILT >=1) THEN ! ! iii) Basic (filtered) fields ! - CALL IO_WRITE_FIELD(TPFILE,'UT17', CLUOUT,XUBASIC) - CALL IO_WRITE_FIELD(TPFILE,'VT17', CLUOUT,XVBASIC) - CALL IO_WRITE_FIELD(TPFILE,'TEMPBAS',CLUOUT,XTBASIC) - IF (INDEX(CFILTERING,'P')/=0) CALL IO_WRITE_FIELD(TPFILE,'PRESBAS',CLUOUT,XPBASIC) - IF (INDEX(CFILTERING,'Q')/=0) CALL IO_WRITE_FIELD(TPFILE,'HUMBAS', CLUOUT,XQBASIC) + CALL IO_WRITE_FIELD(TPFILE,'UT17', XUBASIC) + CALL IO_WRITE_FIELD(TPFILE,'VT17', XVBASIC) + CALL IO_WRITE_FIELD(TPFILE,'TEMPBAS',XTBASIC) + IF (INDEX(CFILTERING,'P')/=0) CALL IO_WRITE_FIELD(TPFILE,'PRESBAS',XPBASIC) + IF (INDEX(CFILTERING,'Q')/=0) CALL IO_WRITE_FIELD(TPFILE,'HUMBAS', XQBASIC) END IF IF (NDIAG_FILT >=2) THEN ! ! iv) Total disturbance tangential wind ! - CALL IO_WRITE_FIELD(TPFILE,'VTDIS',CLUOUT,XVTDIS) + CALL IO_WRITE_FIELD(TPFILE,'VTDIS',XVTDIS) ! END IF ! @@ -2028,7 +2028,7 @@ IF ( CPROGRAM=='REAL ' ) THEN TZFIELD%CMNHNAME = ADJUSTL(CDUMMY_2D(JSA)) TZFIELD%CLONGNAME = 'MesoNH: '//TRIM(TZFIELD%CMNHNAME) TZFIELD%CCOMMENT = 'X_Y_Z_'//TRIM(TZFIELD%CMNHNAME) - CALL IO_WRITE_FIELD(TPFILE,TZFIELD,CLUOUT,XDUMMY_2D(:,:,JSA)) + CALL IO_WRITE_FIELD(TPFILE,TZFIELD,XDUMMY_2D(:,:,JSA)) END DO END IF ! diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90 index f324aa212..c92d7c5b6 100644 --- a/src/MNH/write_surf_mnh.f90 +++ b/src/MNH/write_surf_mnh.f90 @@ -61,7 +61,6 @@ USE MODE_MSG ! USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY: COUT, NLUOUT ! IMPLICIT NONE ! @@ -98,7 +97,7 @@ ELSE TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,PFIELD,KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,PFIELD,KRESP) ! IF (KRESP /=0) THEN WRITE ( YMSG, '( I5 )' ) KRESP @@ -156,7 +155,7 @@ USE MODE_TOOLS_ll ! USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY :COUT, NLUOUT, NMASK, CMASK, & +USE MODD_IO_SURF_MNH, ONLY :NMASK, CMASK, & NIU, NJU, NIB, NJB, NIE, NJE, & NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, & NIE_ALL, NJE_ALL, NMASK_ALL, NHALO @@ -306,7 +305,7 @@ IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') & TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZW1D(:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(:),KRESP) END IF IF (HDIR=='H') THEN TZFIELD%CMNHNAME = 'XHAT' @@ -318,7 +317,7 @@ IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') & TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZW1D(1+NHALO:IIU-NHALO),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(1+NHALO:IIU-NHALO),KRESP) END IF DEALLOCATE(ZW1D) ELSE IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') & @@ -346,7 +345,7 @@ ELSE IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') & TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZW1D(:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(:),KRESP) END IF IF (HDIR=='H') THEN TZFIELD%CMNHNAME = 'YHAT' @@ -358,7 +357,7 @@ ELSE IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') & TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZW1D(1+NHALO:IJU-NHALO),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZW1D(1+NHALO:IJU-NHALO),KRESP) END IF DEALLOCATE(ZW1D) ELSE IF (HDIR=='H') THEN @@ -371,7 +370,7 @@ ELSE IF (HDIR=='H') THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZWORK(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZWORK(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO),KRESP) ELSE IF (HDIR=='A') THEN TZFIELD%CMNHNAME = TRIM(HREC) TZFIELD%CSTDNAME = '' @@ -382,7 +381,7 @@ ELSE IF (HDIR=='A') THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZWORK(:,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZWORK(:,:),KRESP) ELSE TZFIELD%CMNHNAME = TRIM(HREC) TZFIELD%CSTDNAME = '' @@ -393,7 +392,7 @@ ELSE TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,PFIELD(:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,PFIELD(:),KRESP) END IF ! IF (KRESP /=0) THEN @@ -457,7 +456,7 @@ USE MODE_TOOLS_ll USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_DATA_COVER_PAR,ONLY : JPCOVER USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY :COUT, NLUOUT, NMASK, CMASK, & +USE MODD_IO_SURF_MNH, ONLY :NMASK, CMASK, & NIU, NJU, NIB, NJB, NIE, NJE, & NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, & NIE_ALL, NJE_ALL, NMASK_ALL, NHALO @@ -550,7 +549,7 @@ TZFIELD%CCOMMENT = '' TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPELOG TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,GCOVER_PACKED,KRESP) +CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,GCOVER_PACKED,KRESP) ! IF (KRESP /=0) THEN WRITE ( YMSG, '( I5 )' ) KRESP @@ -583,7 +582,7 @@ IF (.NOT. GCOVER_PACKED) THEN TZFIELD%CDIR = YDIR IF (OFLAG(JL2)) THEN ICOVER=ICOVER+1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZWORK3D(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO,ICOVER),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZWORK3D(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO,ICOVER),KRESP) END IF END DO ELSE @@ -596,7 +595,7 @@ ELSE TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZWORK3D(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZWORK3D(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO,:),KRESP) END IF ! DEALLOCATE(ZWORK3D) @@ -662,7 +661,7 @@ USE MODE_TOOLS_ll USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_DATA_COVER_PAR,ONLY : JPCOVER USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY :COUT, NLUOUT, NMASK, CMASK, & +USE MODD_IO_SURF_MNH, ONLY :NMASK, CMASK, & NIU, NJU, NIB, NJB, NIE, NJE, & NIU_ALL, NJU_ALL, NIB_ALL, NJB_ALL, & NIE_ALL, NJE_ALL, NMASK_ALL, NHALO @@ -742,7 +741,7 @@ IF (HDIR=='H' .OR. HDIR=='A') THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZWORK(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZWORK(1+NHALO:IIU-NHALO,1+NHALO:IJU-NHALO,:),KRESP) END IF IF (HDIR=='A') THEN TZFIELD%CMNHNAME = TRIM(HREC) @@ -754,7 +753,7 @@ IF (HDIR=='H' .OR. HDIR=='A') THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZWORK(:,:,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZWORK(:,:,:),KRESP) END IF ! DEALLOCATE(ZWORK) @@ -773,7 +772,7 @@ ELSE IF (HDIR=='-') THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ZFIELD(:,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ZFIELD(:,:),KRESP) ! DEALLOCATE(ZFIELD) END IF @@ -833,7 +832,7 @@ USE MODE_MSG ! USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY: COUT, NLUOUT, NIU_ALL, NJU_ALL +USE MODD_IO_SURF_MNH, ONLY: NIU_ALL, NJU_ALL USE MODD_PARAMETERS, ONLY: JPHEXT ! IMPLICIT NONE @@ -873,7 +872,7 @@ ELSE TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,IFIELD,KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,IFIELD,KRESP) END IF ! IF (KRESP /=0) THEN @@ -930,7 +929,7 @@ USE MODE_FIELD, ONLY: TFIELDDATA,TYPEINT USE MODE_MSG ! USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY: COUT, NLUOUT, NMASK, CMASK, & +USE MODD_IO_SURF_MNH, ONLY: NMASK, CMASK, & NIU, NJU, NIB, NJB, NIE, NJE USE MODD_PARAMETERS, ONLY: NUNDEF ! @@ -971,7 +970,7 @@ IF (HDIR=='-') THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,KFIELD,KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,KFIELD,KRESP) ! ELSE IF (HDIR=='H') THEN ! @@ -989,7 +988,7 @@ ELSE IF (HDIR=='H') THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,IWORK(:,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,IWORK(:,:),KRESP) ! DEALLOCATE(IWORK) END IF @@ -1048,7 +1047,7 @@ USE MODE_MSG ! USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY: COUT, NLUOUT, NIU_ALL, NJU_ALL +USE MODD_IO_SURF_MNH, ONLY: NIU_ALL, NJU_ALL ! IMPLICIT NONE ! @@ -1085,7 +1084,7 @@ IF ( (CSTORAGE_TYPE=='PG' .OR. CSTORAGE_TYPE=='SU') & TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPELOG TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,GCARTESIAN,KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,GCARTESIAN,KRESP) ! IF (KRESP /=0) THEN WRITE ( YMSG, '( I5 )' ) KRESP @@ -1103,7 +1102,7 @@ TZFIELD%CCOMMENT = TRIM(HCOMMENT) TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPECHAR TZFIELD%NDIMS = 0 -CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,HFIELD,KRESP) +CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,HFIELD,KRESP) ! IF (KRESP /=0) THEN WRITE ( YMSG, '( I5 )' ) KRESP @@ -1159,7 +1158,7 @@ USE MODE_MSG ! USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY: COUT, NLUOUT, NMASK, CMASK, & +USE MODD_IO_SURF_MNH, ONLY: NMASK, CMASK, & NIU, NJU, NIB, NJB, NIE, NJE ! USE MODI_UNPACK_1D_2D @@ -1204,7 +1203,7 @@ IF (HDIR=='-') THEN TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPELOG TZFIELD%NDIMS = 1 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,OFIELD(:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,OFIELD(:),KRESP) END IF ! ELSE IF (HDIR=='H') THEN @@ -1227,7 +1226,7 @@ ELSE IF (HDIR=='H') THEN TZFIELD%NGRID = 4 TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 2 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,IWORK(:,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,IWORK(:,:),KRESP) ! DEALLOCATE(IWORK) DEALLOCATE(GWORK) @@ -1288,7 +1287,7 @@ USE MODE_MSG ! USE MODD_CONF_n, ONLY: CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY: COUT, NLUOUT, CMASK +USE MODD_IO_SURF_MNH, ONLY: CMASK ! IMPLICIT NONE ! @@ -1320,7 +1319,7 @@ ELSE TZFIELD%NGRID = 0 TZFIELD%NTYPE = TYPELOG TZFIELD%NDIMS = 0 - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,OFIELD,KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,OFIELD,KRESP) END IF ! IF (KRESP /=0) THEN @@ -1378,7 +1377,6 @@ USE MODE_MSG ! USE MODD_CONF_n, ONLY : CSTORAGE_TYPE USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY : COUT, COUTFILE, NLUOUT USE MODD_TYPE_DATE ! ! @@ -1423,7 +1421,7 @@ ELSE TZFIELD%NTYPE = TYPEDATE TZFIELD%NDIMS = 0 ! - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,TZDATA,KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,TZDATA,KRESP) END IF ! IF (KRESP /=0) THEN @@ -1479,7 +1477,6 @@ USE MODE_FMWRIT USE MODE_MSG ! USE MODD_IO_ll, ONLY: TFILE_SURFEX -USE MODD_IO_SURF_MNH, ONLY : COUT, COUTFILE, NLUOUT USE MODD_CONF_n, ONLY : CSTORAGE_TYPE ! ! @@ -1525,7 +1522,7 @@ ELSE TZFIELD%NTYPE = TYPEINT TZFIELD%NDIMS = 2 ! - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,ITDATE(:,:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,ITDATE(:,:),KRESP) ! IF (KRESP /=0) THEN WRITE ( YMSG, '( I5 )' ) KRESP @@ -1542,7 +1539,7 @@ ELSE TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 1 ! - CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,COUT,PTIME(:),KRESP) + CALL IO_WRITE_FIELD(TFILE_SURFEX,TZFIELD,PTIME(:),KRESP) ! IF (KRESP /=0) THEN WRITE ( YMSG, '( I5 )' ) KRESP diff --git a/src/MNH/zoom_pgd.f90 b/src/MNH/zoom_pgd.f90 index b9d8632fd..a288452c6 100644 --- a/src/MNH/zoom_pgd.f90 +++ b/src/MNH/zoom_pgd.f90 @@ -248,25 +248,25 @@ IF (CSURF=='EXTE') THEN ELSE ALLOCATE(ZZS2(NIMAX+2*JPHEXT,NJMAX+2*JPHEXT)) ZZS2(:,:)=ZZS1(IXOR:IXOR+NIMAX+2*JPHEXT-1,IYOR:IYOR+NJMAX+2*JPHEXT-1) - CALL IO_WRITE_FIELD(TZZOOMFILE,'ZS',CLUOUT0,ZZS2) + CALL IO_WRITE_FIELD(TZZOOMFILE,'ZS',ZZS2) END IF ! ALLOCATE(ZZSMT2(NIMAX+2*JPHEXT,NJMAX+2*JPHEXT)) ZZSMT2(:,:)=ZZSMT1(IXOR:IXOR+NIMAX+2*JPHEXT-1,IYOR:IYOR+NJMAX+2*JPHEXT-1) -CALL IO_WRITE_FIELD(TZZOOMFILE,'ZSMT',CLUOUT0,ZZSMT2) +CALL IO_WRITE_FIELD(TZZOOMFILE,'ZSMT',ZZSMT2) ! !* 2.7 Write configuration variables in the output file ! ------------------------------------------------ ! -CALL IO_WRITE_HEADER(TZZOOMFILE,CLUOUT0) -CALL IO_WRITE_FIELD(TZZOOMFILE,'DXRATIO',CLUOUT0,IDXRATIO) -CALL IO_WRITE_FIELD(TZZOOMFILE,'DYRATIO',CLUOUT0,IDYRATIO) -CALL IO_WRITE_FIELD(TZZOOMFILE,'XOR', CLUOUT0,IXOR_DAD) -CALL IO_WRITE_FIELD(TZZOOMFILE,'YOR', CLUOUT0,IYOR_DAD) -CALL IO_WRITE_FIELD(TZZOOMFILE,'L1D', CLUOUT0,L1D) -CALL IO_WRITE_FIELD(TZZOOMFILE,'L2D', CLUOUT0,L2D) -CALL IO_WRITE_FIELD(TZZOOMFILE,'PACK', CLUOUT0,LPACK) -CALL IO_WRITE_FIELD(TZZOOMFILE,'SURF', CLUOUT0,CSURF) +CALL IO_WRITE_HEADER(TZZOOMFILE) +CALL IO_WRITE_FIELD(TZZOOMFILE,'DXRATIO',IDXRATIO) +CALL IO_WRITE_FIELD(TZZOOMFILE,'DYRATIO',IDYRATIO) +CALL IO_WRITE_FIELD(TZZOOMFILE,'XOR', IXOR_DAD) +CALL IO_WRITE_FIELD(TZZOOMFILE,'YOR', IYOR_DAD) +CALL IO_WRITE_FIELD(TZZOOMFILE,'L1D', L1D) +CALL IO_WRITE_FIELD(TZZOOMFILE,'L2D', L2D) +CALL IO_WRITE_FIELD(TZZOOMFILE,'PACK', LPACK) +CALL IO_WRITE_FIELD(TZZOOMFILE,'SURF', CSURF) CALL IO_FILE_CLOSE_ll(TZZOOMFILE,CLUOUT0,IRESP) ! !* 2.8 Shift to new PGD file diff --git a/src/MNH/zsmt_pgd.f90 b/src/MNH/zsmt_pgd.f90 index 969a27aa8..6c2ca2c6d 100644 --- a/src/MNH/zsmt_pgd.f90 +++ b/src/MNH/zsmt_pgd.f90 @@ -213,8 +213,8 @@ END IF ! --------------------------------------- ! ! -CALL IO_WRITE_FIELD(TPFILE,'ZS', CLUOUT0,ZFINE_ZS) -CALL IO_WRITE_FIELD(TPFILE,'ZSMT',CLUOUT0,ZSLEVE_ZS) +CALL IO_WRITE_FIELD(TPFILE,'ZS', ZFINE_ZS) +CALL IO_WRITE_FIELD(TPFILE,'ZSMT',ZSLEVE_ZS) ! DEALLOCATE(ZZS) DEALLOCATE(ZFINE_ZS) -- GitLab