Merge pull request #1269 from esm-tools/feat/nml_transit_for_tracer

mandresm · web-flow · commit 6552cee092d5 · 2025-02-14T08:57:49.000+01:00
add namelist.transit to fesom-2.6.yaml
diff --git a/configs/components/fesom/fesom-2.6.yaml b/configs/components/fesom/fesom-2.6.yaml
@@ -92,6 +92,7 @@ namelists:
         - namelist.io
         - namelist.oce
         - namelist.tra
+        - namelist.transit
 
 choose_resolution:
         CORE2:
@@ -513,6 +514,7 @@ config_files:
         io:      io
         oce:     oce
         tra:     tra
+        transit: transit
 
 config_sources:
         config:  "${namelist_dir}/namelist.config"
@@ -524,6 +526,7 @@ config_sources:
         io:      "${namelist_dir}/namelist.io"
         oce:     "${namelist_dir}/namelist.oce"
         tra:     "${namelist_dir}/namelist.tra"
+        transit: "${namelist_dir}/namelist.transit"
 
 compiletime_environment_changes:
         add_export_vars:
@@ -539,6 +542,7 @@ config_in_work:
         io:      "namelist.io"
         oce:     "namelist.oce"
         tra:     "namelist.tra"
+        transit: "namelist.transit"
 
 coupling_fields:
         sst_feom:
diff --git a/namelists/fesom2/2.6/namelist.transit b/namelists/fesom2/2.6/namelist.transit
@@ -0,0 +1,22 @@
+! The namelist file for transient tracers
+
+&transit_param
+l_r14c  = .false.
+l_r39ar = .false.
+l_f11   = .false.
+l_f12   = .false.
+l_sf6   = .false.
+anthro_transit=.false.
+paleo_transit=.false.
+length_transit=1                ! 166 for anthro_transit=.true.
+ti_start_transit=1              ! 1 for D14C, 80 for CFC-12
+ifile_transit='/work/ab0246/a270108/fesom2_recom_config/input-for-awiesm/Table_CO2_isoC_CFCs1112_SF6.txt'
+r14c_a  = 1.0000  ! atm. 14C/C ratio, global mean
+r39ar_a = 1.0000	! atm. 39Ar/Ar ratio, global mean
+xarg_a  = 9.34e-3	! atm. Argon concn. (mole fraction), global mean
+xco2_a  = 284.32e-6	! atm. CO2 concn. (mole fraction), global mean
+dic_0   = 2.00          ! mixed layer DIC concn. (mol / m**3), global mean
+arg_0   = 0.01          ! mixed layer Argon concn. (mol / m**3), global mean
+decay14 = 3.8561e-12    ! decay constant of 14C (1 / s), 1 a = 365.0 d
+decay39 = 8.1708e-11    ! decay constant of 39Ar (1 / s), 1 a = 365.0 d
+/
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.47.1
+current_version = 6.48.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
@@ -117,6 +117,6 @@
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/esm-tools/esm_tools",
-    version="6.47.1",
+    version="6.48.0",
     zip_safe=False,
 )
diff --git a/src/esm_archiving/__init__.py b/src/esm_archiving/__init__.py
@@ -4,7 +4,7 @@
 
 __author__ = """Paul Gierz"""
 __email__ = "pgierz@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .esm_archiving import (archive_mistral, check_tar_lists,
                             delete_original_data, determine_datestamp_location,
diff --git a/src/esm_calendar/__init__.py b/src/esm_calendar/__init__.py
@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .esm_calendar import *
diff --git a/src/esm_cleanup/__init__.py b/src/esm_cleanup/__init__.py
@@ -2,4 +2,4 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
diff --git a/src/esm_database/__init__.py b/src/esm_database/__init__.py
@@ -2,4 +2,4 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
diff --git a/src/esm_environment/__init__.py b/src/esm_environment/__init__.py
@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .esm_environment import *
diff --git a/src/esm_master/__init__.py b/src/esm_master/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 
 from . import database
diff --git a/src/esm_motd/__init__.py b/src/esm_motd/__init__.py
@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .esm_motd import *
diff --git a/src/esm_parser/__init__.py b/src/esm_parser/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 
 from .dict_to_yaml import *
diff --git a/src/esm_plugin_manager/__init__.py b/src/esm_plugin_manager/__init__.py
@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi, Paul Gierz, Sebastian Wahl"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .esm_plugin_manager import *
diff --git a/src/esm_profile/__init__.py b/src/esm_profile/__init__.py
@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .esm_profile import *
diff --git a/src/esm_runscripts/__init__.py b/src/esm_runscripts/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .batch_system import *
 from .chunky_parts import *
diff --git a/src/esm_tests/__init__.py b/src/esm_tests/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """Miguel Andres-Martinez"""
 __email__ = "miguel.andres-martinez@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .initialization import *
 from .read_shipped_data import *
diff --git a/src/esm_tools/__init__.py b/src/esm_tools/__init__.py
@@ -23,7 +23,7 @@
 
 __author__ = """Dirk Barbi, Paul Gierz"""
 __email__ = "dirk.barbi@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 import functools
 import inspect
diff --git a/src/esm_utilities/__init__.py b/src/esm_utilities/__init__.py
@@ -2,6 +2,6 @@
 
 __author__ = """Paul Gierz"""
 __email__ = "pgierz@awi.de"
-__version__ = "6.47.1"
+__version__ = "6.48.0"
 
 from .utils import *

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,6 @@`
`117`	`117`	`test_suite="tests",`
`118`	`118`	`tests_require=test_requirements,`
`119`	`119`	`url="https://github.com/esm-tools/esm_tools",`
`120`		`- version="6.47.1",`
	`120`	`+ version="6.48.0",`
`121`	`121`	`zip_safe=False,`
`122`	`122`	`)`