From fc305fcebb7bb5191aeab36965231d63bc781673 Mon Sep 17 00:00:00 2001
From: lucieb92 <lucie.bakels@univie.ac.at>
Date: Thu, 16 May 2024 13:25:13 +0200
Subject: [PATCH] RECEPTOR COMMAND options default set to LOUT values
Former-commit-id: b9beb16fb75774405d29b73887d214309c5ffc86
---
src/FLEXPART.f90 | 2 +-
src/gitversion.txt | 1 -
src/readoptions_mod.f90 | 31 +++++++++++++++++--
.../default_etex/EC1994102312.REMOVED.git-id | 1 -
.../default_etex/EC1994102318.REMOVED.git-id | 1 -
.../default_etex/EC1994102400.REMOVED.git-id | 1 -
.../default_etex/EC1994102406.REMOVED.git-id | 1 -
.../default_etex/EC1994102412.REMOVED.git-id | 1 -
.../default_etex/EC1994102418.REMOVED.git-id | 1 -
.../default_etex/EC1994102500.REMOVED.git-id | 1 -
.../default_etex/EC1994102506.REMOVED.git-id | 1 -
.../default_etex/EC1994102512.REMOVED.git-id | 1 -
.../default_etex/EC1994102518.REMOVED.git-id | 1 -
.../default_etex/EC1994102600.REMOVED.git-id | 1 -
.../default_etex/EC1994102606.REMOVED.git-id | 1 -
.../default_etex/EC1994102612.REMOVED.git-id | 1 -
.../default_etex/EC1994102618.REMOVED.git-id | 1 -
.../default_etex/EC1994102700.REMOVED.git-id | 1 -
.../default_etex/EC1994102706.REMOVED.git-id | 1 -
.../default_etex/EC1994102712.REMOVED.git-id | 1 -
20 files changed, 29 insertions(+), 22 deletions(-)
delete mode 100644 src/gitversion.txt
delete mode 100644 tests/default_etex/EC1994102312.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102318.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102400.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102406.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102412.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102418.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102500.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102506.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102512.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102518.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102600.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102606.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102612.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102618.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102700.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102706.REMOVED.git-id
delete mode 100644 tests/default_etex/EC1994102712.REMOVED.git-id
diff --git a/src/FLEXPART.f90 b/src/FLEXPART.f90
index 7a20ec48..d1bdc211 100644
--- a/src/FLEXPART.f90
+++ b/src/FLEXPART.f90
@@ -44,7 +44,7 @@ program flexpart
real :: s_timemanager
character(len=256) :: &
inline_options ! pathfile, flexversion, arg2
- character(len=256) :: gitversion_tmp="8d9c680 Mon Apr 22 15:37:39 2024 +0200"
+ character(len=256) :: gitversion_tmp="undefined"
! Keeping track of the total running time of FLEXPART, printed out at the end.
!*****************************************************************************
diff --git a/src/gitversion.txt b/src/gitversion.txt
deleted file mode 100644
index bc95db4e..00000000
--- a/src/gitversion.txt
+++ /dev/null
@@ -1 +0,0 @@
-8d9c680 Mon Apr 22 15:37:39 2024 +0200
diff --git a/src/readoptions_mod.f90 b/src/readoptions_mod.f90
index 85d1d391..491789bf 100644
--- a/src/readoptions_mod.f90
+++ b/src/readoptions_mod.f90
@@ -543,9 +543,9 @@ subroutine readcommand
loutstep=10800
loutaver=10800
loutsample=900
- lrecoutstep=3600
- lrecoutaver=3600
- lrecoutsample=900
+ lrecoutstep=-1
+ lrecoutaver=-1
+ lrecoutsample=-1
loutrestart=-1
lsynctime=900
ctl=-5.0
@@ -585,6 +585,7 @@ subroutine readcommand
WETBKDEP=.false.
DRYBKDEP=.false.
+
! Open the command file and read user options
! Namelist input first: try to read as namelist file
!**************************************************************************
@@ -834,6 +835,30 @@ subroutine readcommand
endif
#endif
+ ! Check whether RECEPTOR commands are given, otherwise give them default values
+ !******************************************************************************
+
+ if (lrecoutstep.eq.-1) then
+ write(*,*) 'WARNING: FILE COMMAND LRECOUTSTEP not provided,'
+ write(*,*) 'value of LOUTSTEP will be used if RECEPTORS are'
+ write(*,*) 'required.'
+ lrecoutstep=loutstep
+ endif
+
+ if (lrecoutaver.eq.-1) then
+ write(*,*) 'WARNING: FILE COMMAND LRECOUTAVER not provided,'
+ write(*,*) 'value of LOUTAVER will be used if RECEPTORS are'
+ write(*,*) 'required.'
+ lrecoutaver=loutaver
+ endif
+
+ if (lrecoutsample.eq.-1) then
+ write(*,*) 'WARNING: FILE COMMAND LRECOUTSTEP not provided,'
+ write(*,*) 'value of LOUTSAMPLE will be used if RECEPTORS are'
+ write(*,*) 'required.'
+ lrecoutsample=loutsample
+ endif
+
! Check whether a valid option for gridded model output has been chosen
!**********************************************************************
diff --git a/tests/default_etex/EC1994102312.REMOVED.git-id b/tests/default_etex/EC1994102312.REMOVED.git-id
deleted file mode 100644
index 40b58307..00000000
--- a/tests/default_etex/EC1994102312.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-6da99ad066c33aa0caf7d353ee5ed24937d3c735
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102318.REMOVED.git-id b/tests/default_etex/EC1994102318.REMOVED.git-id
deleted file mode 100644
index c25907be..00000000
--- a/tests/default_etex/EC1994102318.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-90b7fca857f4493e8ce2982b2c3b4f5e4e0583cc
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102400.REMOVED.git-id b/tests/default_etex/EC1994102400.REMOVED.git-id
deleted file mode 100644
index c15690e2..00000000
--- a/tests/default_etex/EC1994102400.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-4eef5a1c6750ba955afdc7dc64c781998723e513
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102406.REMOVED.git-id b/tests/default_etex/EC1994102406.REMOVED.git-id
deleted file mode 100644
index 7e282621..00000000
--- a/tests/default_etex/EC1994102406.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-c8cc09ebb0f32986a15b6b12681c2010ccc6f7fd
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102412.REMOVED.git-id b/tests/default_etex/EC1994102412.REMOVED.git-id
deleted file mode 100644
index 9aac43d8..00000000
--- a/tests/default_etex/EC1994102412.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-d268d2a3cc5e183690fdf1464f5146a31c18bccc
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102418.REMOVED.git-id b/tests/default_etex/EC1994102418.REMOVED.git-id
deleted file mode 100644
index 51e843c1..00000000
--- a/tests/default_etex/EC1994102418.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-7b83fd7d7b92d1fad60bdd037eaf27daabc58abd
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102500.REMOVED.git-id b/tests/default_etex/EC1994102500.REMOVED.git-id
deleted file mode 100644
index 55778f12..00000000
--- a/tests/default_etex/EC1994102500.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-37fbbda5bbe0027bbb10a4bb765659f74eb81174
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102506.REMOVED.git-id b/tests/default_etex/EC1994102506.REMOVED.git-id
deleted file mode 100644
index c3237dcd..00000000
--- a/tests/default_etex/EC1994102506.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-790520b3c8b04e87e650a492a3f16d3a98b56a18
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102512.REMOVED.git-id b/tests/default_etex/EC1994102512.REMOVED.git-id
deleted file mode 100644
index 0a759fab..00000000
--- a/tests/default_etex/EC1994102512.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-691492d53210fbbe92a629a7345a4997c25b3142
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102518.REMOVED.git-id b/tests/default_etex/EC1994102518.REMOVED.git-id
deleted file mode 100644
index bff2204b..00000000
--- a/tests/default_etex/EC1994102518.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-dc3c3d5cd682d7cbd664a5b99ae057195be3748a
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102600.REMOVED.git-id b/tests/default_etex/EC1994102600.REMOVED.git-id
deleted file mode 100644
index 448b8a66..00000000
--- a/tests/default_etex/EC1994102600.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-90db95dd0b841f9136b678ee0225f2fae60017d8
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102606.REMOVED.git-id b/tests/default_etex/EC1994102606.REMOVED.git-id
deleted file mode 100644
index 62b2977e..00000000
--- a/tests/default_etex/EC1994102606.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-693268aefa934c02c93e438999aabb3db45d5077
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102612.REMOVED.git-id b/tests/default_etex/EC1994102612.REMOVED.git-id
deleted file mode 100644
index 3e937b4a..00000000
--- a/tests/default_etex/EC1994102612.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-74aa06b4d66cb845cfcd1624320d7999eaeabe6a
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102618.REMOVED.git-id b/tests/default_etex/EC1994102618.REMOVED.git-id
deleted file mode 100644
index 12a3275c..00000000
--- a/tests/default_etex/EC1994102618.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-1432774cb381a488eb4bab9bab32fecf4b6990a1
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102700.REMOVED.git-id b/tests/default_etex/EC1994102700.REMOVED.git-id
deleted file mode 100644
index 7c9350d9..00000000
--- a/tests/default_etex/EC1994102700.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-4617e2548944564e5ce999e3cd426a710bf45c65
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102706.REMOVED.git-id b/tests/default_etex/EC1994102706.REMOVED.git-id
deleted file mode 100644
index b430b4cf..00000000
--- a/tests/default_etex/EC1994102706.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-217738d4c1d1220b46bb2c6f12c9719609276489
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102712.REMOVED.git-id b/tests/default_etex/EC1994102712.REMOVED.git-id
deleted file mode 100644
index d0f8a778..00000000
--- a/tests/default_etex/EC1994102712.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-a6b4f28e5d33b1df9693526f01f5692990e69bb6
\ No newline at end of file
--
GitLab