From 57ae60533dd583b12af733426223f2d1773aa479 Mon Sep 17 00:00:00 2001 From: Fredrik Jansson Date: Mon, 11 Nov 2024 09:53:28 +0100 Subject: [PATCH] Add namelist section to error message 'timeav must be a integer multiple of dtav' --- src/modbudget.f90 | 4 ++-- src/modgenstat.f90 | 2 +- src/modlsmstat.f90 | 4 ++-- src/modquadrant.f90 | 4 ++-- src/modradfield.f90 | 4 ++-- src/modradstat.f90 | 4 ++-- src/modsampling.f90 | 4 ++-- src/modsamptend.f90 | 6 +++--- src/modvarbudget.f90 | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/modbudget.f90 b/src/modbudget.f90 index 6c0e4f02..25d1e22a 100644 --- a/src/modbudget.f90 +++ b/src/modbudget.f90 @@ -112,10 +112,10 @@ subroutine initbudget dt_lim = min(dt_lim,tnext) if (abs(timeav/dtav-nsamples)>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'NAMBUDGET: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and.abs( dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'dtav should be a integer multiple of dtmax' + stop 'NAMBUDGET: dtav should be a integer multiple of dtmax' end if !time averaged fields, resolved TKE diff --git a/src/modgenstat.f90 b/src/modgenstat.f90 index 6daf71af..66d1a1e9 100644 --- a/src/modgenstat.f90 +++ b/src/modgenstat.f90 @@ -234,7 +234,7 @@ subroutine initgenstat dt_lim = min(dt_lim,tnext) if (abs(timeav/dtav-nsamples)>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'NAMGENSTAT: timeav must be a integer multiple of dtav' end if allocate(umn(k1),vmn(k1),wmn(k1)) diff --git a/src/modlsmstat.f90 b/src/modlsmstat.f90 index f3e98872..dd4c721c 100644 --- a/src/modlsmstat.f90 +++ b/src/modlsmstat.f90 @@ -99,10 +99,10 @@ subroutine initlsmstat dt_lim = min(dt_lim,tnext) if (abs(timeav/dtav-nsamples)>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'NAMLSMSTAT: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and. abs(dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'dtav should be a integer multiple of dtmax' + stop 'NAMLSMSTAT: dtav should be a integer multiple of dtmax' end if if (isurf == 1) then diff --git a/src/modquadrant.f90 b/src/modquadrant.f90 index 5cd7764d..46f2d6b4 100644 --- a/src/modquadrant.f90 +++ b/src/modquadrant.f90 @@ -116,10 +116,10 @@ subroutine initquadrant tnextwrite = itimeav + btime if (abs(timeav/dtav-nint(timeav/dtav))>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'NAMquadrant: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and. abs(dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'dtav should be a integer multiple of dtmax' + stop 'NAMquadrant: dtav should be a integer multiple of dtmax' end if nvar = 22 + 4 * nsv diff --git a/src/modradfield.f90 b/src/modradfield.f90 index 25ea8e1a..4c1cd7ea 100644 --- a/src/modradfield.f90 +++ b/src/modradfield.f90 @@ -82,11 +82,11 @@ subroutine initradfield if (abs(timeav/dtav-nsamples)>1e-4) then - stop 'radfield timeav must be a integer multiple of dtav' + stop 'NAMRADFIELD: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and. abs(dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'radfield dtav should be a integer multiple of dtmax' + stop 'NAMRADFIELD: dtav should be a integer multiple of dtmax' end if allocate(field_2D_mn(2-ih:i1+ih,2-jh:j1+jh,nvar)) diff --git a/src/modradstat.f90 b/src/modradstat.f90 index 055ac1ed..f3a454ad 100644 --- a/src/modradstat.f90 +++ b/src/modradstat.f90 @@ -124,10 +124,10 @@ subroutine initradstat dt_lim = min(dt_lim,tnext) if (abs(timeav/dtav-nsamples)>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'NAMRADSTAT: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and. abs(dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'dtav should be a integer multiple of dtmax' + stop 'NAMRADSTAT: dtav should be a integer multiple of dtmax' end if allocate(lwuav(k1)) diff --git a/src/modsampling.f90 b/src/modsampling.f90 index 5c61ba12..4c800171 100644 --- a/src/modsampling.f90 +++ b/src/modsampling.f90 @@ -146,10 +146,10 @@ subroutine initsampling tnextwrite = itimeav +btime if (abs(timeav/dtav-nint(timeav/dtav))>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'NAMSAMPLING: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and. abs(dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'dtav should be a integer multiple of dtmax' + stop 'NAMSAMPLING: dtav should be a integer multiple of dtmax' end if allocate( wfavl (k1,isamptot),thlfavl (k1,isamptot),thvfavl (k1,isamptot), & diff --git a/src/modsamptend.f90 b/src/modsamptend.f90 index b5600197..209439b3 100644 --- a/src/modsamptend.f90 +++ b/src/modsamptend.f90 @@ -114,14 +114,14 @@ subroutine initsamptend if (abs(timeav/dtav-nint(timeav/dtav))>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'modsamptend: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and. abs(dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'dtav should be a integer multiple of dtmax' + stop 'modsamptend: dtav should be a integer multiple of dtmax' end if if (ltenddec .and. .not. lprocblock) then - stop 'ltenddec is only intended to be used to complement processor-averaged budgets' + stop 'modsamptend: ltenddec is only intended to be used to complement processor-averaged budgets' end if if (lsamptendu) allocate (uptm(k1,nrfields,isamptot), upmn(k1,nrfields,isamptot), upav(k1,nrfields,isamptot), ust(k1,isamptot)) diff --git a/src/modvarbudget.f90 b/src/modvarbudget.f90 index 31aeede1..2b50e8e9 100644 --- a/src/modvarbudget.f90 +++ b/src/modvarbudget.f90 @@ -80,10 +80,10 @@ subroutine initvarbudget dt_lim = min(dt_lim,tnext) if (abs(timeav/dtav-nsamples)>1e-4) then - stop 'timeav must be a integer multiple of dtav' + stop 'NAMVARBUDGET: timeav must be a integer multiple of dtav' end if if (.not. ladaptive .and.abs( dtav/dtmax-nint(dtav/dtmax))>1e-4) then - stop 'dtav should be a integer multiple of dtmax' + stop 'NAMVARBUDGET: dtav should be a integer multiple of dtmax' end if allocate(thl2fav (k1))