From 6c9d0acfc3ede577f21cba1c071eb5d0e95a8321 Mon Sep 17 00:00:00 2001
From: Evgeny Mortikov <evgeny.mortikov@gmail.com>
Date: Tue, 19 Dec 2023 23:27:12 +0300
Subject: [PATCH] adding keys for PAPA and TOGA ocean datasets
---
srcF/sfx_main.f90 | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/srcF/sfx_main.f90 b/srcF/sfx_main.f90
index b8f554d..374a396 100644
--- a/srcF/sfx_main.f90
+++ b/srcF/sfx_main.f90
@@ -33,8 +33,9 @@ program sfx_main
integer, parameter :: dataset_IRGASON = 2 !< IRGASON data
integer, parameter :: dataset_SHEBA = 3 !< please spell 'SHIBA'
integer, parameter :: dataset_LAKE = 4 !< Kuivajarvi data
- integer, parameter :: dataset_OCEAN = 5 !< Ocean data
- integer, parameter :: dataset_USER = 4 !< used defined dataset
+ integer, parameter :: dataset_PAPA = 5 !< Papa station (ocean) data
+ integer, parameter :: dataset_TOGA = 6 !< Toga (ocean) data
+ integer, parameter :: dataset_USER = 7 !< used defined dataset
integer :: model_id !< sfx model ID:
@@ -85,7 +86,8 @@ program sfx_main
character(len = 128), parameter :: arg_key_dataset_irgason = 'irgason'
character(len = 128), parameter :: arg_key_dataset_sheba = 'sheba'
character(len = 128), parameter :: arg_key_dataset_lake = 'lake'
- character(len = 128), parameter :: arg_key_dataset_ocean = 'ocean'
+ character(len = 128), parameter :: arg_key_dataset_papa = 'papa'
+ character(len = 128), parameter :: arg_key_dataset_toga = 'toga'
character(len = 128), parameter :: arg_key_dataset_user = 'user'
integer :: is_output_set
@@ -116,7 +118,7 @@ program sfx_main
write(*, *) ' key = esm (default) || log || most || sheba'
write(*, *) ' --dataset [key]'
write(*, *) ' key = mosaic (default) || irgason || sheba'
- write(*, *) ' = lake || ocean || user [files]'
+ write(*, *) ' = lake || papa || toga || user [files]'
write(*, *) ' files = in-common-file in-file out-file'
write(*, *) ' --output [file]'
write(*, *) ' set output filename '
@@ -157,8 +159,10 @@ program sfx_main
dataset_id = dataset_SHEBA
else if (trim(arg) == trim(arg_key_dataset_lake)) then
dataset_id = dataset_LAKE
- else if (trim(arg) == trim(arg_key_dataset_ocean)) then
- dataset_id = dataset_OCEAN
+ else if (trim(arg) == trim(arg_key_dataset_papa)) then
+ dataset_id = dataset_PAPA
+ else if (trim(arg) == trim(arg_key_dataset_toga)) then
+ dataset_id = dataset_TOGA
else if (trim(arg) == trim(arg_key_dataset_user)) then
dataset_id = dataset_USER
if (i + 4 > num_args) then
@@ -239,12 +243,18 @@ program sfx_main
filename_in_common = 'data/Kuivajarvi_zh.txt'
filename_in = 'data/Kuivajarvi.txt'
if (is_output_set == 0) filename_out = 'out_Kuivajarvi.txt'
- else if (dataset_id == dataset_OCEAN) then
- dataset_name = 'OCEAN'
-
- filename_in_common = 'data/Ocean_zh.txt'
- filename_in = 'data/Ocean.txt'
- if (is_output_set == 0) filename_out = 'out_Ocean.txt'
+ else if (dataset_id == dataset_PAPA) then
+ dataset_name = 'PAPA'
+
+ filename_in_common = 'data/Papa_zh.txt'
+ filename_in = 'data/Papa.txt'
+ if (is_output_set == 0) filename_out = 'out_Papa.txt'
+ else if (dataset_id == dataset_TOGA) then
+ dataset_name = 'TOGA'
+
+ filename_in_common = 'data/Toga_zh.txt'
+ filename_in = 'data/Toga.txt'
+ if (is_output_set == 0) filename_out = 'out_Toga.txt'
else if (dataset_id == dataset_USER) then
dataset_name = 'USER'
else
--
GitLab