Compare commits

..

No commits in common. "74adbbe3989cd501c6616e7f97e2249dc2259b60" and "0ad363f19d8cbde36f8b9f2a2f3bb94992f51273" have entirely different histories.

2 changed files with 4 additions and 4 deletions

4
INPUT_FILES/namelist_cfg_naa10km_1979_1992_era5 Executable file → Normal file
View File

@ -198,11 +198,11 @@
nn_rnf_depth_file = 1 ! create (=1) a runoff depth file or not (=0) nn_rnf_depth_file = 1 ! create (=1) a runoff depth file or not (=0)
ln_rnf_icb = .false. ! read in iceberg flux from a file (fill sn_i_rnf if .true.) ln_rnf_icb = .false. ! read in iceberg flux from a file (fill sn_i_rnf if .true.)
cn_dir = './' ! root directory for the runoff data location cn_dir = './runofft/' ! root directory for the runoff data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________! !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask ! ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename ! ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
sn_rnf = 'runoff_daitren_clim_smooth.nc' , -1 , 'runoff', .true. , .true. , 'yearly' , '' , '' , '' sn_rnf = 'runofft' , -1 , 'runoff', .true. , .false. , 'yearly' , '' , '' , ''
sn_cnf = 'runoff_coef_AGI' , 0 , 'mouthmask', .false. , .true. , 'yearly' , '' , '' , '' sn_cnf = 'runoff_coef_AGI' , 0 , 'mouthmask', .false. , .true. , 'yearly' , '' , '' , ''
sn_s_rnf = 'runoffs' , 24. , 'rosaline', .true. , .true. , 'yearly' , '' , '' , '' sn_s_rnf = 'runoffs' , 24. , 'rosaline', .true. , .true. , 'yearly' , '' , '' , ''
sn_t_rnf = 'runoffs' , 24. , 'rotemper', .true. , .true. , 'yearly' , '' , '' , '' sn_t_rnf = 'runoffs' , 24. , 'rotemper', .true. , .true. , 'yearly' , '' , '' , ''

4
INPUT_FILES/namelist_cfg_naa10km_1993_2019_era5 Executable file → Normal file
View File

@ -188,7 +188,7 @@
ln_rnf_mouth = .true. ! specific treatment at rivers mouths ln_rnf_mouth = .true. ! specific treatment at rivers mouths
rn_hrnf = 15.e0 ! depth over which enhanced vertical mixing is used (ln_rnf_mouth=T) rn_hrnf = 15.e0 ! depth over which enhanced vertical mixing is used (ln_rnf_mouth=T)
rn_avt_rnf = 1.e-3 ! value of the additional vertical mixing coef. [m2/s] (ln_rnf_mouth=T) rn_avt_rnf = 1.e-3 ! value of the additional vertical mixing coef. [m2/s] (ln_rnf_mouth=T)
rn_rfact = 1.e0 ! multiplicative factor for runoff rn_rfact = 1.e0 ! multiplicative factor for runoff
ln_rnf_depth = .false. ! read in depth information for runoff ln_rnf_depth = .false. ! read in depth information for runoff
ln_rnf_tem = .false. ! read in temperature information for runoff ln_rnf_tem = .false. ! read in temperature information for runoff
ln_rnf_sal = .false. ! read in salinity information for runoff ln_rnf_sal = .false. ! read in salinity information for runoff
@ -202,7 +202,7 @@
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________! !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask ! ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename ! ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
sn_rnf = 'runoff_daitren_clim_smooth.nc' , -1 , 'runoff', .true. , .true. , 'yearly' , '' , '' , '' sn_rnf = 'runoff_daitren_clim_smooth_p2p.nc' , -1 , 'runoff', .true. , .true. , 'yearly' , '' , '' , ''
sn_cnf = 'runoff_coef_AGI' , 0 , 'mouthmask', .false. , .true. , 'yearly' , '' , '' , '' sn_cnf = 'runoff_coef_AGI' , 0 , 'mouthmask', .false. , .true. , 'yearly' , '' , '' , ''
sn_s_rnf = 'runoffs' , 24. , 'rosaline', .true. , .true. , 'yearly' , '' , '' , '' sn_s_rnf = 'runoffs' , 24. , 'rosaline', .true. , .true. , 'yearly' , '' , '' , ''
sn_t_rnf = 'runoffs' , 24. , 'rotemper', .true. , .true. , 'yearly' , '' , '' , '' sn_t_rnf = 'runoffs' , 24. , 'rotemper', .true. , .true. , 'yearly' , '' , '' , ''