From de13e12f53cb8734cc0cd546b395d3952f70a3c1 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Tue, 17 Sep 2024 10:09:17 +0200 Subject: [PATCH] Quentin 17/09/2024: fix spawning/prep with previous model run with NRAD_AGG>1 --- src/MNH/ini_radiations_agg.f90 | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/MNH/ini_radiations_agg.f90 b/src/MNH/ini_radiations_agg.f90 index 71679e0dd..337ff96bf 100644 --- a/src/MNH/ini_radiations_agg.f90 +++ b/src/MNH/ini_radiations_agg.f90 @@ -77,7 +77,7 @@ USE PARKIND1, ONLY: JPRB ! USE MODD_CST USE MODD_LUNIT_n, ONLY : TLUOUT -USE MODD_CONF, ONLY : NHALO +USE MODD_CONF, ONLY : NHALO, CPROGRAM USE MODD_LBC_n, ONLY : CLBCX, CLBCY USE MODD_PARAMETERS, ONLY : JPHEXT ! @@ -136,15 +136,17 @@ IMI = GET_CURRENT_MODEL_INDEX() ILUOUT = TLUOUT%NLU ! -IF (KRAD_AGG > NHALO+1) THEN - WRITE(ILUOUT,*) ' +------------------------------------------------------+' - WRITE(ILUOUT,*) ' [ Error in Radiation columns aggregation |' - WRITE(ILUOUT,*) ' [ NRAD_AGG = ',KRAD_AGG,' |' - WRITE(ILUOUT,*) ' [ NHALO = ',NHALO,' |' - WRITE(ILUOUT,*) ' [ NRAD_AGG must be smaller than or equal to NHALO+1 |' - WRITE(ILUOUT,*) ' +------------------------------------------------------+' - ! - CALL PRINT_MSG( NVERB_FATAL, 'GEN', 'INI_RADIATIONS_AGG','Incoherence between NRAD_AGG and NHALO' ) +IF (CPROGRAM=='MESONH') THEN + IF (KRAD_AGG > NHALO+1) THEN + WRITE(ILUOUT,*) ' +------------------------------------------------------+' + WRITE(ILUOUT,*) ' [ Error in Radiation columns aggregation |' + WRITE(ILUOUT,*) ' [ NRAD_AGG = ',KRAD_AGG,' |' + WRITE(ILUOUT,*) ' [ NHALO = ',NHALO,' |' + WRITE(ILUOUT,*) ' [ NRAD_AGG must be smaller than or equal to NHALO+1 |' + WRITE(ILUOUT,*) ' +------------------------------------------------------+' + ! + CALL PRINT_MSG( NVERB_FATAL, 'GEN', 'INI_RADIATIONS_AGG','Incoherence between NRAD_AGG and NHALO' ) + END IF END IF ! !* 2. COMPUTE DIMENSIONS OF ARRAYS AND OTHER INDICES -- GitLab