From a8c32a732fe62567e845d263f10f49c8b013ce22 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Tue, 22 Jan 2019 15:05:43 +0100 Subject: [PATCH] Philippe 22/01/2019: SURFEX: correct small print bugs --- src/SURFEX/interpol_field2d.F90 | 9 +++++---- src/SURFEX/modi_glt_thermo.F90 | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/SURFEX/interpol_field2d.F90 b/src/SURFEX/interpol_field2d.F90 index dd62f65ef..50d6a3129 100644 --- a/src/SURFEX/interpol_field2d.F90 +++ b/src/SURFEX/interpol_field2d.F90 @@ -1,6 +1,6 @@ -!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!SFX_LIC Copyright 2004-2019 CNRS, Meteo-France and Universite Paul Sabatier !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence -!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt +!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !SFX_LIC for details. version 1. ! ################################################ SUBROUTINE INTERPOL_FIELD2D (UG, U, & @@ -33,6 +33,7 @@ !! Modification !! A. Alias 07/2013 add MODI_ABOR1_SFX !! J. Escobar 09/2017 differencied error message :: SFX / NAM_IO_OFFLINE <=> MNH / NAM_PGDFILE +!! P. Wautelet 01/2019 correct small print bugs !---------------------------------------------------------------------------- ! !* 0. DECLARATION @@ -174,10 +175,10 @@ IF (IERR2>0) THEN WRITE(KLUOUT,*) 'NDIM_FULL=',U%NDIM_FULL,',NHALO=',IHALO,',Pts to interpol=',IERR0 & ,',Pts interpolated=',IERR1,',Pts missing=',IERR2 CALL ABOR1_SFX('Some points lack data and are too far away from other points. & - Please define a higher halo value in &NAM_PGDFILE NHALO=xxx /') + &Please define a higher halo value in &NAM_PGDFILE NHALO=xxx /') #else CALL ABOR1_SFX('Some points lack data and are too far away from other points. & - Please define a higher halo value in NAM_IO_OFFLINE.') + &Please define a higher halo value in NAM_IO_OFFLINE.') #endif ENDIF ENDIF diff --git a/src/SURFEX/modi_glt_thermo.F90 b/src/SURFEX/modi_glt_thermo.F90 index 2e1ac6798..64e44e8c2 100644 --- a/src/SURFEX/modi_glt_thermo.F90 +++ b/src/SURFEX/modi_glt_thermo.F90 @@ -1,6 +1,6 @@ -!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!SFX_LIC Copyright 2009-2019 CNRS, Meteo-France and Universite Paul Sabatier !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence -!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt +!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !SFX_LIC for details. version 1. !GLT_LIC The GELATO model is a seaice model used in stand-alone or embedded mode. !GLT_LIC It has been developed by Meteo-France. The holder of GELATO is Meteo-France. @@ -70,6 +70,8 @@ ! Sea ice damping ! Modified: 2015/07 (D. Salas y Melia) ! Sea ice damping has been externalized from thermo_r routine +! Modified: 2019/01 (P. Wautelet) +! Correct small print bug ! ! -------------------- BEGIN MODULE modi_glt_thermo ------------------------- @@ -731,7 +733,7 @@ SUBROUTINE glt_thermo & ! ============================== ! 1000 FORMAT( " Processor ", I5," ==> Running on ", I5, & - " points instead of ", I6, "(" I5, " times " , I5, ")" ) + " points instead of ", I6, "(" , I5, " times " , I5, ")" ) ! IF (lp1) THEN WRITE(noutlu,*) ' ' -- GitLab