diff --git a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 index 136ed1c4ec2853464296abca424b422e4947a538..476113284d41cb37e187641014c16ce30d3ca88d 100644 --- a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 +++ b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 @@ -2539,9 +2539,9 @@ CONTAINS RETURN END IF ! - IF (TPFIELD%CDIR/='XY') THEN - CALL PRINT_MSG(NVERB_WARNING,'IO','IO_WRITE_FIELD_BYFIELD_LB','CDIR was not set to "XY" for '//TRIM(YRECFM)) - TPFIELD%CDIR='XY' + IF (TPFIELD%CDIR/='') THEN + CALL PRINT_MSG(NVERB_WARNING,'IO','IO_WRITE_FIELD_BYFIELD_LB','CDIR was set for '//TRIM(YRECFM)) + TPFIELD%CDIR='' END IF ! IRIM = (KL3D-2*JPHEXT)/2 diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90 index f29484af76e02c334deaca4aa44d2cb4230e8a28..3492d7b4110c5e1a2ef13ae331139a383af9127e 100644 --- a/src/LIB/SURCOUCHE/src/mode_field.f90 +++ b/src/LIB/SURCOUCHE/src/mode_field.f90 @@ -1570,7 +1570,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBXUM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBXUM' TFIELDLIST(IDX)%CUNITS = 'm s-1' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBXU' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBXUM' TFIELDLIST(IDX)%NGRID = 2 @@ -1584,7 +1584,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBXVM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBXVM' TFIELDLIST(IDX)%CUNITS = 'm s-1' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBX' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBXVM' TFIELDLIST(IDX)%NGRID = 3 @@ -1598,7 +1598,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBXWM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBXWM' TFIELDLIST(IDX)%CUNITS = 'm s-1' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBX' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBXWM' TFIELDLIST(IDX)%NGRID = 4 @@ -1612,7 +1612,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBYUM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBYUM' TFIELDLIST(IDX)%CUNITS = 'm s-1' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBY' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBYUM' TFIELDLIST(IDX)%NGRID = 2 @@ -1626,7 +1626,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBYVM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBYVM' TFIELDLIST(IDX)%CUNITS = 'm s-1' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBYV' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBYVM' TFIELDLIST(IDX)%NGRID = 3 @@ -1640,7 +1640,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBYWM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBYWM' TFIELDLIST(IDX)%CUNITS = 'm s-1' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBY' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBYWM' TFIELDLIST(IDX)%NGRID = 4 @@ -1654,7 +1654,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBXTHM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBXTHM' TFIELDLIST(IDX)%CUNITS = 'K' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBX' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBXTHM' TFIELDLIST(IDX)%NGRID = 1 @@ -1668,7 +1668,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBYTHM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBYTHM' TFIELDLIST(IDX)%CUNITS = 'K' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBY' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBYTHM' TFIELDLIST(IDX)%NGRID = 1 @@ -1695,7 +1695,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBXTKEM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBXTKEM' TFIELDLIST(IDX)%CUNITS = 'm2 s-2' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBX' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBXTKEM' TFIELDLIST(IDX)%NGRID = 1 @@ -1709,7 +1709,7 @@ TFIELDLIST(IDX)%CMNHNAME = 'LBYTKEM' TFIELDLIST(IDX)%CSTDNAME = '' TFIELDLIST(IDX)%CLONGNAME = 'MesoNH: LBYTKEM' TFIELDLIST(IDX)%CUNITS = 'm2 s-2' -TFIELDLIST(IDX)%CDIR = 'XY' +! TFIELDLIST(IDX)%CDIR = '' TFIELDLIST(IDX)%CLBTYPE = 'LBY' TFIELDLIST(IDX)%CCOMMENT = '2_Y_Z_LBYTKEM' TFIELDLIST(IDX)%NGRID = 1 diff --git a/src/MNH/ini_lb.f90 b/src/MNH/ini_lb.f90 index 209ae76df53a2e493da80c31c0ef012d119b92ed..4e4600fd8eef1d6699040fb1190420cbaed7f312 100644 --- a/src/MNH/ini_lb.f90 +++ b/src/MNH/ini_lb.f90 @@ -386,7 +386,7 @@ IF(KSIZELBXR_ll > 0 ) THEN ! TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -497,7 +497,7 @@ END IF IF (NSV_USER>0) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -552,7 +552,7 @@ END IF IF (NSV_C2R2END>=NSV_C2R2BEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'm-3' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -607,7 +607,7 @@ END IF IF (NSV_C1R3END>=NSV_C1R3BEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'm-3' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -665,7 +665,7 @@ IF (CCLOUD=='LIMA' ) THEN IF (NSV_LIMA_CCN_FREE+NMOD_CCN-1 >= NSV_LIMA_CCN_FREE) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -721,7 +721,7 @@ IF (CCLOUD=='LIMA' ) THEN IF (NSV_LIMA_IFN_FREE+NMOD_IFN-1 >= NSV_LIMA_IFN_FREE) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -778,7 +778,7 @@ ENDIF IF (NSV_ELECEND>=NSV_ELECBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -832,7 +832,7 @@ END IF IF (NSV_CHGSEND>=NSV_CHGSBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -887,7 +887,7 @@ END IF IF (NSV_CHACEND>=NSV_CHACBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -942,7 +942,7 @@ END IF IF (NSV_CHICEND>=NSV_CHICBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -997,7 +997,7 @@ END IF IF (NSV_AEREND>=NSV_AERBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1052,7 +1052,7 @@ END IF IF (NSV_AERDEPEND>=NSV_AERDEPBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1107,7 +1107,7 @@ END IF IF (NSV_DSTEND>=NSV_DSTBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1162,7 +1162,7 @@ END IF IF (NSV_DSTDEPEND>=NSV_DSTDEPBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1218,7 +1218,7 @@ END IF IF (NSV_SLTEND>=NSV_SLTBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1273,7 +1273,7 @@ END IF IF (NSV_PPEND>=NSV_PPBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1329,7 +1329,7 @@ END IF IF (NSV_FFEND>=NSV_FFBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1386,7 +1386,7 @@ END IF IF (NSV_CSEND>=NSV_CSBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1441,7 +1441,7 @@ END IF IF (NSV_LNOXEND>=NSV_LNOXBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -1496,7 +1496,7 @@ END IF IF (NSV_LGEND>=NSV_LGBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'm' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 diff --git a/src/MNH/write_lbn.f90 b/src/MNH/write_lbn.f90 index 1c04daf08bf63d6d504375202f53783d18032980..e42b199cf2fae9018a1e93dc597281fcc7429c2d 100644 --- a/src/MNH/write_lbn.f90 +++ b/src/MNH/write_lbn.f90 @@ -218,7 +218,7 @@ IF (NRR >=1) THEN ! TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -269,7 +269,7 @@ IF (NSV >=1) THEN IF (NSV_USER>0) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -296,7 +296,7 @@ IF (NSV >=1) THEN IF (NSV_C2R2END>=NSV_C2R2BEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'm-3' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -323,7 +323,7 @@ IF (NSV >=1) THEN IF (NSV_C1R3END>=NSV_C1R3BEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'm-3' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -352,7 +352,7 @@ IF (NSV >=1) THEN IF (CCLOUD=='LIMA' ) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -401,7 +401,7 @@ IF (NSV >=1) THEN IF (NSV_ELECEND>=NSV_ELECBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -453,7 +453,7 @@ IF (NSV >=1) THEN ! TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -499,7 +499,7 @@ IF (NSV >=1) THEN ! TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -598,7 +598,7 @@ IF (NSV >=1) THEN ! TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'ppp' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -658,7 +658,7 @@ IF (NSV >=1) THEN ! TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -744,7 +744,7 @@ IF (NSV >=1) THEN ! TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'ppp' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -802,7 +802,7 @@ IF (NSV >=1) THEN !in the same order as the variables in XSVM (i.e. following JPSALTORDER) TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -850,7 +850,7 @@ IF (NSV >=1) THEN IF (NSV_LGEND>=NSV_LGBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'm' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -877,7 +877,7 @@ IF (NSV >=1) THEN IF (NSV_PPEND>=NSV_PPBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -904,7 +904,7 @@ IF (NSV >=1) THEN IF (NSV_CSEND>=NSV_CSBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3 @@ -932,7 +932,7 @@ IF (NSV >=1) THEN IF (NSV_FFEND>=NSV_FFBEG) THEN TZFIELD%CSTDNAME = '' TZFIELD%CUNITS = 'kg kg-1' - TZFIELD%CDIR = 'XY' + TZFIELD%CDIR = '' TZFIELD%NGRID = 1 TZFIELD%NTYPE = TYPEREAL TZFIELD%NDIMS = 3