From d41705aa2469c801ab16e47145c57c802a78b834 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Thu, 8 Mar 2018 10:31:51 +0100 Subject: [PATCH] Philippe 08/03/2018: lfi2cdf: add all fields in TFIELDLIST for LFI2CDF --- src/LIB/SURCOUCHE/src/mode_field.f90 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90 index d9f3b0a63..fdcda06a5 100644 --- a/src/LIB/SURCOUCHE/src/mode_field.f90 +++ b/src/LIB/SURCOUCHE/src/mode_field.f90 @@ -1984,7 +1984,7 @@ TFIELDLIST(IDX)%NDIMS = 0 IDX = IDX+1 ! ! -IF (TRIM(CPROGRAM) == 'MESONH' .OR. TRIM(CPROGRAM) == 'DIAG') THEN +IF (TRIM(CPROGRAM) == 'MESONH' .OR. TRIM(CPROGRAM) == 'DIAG' .OR. TRIM(CPROGRAM) == 'LFICDF') THEN ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() TFIELDLIST(IDX)%CMNHNAME = 'US_PRES' @@ -2172,7 +2172,7 @@ TFIELDLIST(IDX)%NDIMS = 3 ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(IMODEL)) IDX = IDX+1 ! -END IF ! CPROGRAM=MESONH .OR. DIAG +END IF ! CPROGRAM=MESONH .OR. DIAG .OR. LFICDF ! ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() @@ -2202,7 +2202,7 @@ ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(IMODEL)) IDX = IDX+1 ! ! -IF (TRIM(CPROGRAM)=='MESONH' .OR. TRIM(CPROGRAM)=='DIAG') THEN +IF (TRIM(CPROGRAM)=='MESONH' .OR. TRIM(CPROGRAM)=='DIAG' .OR. TRIM(CPROGRAM) == 'LFICDF') THEN ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() TFIELDLIST(IDX)%CMNHNAME = 'DTHRAD' @@ -2360,10 +2360,10 @@ TFIELDLIST(IDX)%NDIMS = 2 ALLOCATE(TFIELDLIST(IDX)%TFIELD_X2D(IMODEL)) IDX = IDX+1 ! -END IF !CPROGRAM=MESONH .OR. DIAG +END IF !CPROGRAM=MESONH .OR. DIAG .OR. LFICDF ! ! -IF (TRIM(CPROGRAM) /= 'PGD' .AND. TRIM(CPROGRAM) /= 'NESPGD' .AND. TRIM(CPROGRAM) /= 'SPAWN') THEN +IF ( (TRIM(CPROGRAM) /= 'PGD' .AND. TRIM(CPROGRAM) /= 'NESPGD' .AND. TRIM(CPROGRAM) /= 'SPAWN') ) THEN ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() TFIELDLIST(IDX)%CMNHNAME = 'COUNTCONV' @@ -3024,7 +3024,7 @@ ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(IMODEL)) IDX = IDX+1 ! ! -IF (TRIM(CPROGRAM)=='REAL') THEN +IF (TRIM(CPROGRAM)=='REAL' .OR. TRIM(CPROGRAM) == 'LFICDF') THEN !PW: not yet known: IF (LFILTERING) THEN ! IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST() @@ -3236,7 +3236,7 @@ ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(IMODEL)) IDX = IDX+1 ! !END IF !LFILTERING -END IF !CPROGRAM==REAL +END IF !CPROGRAM==REAL .OR. LFICDF ! ! WRITE(YMSG,'("number of used fields=",I4," out of ",I4)') IDX-1,MAXFIELDS -- GitLab