From b97b01ebc1b8d86672effbcccaad5649bfa16408 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 5 May 2017 15:06:00 +0200
Subject: [PATCH] Philippe 05/05/2017: bug correction: removed IF based on
variables that could be different on different meshes
---
src/LIB/SURCOUCHE/src/mode_field.f90 | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index 2d4234992..ba003cd74 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -7,7 +7,6 @@ MODULE MODE_FIELD
USE MODD_CONF, ONLY : CPROGRAM
USE MODD_IO_ll, ONLY : NVERB_DEBUG,NVERB_INFO,NVERB_WARNING,NVERB_ERROR,NVERB_FATAL
USE MODD_PARAMETERS
-USE MODD_PARAM_n, ONLY : CDCONV,CRAD,CSCONV
USE MODD_TYPE_DATE
USE MODE_MSG
!
@@ -1804,7 +1803,6 @@ IDX = IDX+1
!
!
IF (CPROGRAM=='MESONH') THEN
-IF (CRAD /= 'NONE') THEN
!
IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST()
TFIELDLIST(IDX)%CMNHNAME = 'DTHRAD'
@@ -1962,12 +1960,10 @@ TFIELDLIST(IDX)%NDIMS = 2
ALLOCATE(TFIELDLIST(IDX)%TFIELD_X2D(IMODEL))
IDX = IDX+1
!
-END IF !CRAD /= 'NONE'
END IF !CPROGRAM=MESONH
!
!
IF (TRIM(CPROGRAM) /= 'PGD' .AND. TRIM(CPROGRAM) /= 'NESPGD' .AND. TRIM(CPROGRAM) /= 'SPAWN') THEN
-IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN
!
IF(IDX>MAXFIELDS) CALL ERR_INI_FIELD_LIST()
TFIELDLIST(IDX)%CMNHNAME = 'COUNTCONV'
@@ -2138,7 +2134,6 @@ TFIELDLIST(IDX)%NDIMS = 2
ALLOCATE(TFIELDLIST(IDX)%TFIELD_X2D(IMODEL))
IDX = IDX+1
!
-END IF !CDCONV /= 'NONE' .OR. CSCONV == 'KAFR'
END IF !CPROGRAM/=PGD , NESPGD, SPAWN
!
!
@@ -2894,7 +2889,6 @@ CALL FIND_FIELD_ID_FROM_MNHNAME('THVREF', IID,IRESP); TFIELDLIST(IID)%TFIELD_X3D
! MODD_RADIATIONS_n variables
!
IF (CPROGRAM=='MESONH') THEN
-IF (CRAD /= 'NONE') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('DTHRAD', IID,IRESP); TFIELDLIST(IID)%TFIELD_X3D(KFROM)%DATA => XDTHRAD
CALL FIND_FIELD_ID_FROM_MNHNAME('FLALWD', IID,IRESP); TFIELDLIST(IID)%TFIELD_X2D(KFROM)%DATA => XFLALWD
CALL FIND_FIELD_ID_FROM_MNHNAME('DIRFLASWD', IID,IRESP); TFIELDLIST(IID)%TFIELD_X3D(KFROM)%DATA => XDIRFLASWD
@@ -2908,12 +2902,10 @@ IF (CRAD /= 'NONE') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('EMIS', IID,IRESP); TFIELDLIST(IID)%TFIELD_X2D(KFROM)%DATA => XEMIS
CALL FIND_FIELD_ID_FROM_MNHNAME('TSRAD', IID,IRESP); TFIELDLIST(IID)%TFIELD_X2D(KFROM)%DATA => XTSRAD
END IF
-END IF
!
! MODD_DEEP_CONVECTION_n variables
!
IF (TRIM(CPROGRAM) /= 'PGD' .AND. TRIM(CPROGRAM) /= 'NESPGD' .AND. TRIM(CPROGRAM) /= 'SPAWN') THEN
-IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('COUNTCONV', IID,IRESP); TFIELDLIST(IID)%TFIELD_N2D(KFROM)%DATA => NCOUNTCONV
CALL FIND_FIELD_ID_FROM_MNHNAME('DTHCONV', IID,IRESP); TFIELDLIST(IID)%TFIELD_X3D(KFROM)%DATA => XDTHCONV
CALL FIND_FIELD_ID_FROM_MNHNAME('DRVCONV', IID,IRESP); TFIELDLIST(IID)%TFIELD_X3D(KFROM)%DATA => XDRVCONV
@@ -2928,7 +2920,6 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('IC_TOTAL_NB',IID,IRESP); TFIELDLIST(IID)%TFIELD_X2D(KFROM)%DATA => XIC_TOTAL_NUMBER
CALL FIND_FIELD_ID_FROM_MNHNAME('CG_TOTAL_NB',IID,IRESP); TFIELDLIST(IID)%TFIELD_X2D(KFROM)%DATA => XCG_TOTAL_NUMBER
END IF
-END IF
!
! MODD_GR_FIELD_n variables
!
@@ -3241,7 +3232,6 @@ CALL FIND_FIELD_ID_FROM_MNHNAME('THVREF', IID,IRESP); XTHVREF => TFIELDLIST(IID
! MODD_RADIATIONS_n variables
!
IF (CPROGRAM=='MESONH') THEN
-IF (CRAD /= 'NONE') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('DTHRAD', IID,IRESP); XDTHRAD => TFIELDLIST(IID)%TFIELD_X3D(KTO)%DATA
CALL FIND_FIELD_ID_FROM_MNHNAME('FLALWD', IID,IRESP); XFLALWD => TFIELDLIST(IID)%TFIELD_X2D(KTO)%DATA
CALL FIND_FIELD_ID_FROM_MNHNAME('DIRFLASWD', IID,IRESP); XDIRFLASWD => TFIELDLIST(IID)%TFIELD_X3D(KTO)%DATA
@@ -3255,12 +3245,10 @@ IF (CRAD /= 'NONE') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('EMIS', IID,IRESP); XEMIS => TFIELDLIST(IID)%TFIELD_X2D(KTO)%DATA
CALL FIND_FIELD_ID_FROM_MNHNAME('TSRAD', IID,IRESP); XTSRAD => TFIELDLIST(IID)%TFIELD_X2D(KTO)%DATA
END IF
-END IF
!
! MODD_DEEP_CONVECTION_n variables
!
IF (TRIM(CPROGRAM) /= 'PGD' .AND. TRIM(CPROGRAM) /= 'NESPGD' .AND. TRIM(CPROGRAM) /= 'SPAWN') THEN
-IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('COUNTCONV', IID,IRESP); NCOUNTCONV => TFIELDLIST(IID)%TFIELD_N2D(KTO)%DATA
CALL FIND_FIELD_ID_FROM_MNHNAME('DTHCONV', IID,IRESP); XDTHCONV => TFIELDLIST(IID)%TFIELD_X3D(KTO)%DATA
CALL FIND_FIELD_ID_FROM_MNHNAME('DRVCONV', IID,IRESP); XDRVCONV => TFIELDLIST(IID)%TFIELD_X3D(KTO)%DATA
@@ -3275,7 +3263,6 @@ IF (CDCONV /= 'NONE' .OR. CSCONV == 'KAFR') THEN
CALL FIND_FIELD_ID_FROM_MNHNAME('IC_TOTAL_NB',IID,IRESP); XIC_TOTAL_NUMBER => TFIELDLIST(IID)%TFIELD_X2D(KTO)%DATA
CALL FIND_FIELD_ID_FROM_MNHNAME('CG_TOTAL_NB',IID,IRESP); XCG_TOTAL_NUMBER => TFIELDLIST(IID)%TFIELD_X2D(KTO)%DATA
END IF
-END IF
!
! MODD_GR_FIELD_n variables
!
--
GitLab