From 578df0dc73902d5d17ba4e106b60abea34ed410a Mon Sep 17 00:00:00 2001
From: Guillaume Samson <guillaume.samson@mercator-ocean.fr>
Date: Wed, 11 Jan 2023 17:08:20 +0000
Subject: [PATCH] Merge branch '152-wrong-comment-in-namelist_top_cfg' into
'main'
Resolve "Wrong comment in namelist_top_cfg"
Closes #152
See merge request nemo/nemo!224
(cherry picked from commit c11fe4adc2b64c8bb282b2b37ee520f032b5ec72)
7a762e6f Fix namelist comment
---
cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_top_cfg | 2 +-
cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_top_cfg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_top_cfg b/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_top_cfg
index 14d9a89e..dd3f17f3 100644
--- a/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_top_cfg
+++ b/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_top_cfg
@@ -114,7 +114,7 @@
sn_trcsbc(14) = 'dust.orca.new' , -1 , 'dustfer' , .true. , .true. , 'yearly' , '' , '' , ''
sn_trcsbc(23) = 'ndeposition.orca', -12 , 'ndep' , .false. , .true. , 'yearly' , '' , '' , ''
rn_trsfac(5) = 3.774194e-02 ! ( 1E-3 / 31. * 117 )
- rn_trsfac(7) = 9.572954e-03 ! ( 8.8 / 28.1 )
+ rn_trsfac(7) = 9.572954e-03 ! ( 0.269 / 28.1 )
rn_trsfac(14) = 6.2667860e-04 ! ( 0.035 / 55.85 )
rn_trsfac(23) = 5.2232143e-01 ! ( From kgN m-2 s-1 to molC l-1 ====> zfact = 7.3125/14 )
rn_sbc_time = 1. ! Time scaling factor for SBC and CBC data (seconds in a day)
diff --git a/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_top_cfg b/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_top_cfg
index 14d9a89e..dd3f17f3 100644
--- a/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_top_cfg
+++ b/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_top_cfg
@@ -114,7 +114,7 @@
sn_trcsbc(14) = 'dust.orca.new' , -1 , 'dustfer' , .true. , .true. , 'yearly' , '' , '' , ''
sn_trcsbc(23) = 'ndeposition.orca', -12 , 'ndep' , .false. , .true. , 'yearly' , '' , '' , ''
rn_trsfac(5) = 3.774194e-02 ! ( 1E-3 / 31. * 117 )
- rn_trsfac(7) = 9.572954e-03 ! ( 8.8 / 28.1 )
+ rn_trsfac(7) = 9.572954e-03 ! ( 0.269 / 28.1 )
rn_trsfac(14) = 6.2667860e-04 ! ( 0.035 / 55.85 )
rn_trsfac(23) = 5.2232143e-01 ! ( From kgN m-2 s-1 to molC l-1 ====> zfact = 7.3125/14 )
rn_sbc_time = 1. ! Time scaling factor for SBC and CBC data (seconds in a day)
--
GitLab