diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90 index 8eb15734f1ad283e709348562216a6cddab5fb4d..525569ab63d50428740d1554675924358de772f9 100644 --- a/src/LIB/SURCOUCHE/src/mode_field.f90 +++ b/src/LIB/SURCOUCHE/src/mode_field.f90 @@ -39,11 +39,13 @@ TYPE(TFIELDDATA),DIMENSION(MAXFIELDS),SAVE :: TFIELDLIST ! CONTAINS ! -SUBROUTINE INI_FIELD_LIST() +SUBROUTINE INI_FIELD_LIST(KMODEL) ! USE MODD_CONF, ONLY: NMODEL ! -INTEGER :: IDX +INTEGER,INTENT(IN),OPTIONAL :: KMODEL +! +INTEGER :: IDX, IMODEL ! !F90/95: TFIELDLIST(1) = TFIELDDATA('UT','x_wind','m s-1','XY','X_Y_Z_U component of wind (m/s)',2) !F2003: @@ -51,12 +53,19 @@ INTEGER :: IDX ! CCOMMENT='X_Y_Z_U component of wind (m/s)',NGRID=2) ! PRINT *,'PW: INI_FIELD_LIST called' +print *,'PW: nmodel=',nmodel IF (LFIELDLIST_ISINIT) THEN PRINT *,'ERROR: INI_FIELD_LIST already called' RETURN END IF LFIELDLIST_ISINIT = .TRUE. ! +IF (PRESENT(KMODEL)) THEN + IMODEL = KMODEL +ELSE + IMODEL = NMODEL +END IF +! IDX = 1 ! TFIELDLIST(IDX)%CMNHNAME = 'MASDEV' @@ -123,7 +132,7 @@ TFIELDLIST(IDX)%CCOMMENT = 'X_Y_Z_U component of wind (m/s)' TFIELDLIST(IDX)%NGRID = 2 TFIELDLIST(IDX)%NTYPE = TYPEREAL TFIELDLIST(IDX)%NDIMS = 3 -ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(NMODEL)) +ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(IMODEL)) IDX = IDX+1 ! TFIELDLIST(IDX)%CMNHNAME = 'VT' @@ -135,7 +144,7 @@ TFIELDLIST(IDX)%CCOMMENT = 'X_Y_Z_V component of wind (m/s)' TFIELDLIST(IDX)%NGRID = 3 TFIELDLIST(IDX)%NTYPE = TYPEREAL TFIELDLIST(IDX)%NDIMS = 3 -ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(NMODEL)) +ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(IMODEL)) IDX = IDX+1 ! TFIELDLIST(IDX)%CMNHNAME = 'THT' @@ -147,7 +156,7 @@ TFIELDLIST(IDX)%CCOMMENT = 'X_Y_Z_potential temperature (K)' TFIELDLIST(IDX)%NGRID = 1 TFIELDLIST(IDX)%NTYPE = TYPEREAL TFIELDLIST(IDX)%NDIMS = 3 -ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(NMODEL)) +ALLOCATE(TFIELDLIST(IDX)%TFIELD_X3D(IMODEL)) IDX = IDX+1 ! TFIELDLIST(IDX)%CMNHNAME = 'ACPRR' @@ -160,7 +169,7 @@ TFIELDLIST(IDX)%CCOMMENT = 'X_Y_ACcumulated Precipitation Rain Rate (m)' TFIELDLIST(IDX)%NGRID = 1 TFIELDLIST(IDX)%NTYPE = TYPEREAL TFIELDLIST(IDX)%NDIMS = 2 -ALLOCATE(TFIELDLIST(IDX)%TFIELD_X2D(NMODEL)) +ALLOCATE(TFIELDLIST(IDX)%TFIELD_X2D(IMODEL)) IDX = IDX+1 ! #if 0 @@ -174,7 +183,7 @@ TFIELDLIST(IDX)%CCOMMENT = '' TFIELDLIST(IDX)%NGRID = TFIELDLIST(IDX)%NTYPE = TFIELDLIST(IDX)%NDIMS = -ALLOCATE(TFIELDLIST(IDX)%TFIELD_xxxD(NMODEL)) +ALLOCATE(TFIELDLIST(IDX)%TFIELD_xxxD(IMODEL)) IDX = IDX+1 #endif