From 826cf7b2d499dc5f8b4e3c12f6d9f17f65d71e58 Mon Sep 17 00:00:00 2001
From: Stefan Hagemann <stefan.hagemann@hereon.de>
Date: Mon, 20 Jan 2025 13:46:33 +0100
Subject: [PATCH] convert_inflow.com - isrc=1 is now global 5 Min. instead of
HD vs 4-Europe
---
util/convert_discharge.f90 | 25 ++++++++++++++-----------
util/convert_inflow.com | 9 +++++----
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/util/convert_discharge.f90 b/util/convert_discharge.f90
index d634650..034c6f0 100644
--- a/util/convert_discharge.f90
+++ b/util/convert_discharge.f90
@@ -104,8 +104,8 @@
! 4 As 3, but with both masks prescribed
CHARACTER (len=2) :: cin ! Command line input parameter for source mouth mask
INTEGER :: isrc = 2 ! Source data ID:
- ! 1 HD model Vs. 4
- ! 2 HD model Vs. 5
+ ! 1 HD model Vs. 5 - Global 5 Min.
+ ! 2 HD model Vs. 5 - Europe 5 Min.
! 3 HD model Vs. 1.11
! 4 mHm
! 5 Utes standard input
@@ -355,7 +355,7 @@
CHARACTER (len=20), DIMENSION(isrcmax) :: cname_src ! Source model names
CHARACTER (len=20), DIMENSION(iocmax) :: cname_oc ! Ocean model names
!
- DATA cname_src / 'hd_vs4', 'hd_vs5', 'hd_vs1_1x', 'mhm_vs2', 'ute', 'mpiom-bgc', 'mpiom' /
+ DATA cname_src / 'hd_vs5-glob', 'hd_vs5-euro', 'hd_vs1_1x', 'mhm_vs2', 'ute', 'mpiom-bgc', 'mpiom' /
DATA cname_oc / 'nemo', 'ecosmo3', 'SCHISM', 'ecosmo2', 'iconomip', &
'nsea', 'icon-coast', 'nemo_vs4', 'trim', 'nemo-med7km', &
'hd_vs4', 'hd_vs5', 'hd_vs1_11', 'mom', 'nemo_nss' /
@@ -480,7 +480,8 @@
IX(6) = 262 ; IY(6) = 324 ; INEWX(6) = 50 ; INEWY(6) = 142 ! Maass -> Separation from Rhine
CALL define_separation(IX(6), IY(6), 250, 325) ! Separation of Maass from Rhine
mask_src%value(IX(6), IY(6)) = 1
- ELSE IF (isrc.EQ.1 .OR. isrc.EQ.2) THEN ! HD Vs. 4 & 5 - Euro 5 Min. source
+!1 ELSE IF (isrc.EQ.1 .OR. isrc.EQ.2) THEN ! HD Vs. 4 & 5 - Euro 5 Min. source
+ ELSE IF (isrc.EQ.2) THEN ! isrc=1 is now the global 5 Min. grid - Jan. 2025
NCORR=9
ALLOCATE(IX(NCORR)) ; ALLOCATE(IY(NCORR))
ALLOCATE(INEWX(NCORR)) ; ALLOCATE(INEWY(NCORR))
@@ -498,11 +499,9 @@
IREMX(8) = 20 ; IREMY(8) = 167 ! French coast (too much runoff)
!
! *** Correction
- IF (isrc.EQ.1) THEN
- IX(1) = 251 ; IY(1) = 222 ; INEWX(1) = 78 ; INEWY(1) = 120 ! Elbe
- ELSE IF (isrc.EQ.2) THEN
- IX(1) = 246 ; IY(1) = 220 ; INEWX(1) = 78 ; INEWY(1) = 120 ! Elbe
- ENDIF
+!! IF (isrc.EQ.1) THEN ! Correction for Vs 4. Europe
+!! IX(1) = 251 ; IY(1) = 222 ; INEWX(1) = 78 ; INEWY(1) = 120 ! Elbe
+ IX(1) = 246 ; IY(1) = 220 ; INEWX(1) = 78 ; INEWY(1) = 120 ! Elbe
IX(2) = 200 ; IY(2) = 233 ; INEWX(2) = 57 ; INEWY(2) = 128 ! Ijssel (before 54, 134)
IX(3) = 393 ; IY(3) = 75 ; INEWX(3) = 158 ; INEWY(3) = 7 ! Lule (before 161, 4)
IX(4) = 81 ; IY(4) = 175 ; INEWX(4) = 5 ; INEWY(4) = 83 ! Ness
@@ -558,8 +557,8 @@
! ***********************************************************************************
INTEGER, INTENT(in) :: isrc ! Source data model ID:
- ! 1 HD model Vs. 4
- ! 2 HD model Vs. 5
+ ! 1 HD model Vs. 5 - Global
+ ! 2 HD model Vs. 5 - Europe
! 3 HD model Vs. 1.10
! 4 mHm
! 5 Utes standard input
@@ -602,6 +601,10 @@
IF (iocean.EQ.3) map_char%dist_max=40000. ! Necessary in Northern Russia
IF (iocean.EQ.4) map_char%dist_max=100000. ! ECOSMO-10 km ocean coast very smooth --> 200 km
IF (iocean.EQ.6) map_char%dist_max=57000. ! N Sea model: Rhine are in, Baltc Sea out
+ IF (iocean.EQ.7) THEN
+ map_char%dist_max_prime=60000. !
+ map_char%dist_max=600000. !
+ ENDIF
IF (iocean.EQ.9) map_char%dist_max=200000. ! TRIM ocean coast is smooth --> 200 km
IF (iocean.EQ.10) map_char%dist_max=80000. ! Necessary in Greece
IF (iocean.EQ.14) map_char%dist_max=50000. !
diff --git a/util/convert_inflow.com b/util/convert_inflow.com
index e404381..4138d88 100755
--- a/util/convert_inflow.com
+++ b/util/convert_inflow.com
@@ -45,7 +45,7 @@ if [ "$IOCEAN" = "" ] && [ "$ISRC" = "" ]; then
echo " -i <7-digit ID>, ID = Source exp. no., Default: Last Exp. no. "
echo " -b <BGC mode>, 0=No data conversion, 1=Discharge only (Def.), 2=1 or more tracers"
echo " 3=Bias corrected discharge, 4=Bias corrected tracer flow (planned)"
- echo " -s <Source>, 1=HD4, 2=HD5 (Def), 3=HD1.10, 4=mHm, 5=Ute, 6=MPIOM-BGC, 7=MPIOM"
+ echo " -s <Source>, 1=HD5-glob, 2=HD5-euro (Def), 3=HD1.10, 4=mHm, 5=Ute, 6=MPIOM-BGC, 7=MPIOM"
echo " -u <mouth file> optional: mouth mask on source grid"
echo " -o <Ocean target>, 1=NEMO3.6, 2=ECOSMO3, 3=SCHISM, 4=ECOSMO2, 5=ICON, 6=Nils, 7=ICON-C "
echo " 8=NEMO4.0, 9=TRIM,10=NEMO-med, 11=HD4, 12=HD5, 13=HD1.10, 14=MOM, 15=NEMO-NSS"
@@ -120,8 +120,8 @@ if [ "$ISRC" = "" ]; then
ISRC=2 ; HDVS=vs5_1 ; CHD=hd5_1
else
case $ISRC in
- 1 ) echo "Source data: HD Model Vs. 4" ; CHD=hd4 ; HDVS=vs4 ;;
- 2 ) echo "Source data: HD Model Vs. 5" ; CHD=hd5_1 ; HDVS=vs5_1 ;;
+ 1 ) echo "Source data: HD Model Vs. 5-glob" ; CHD=hd5-glob ; HDVS=vs5_1 ;;
+ 2 ) echo "Source data: HD Model Vs. 5-euro" ; CHD=hd5-euro ; HDVS=vs5_1 ;;
3 ) echo "Source data: HD Model Vs. 1.11" ; CHD=hd1_11 ; HDVS=vs1_11 ;;
4 ) echo "Source data: mHm Vs. 2" ; CHD=mhm ; HDVS=mhm ;;
5 ) echo "Source data: Utes standard input" ; CHD=usid ; HDVS=ute ;;
@@ -306,7 +306,8 @@ fi
cd $DRUN
case $ISRC in
- 1 ) DNHDPARA=${DIN}/euro5min/hdpara_vs4d_euro5min.nc ; cgr='5-Min.' ;; # cgr is currently a dummy
+ 1 ) DNHDPARA=${DIN}/5min/hdpara_${HDVS}.nc ; cgr='5-Min.' # cgr is currently a dummy
+ ulimit -s 200000 ;;
2 ) DNHDPARA=${DIN}/euro5min/hdpara_${HDVS}_euro5min.nc ; cgr='5-Min.' ;; # e.g. HDVS=vs5_0
# 3 ) DNHDPARA=${DIN}/05deg/hdpara_vs1_10_ext.nc ; cgr='0.5' ;;
3 ) DNHDPARA=${DIN}/05deg/hdpara_${HDVS}.nc ; cgr='0.5' ;;
--
GitLab