Bugfix for hardwiring of cn_rnf (river mouths), which should have updated with ln_rnf_new in runscript*slurm #171
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdha
reviewed
Jul 26, 2024
| @@ -168,7 +168,8 @@ rn_si0=0.35, | |||
| sn_chl='chlorophyll',-1,'CHLA',.true.,.true.,'yearly','','','', | |||
| / | |||
| &namsbc_rnf | |||
| cn_dir='./INPUTS/', | |||
| !cn_dir='./INPUTS/', | |||
There was a problem hiding this comment.
should point to INPUTS as this in setup script
| rn_kappa_tdiss = 0.00075398 ! x12 value 0.00006283, ! wave number Jayne and Laurence 2004 value !282.74333! increasedwith x1500^2 x2 | ||
| tdiss_mindepth = 200.0 ! minimum depth to apply tdiss parameterisation | ||
| rn_kappa_tdiss = 0.00075398 ! x12 value 0.00006283, ! wave number Jayne and Laurence 2004 value !282.74333! increasedwith x1500^2 x2 | ||
| tdiss_mindepth = 500.0, ! minimum depth to apply tdiss parameterisation |
There was a problem hiding this comment.
need to double check values - which is current?
There was a problem hiding this comment.
check against MY_SRC_RIV ... if the same only keep one
|
|
||
| if [ "$ln_rnf_new" = ".true." ] | ||
| then | ||
| cn_rnf=".\/JRA_RIVERS\/JRA55_coef.nc',0,'socoefr',.false.,.true.,'yearly'" |
There was a problem hiding this comment.
maybe use sn_cnf to be consistent with Nemo namelist
| @@ -224,6 +233,7 @@ do | |||
| sed -i "s/XXX_RMP_XXX/$ln_tide_ramp/g" namelist_cfg | |||
| sed -i "s/XXX_BTA_XXX/$ln_bt_auto/g" namelist_cfg | |||
| sed -i "s/XXX_BTC_XXX/$rn_bt_cmax/g" namelist_cfg | |||
| sed -i "s/XXX_RNM_XXX/$cn_rnf/g" namelist_cfg | |||
| @@ -169,6 +169,14 @@ else | |||
| ln_zdfevd='.true.' | |||
| fi | |||
|
|
|||
| if [ "$ln_rnf_new" = ".true." ] | |||
| then | |||
| cn_rnf=".\/JRA_RIVERS\/JRA55_coef.nc',0,'socoefr',.false.,.true.,'yearly'" | |||
| @@ -271,6 +279,7 @@ do | |||
| sed -i "s/XXX_RMP_XXX/$ln_tide_ramp/g" namelist_cfg | |||
| sed -i "s/XXX_BTA_XXX/$ln_bt_auto/g" namelist_cfg | |||
| sed -i "s/XXX_BTC_XXX/$rn_bt_cmax/g" namelist_cfg | |||
| sed -i "s/XXX_RNM_XXX/$cn_rnf/g" namelist_cfg | |||
| else | ||
| sn_rnf="'runoff_1m_nomask.nc',-1,'sornficb',.true.,.true.,'yearly'" | ||
| fi | ||
|
|
||
| echo $SLURM_NNODES | ||
|
|
||
| . XXX_ENV_XXX | ||
| . . XXX_ENV_XXX |
There was a problem hiding this comment.
previous statement is correct not this one
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The cn_rnf variable was hardwired in namelist_cfg_template to use the JRA_RIVERS forcing.
When amending the ln_rnf_new variable in runscript*slurm to .FALSE., cn_rnf should have been automatically updating to use the runoff_1m_nomask.nc forcing, but was not.
The runscript*slurm files have been updated (for ARCHER2, but not ANEMONE), and so has the namelist_cfg_template (for v4.0.4, 4.2.1 and 4.2.2). The hardwiring has been removed and the assignment of the namelist_cfg variable from the template now follows the approach used for other variables.