diff --git a/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_cfg b/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_cfg
index cbcad36bc885e5dbed8efccba54bd9a0c7b82e68..77e71d976479ff2cde30d840b1452ea009d2d767 100755
--- a/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_cfg
+++ b/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_cfg
@@ -5,26 +5,26 @@
&namrun ! parameters of the run
!-----------------------------------------------------------------------
cn_exp = "INDIAN" ! experience name
- nn_it000 = 1 !43201 ! first time step
- nn_itend = 3000 !2881 !43679 !86400 ! last time step (std 1 day = 144) (for dt = 6 min, so 240*dt = 1 day)
+ nn_it000 = 57601 ! first time step ! CHNAGE THIS TO END OF LAST RUN + 1
+ nn_itend = 138240 ! last time step (std 1 day = 144) (for dt = 6 min, so 240*dt = 1 day) ! CHANGE THIS TO THIS + 56 DAYS
nn_date0 = 20160101 !20110717 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
nn_time0 = 0 ! initial time of day in hhmm
nn_leapy = 1 ! Leap year calendar (1) or not (0)
- ln_rstart = .false. ! start from rest (F) or from a restart file (T)
+ ln_rstart = .true. ! start from rest (F) or from a restart file (T)
nn_euler = 1 ! = 0 : start with forward time step if ln_rstart=T
nn_rstctl = 2 ! restart control ==> activated only if ln_rstart=T
! ! = 0 nn_date0 read in namelist ; nn_it000 : read in namelist
! ! = 1 nn_date0 read in namelist ; nn_it000 : check consistancy between namelist and restart
! ! = 2 nn_date0 read in restart ; nn_it000 : check consistancy between namelist and restart
- cn_ocerst_in = "AMMSURGE_00043679_restart" ! suffix of ocean restart name (input)
- cn_ocerst_indir = "./restart_file_nonCyclone_season" ! directory from which to read input ocean restarts
+ cn_ocerst_in = "INDIAN_00057600_restart" ! suffix of ocean restart name (input) ! CHANGE THIS TO LAST RESTART FILE NUMBER
+ cn_ocerst_indir = "./restarts" ! directory from which to read input ocean restarts
cn_ocerst_out = "restart" ! suffix of ocean restart name (output)
cn_ocerst_outdir= "./restarts" ! directory in which to write output ocean restarts
! nn_euler = 1 ! = 0 : start with forward time step if ln_rstart=.true.
! cn_ocerst_in = "ammsurge_restart_oce" ! suffix of ocean restart name (input)
! cn_ocerst_out = "restart_oce_out" ! suffix of ocean restart name (input)
nn_istate = 0 ! output the initial state (1) or not (0)
- nn_stock = 44160 ! 86400 ! frequency of creation of a restart file (modulo referenced to 1)
+ nn_stock = 40320 ! frequency of creation of a restart file (modulo referenced to 1) ! 28 DAYS
nn_write = 10 ! 86400 ! frequency of write in the output file (modulo referenced to nit000)
/
!-----------------------------------------------------------------------
@@ -70,7 +70,7 @@
ln_blk = .true.
ln_apr_dyn = .false. ! Patm gradient added in ocean & ice Eqs. (T => fill namsbc_apr )
nn_ice = 0 ! =0 no ice boundary condition ,
- ln_rnf = .false. ! Runoffs (T => fill namsbc_rnf)
+ ln_rnf = .true. ! Runoffs (T => fill namsbc_rnf)
ln_ssr = .false. ! Sea Surface Restoring on T and/or S (T => fill namsbc_ssr)
ln_traqsr = .false. ! Light penetration in the ocean (T => fill namtra_qsr)
nn_fwb = 0 ! FreshWater Budget: =0 unchecked
@@ -163,28 +163,35 @@
ln_bdy = .true.
nb_bdy = 1 ! number of open boundary sets
cn_coords_file = 'coordinates.bdy.nc' ! bdy coordinates files
- cn_dyn2d = 'flather' !
- nn_dyn2d_dta = 2 ! = 0, bdy data are equal to the initial state
+ cn_dyn2d = 'flather' ! was flather
+ nn_dyn2d_dta = 3 ! = 0, bdy data are equal to the initial state
! = 1, bdy data are read in 'bdydata .nc' files
! = 2, use tidal harmonic forcing data from files
! = 3, use external data AND tidal harmonic forcing
- cn_tra = 'frs' !
- nn_tra_dta = 0 ! = 0, bdy data are equal to the initial state
+
+ cn_dyn3d = 'frs' !
+ nn_dyn3d_dta = 1 ! = 0, bdy data are equal to the initial state
+ ! = 1, bdy data are read in 'bdydata .nc' files
+
+
+ cn_tra = 'frs' ! 'frs'
+ nn_tra_dta = 1 ! = 0, bdy data are equal to the initial state
! = 1, bdy data are read in 'bdydata .nc' files
- nn_rimwidth = 1 ! width of the relaxation zone
+ nn_rimwidth = 1 ! width of the relaxation zone
+ ln_tra_dmp = .false.
/
!-----------------------------------------------------------------------
&nambdy_dta ! open boundaries - external data
!-----------------------------------------------------------------------
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F ) ! 'monthly' ! filename ! pairing ! filename !
- bn_ssh = 'INDIAN_bt_bdyT', 24 , 'sossheig', .true. , .false. , 'monthly' , '' , '' , ''
- bn_u2d = 'INDIAN_bdyU', 24 , 'vobtcrtx', .true. , .false. , 'monthly' , '' , '' , ''
- bn_v2d = 'INDIAN_bdyV', 24 , 'vobtcrty', .true. , .false. , 'monthly' , '' , '' , ''
- bn_u3d = 'INDIAN_bdyU' 24 , 'vozocrtx', .true. , .false. , 'monthly' , '' , '' , ''
- bn_v3d = 'INDIAN_bdyV' 24 , 'vomecrty', .true. , .false. , 'monthly' , '' , '' , ''
- bn_tem = 'INDIAN_bdyT' 24 , 'votemper', .true. , .false. , 'monthly' , '' , '' , ''
- bn_sal = 'INDIAN_bdyT' 24 , 'vosaline', .true. , .false. , 'monthly' , '' , '' , ''
+ bn_ssh = 'INDIAN_bdy_SSH' , 24 , 'sossheig', .true. , .false. , 'monthly' , '' , '' , ''
+ bn_u2d = 'INDIAN_bdy_U' , 24 , 'vobtcrtx', .true. , .false. , 'monthly' , '' , '' , ''
+ bn_v2d = 'INDIAN_bdy_V' , 24 , 'vobtcrty', .true. , .false. , 'monthly' , '' , '' , ''
+ bn_u3d = 'INDIAN_bdy_U' , 24 , 'vozocrtx', .true. , .false. , 'monthly' , '' , '' , ''
+ bn_v3d = 'INDIAN_bdy_V' , 24 , 'vomecrty', .true. , .false. , 'monthly' , '' , '' , ''
+ bn_tem = 'INDIAN_bdy_TEMP', 24 , 'votemper', .true. , .false. , 'monthly' , '' , '' , ''
+ bn_sal = 'INDIAN_bdy_SAL' , 24 , 'vosaline', .true. , .false. , 'monthly' , '' , '' , ''
/
!-----------------------------------------------------------------------
&nambdy_tide ! tidal forcing at open boundaries
diff --git a/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_ref b/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_ref
index c8e8cd51b093afaf3541dfea76657b082dc4b27c..d301714c2823a2b470b4cc49773e571e16b7a8fe 100755
--- a/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_ref
+++ b/NAMELISTS_AND_FORTRAN_FILES/RUN_DIRECTORY/namelist_ref
@@ -244,7 +244,6 @@
sn_prec= 'ERA5_TP', 1, 'TP', .true., .false., 'yearly', 'weights_era5_INDIAN_bicubic.nc', '', 'ERA5_LSM'
sn_qlw = 'ERA5_STRD', 1, 'STRD', .true., .false., 'yearly', 'weights_era5_INDIAN_bicubic.nc', '', 'ERA5_LSM'
sn_qsr= 'ERA5_SSRD', 1, 'SSRD', .true., .false., 'yearly', 'weights_era5_INDIAN_bicubic.nc', '', 'ERA5_LSM'
- sn_qsr= 'ERA5_SF', 1, 'SF', .true., .false., 'yearly', 'weights_era5_INDIAN_bicubic.nc', '', 'ERA5_LSM'
sn_snow= 'ERA5_SF', 1, 'SF', .true., .false., 'yearly', 'weights_era5_INDIAN_bicubic.nc', '', 'ERA5_LSM'
sn_tair= 'ERA5_T2M', 1, 'T2M', .true., .false., 'yearly', 'weights_era5_INDIAN_bicubic.nc', '', 'ERA5_LSM'
sn_wndi= 'ERA5_U10', 1, 'U10', .true., .false., 'yearly', 'weights_era5_INDIAN_bicubic.nc', 'Uwnd', 'ERA5_LSM'
@@ -348,14 +347,14 @@
!-----------------------------------------------------------------------
! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
- sn_rnf = 'runoff_core_monthly', -1 , 'sorunoff', .true. , .true. , 'yearly' , '' , '' , ''
- sn_cnf = 'runoff_core_monthly', 0 , 'socoefr0', .false. , .true. , 'yearly' , '' , '' , ''
+ sn_rnf = 'river_test' , -1 , 'rorunoff', .true. , .true. , 'yearly' , '' , '' , ''
+ sn_cnf = 'river_test' , 0 , 'socoefr0', .false. , .true. , 'yearly' , '' , '' , ''
sn_s_rnf = 'runoffs' , 24 , 'rosaline', .true. , .true. , 'yearly' , '' , '' , ''
sn_t_rnf = 'runoffs' , 24 , 'rotemper', .true. , .true. , 'yearly' , '' , '' , ''
sn_dep_rnf = 'runoffs' , 0 , 'rodepth' , .false. , .true. , 'yearly' , '' , '' , ''
cn_dir = './' ! root directory for the location of the runoff files
- ln_rnf_mouth= .true. ! specific treatment at rivers mouths
+ ln_rnf_mouth= .false. ! specific treatment at rivers mouths
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_rfact = 1.e0 ! multiplicative factor for runoff
diff --git a/SCRIPTS/data_organiser16.sh b/SCRIPTS/data_organiser16.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fc623012818b98a7d5d29030b61b3a666f64cc95
--- /dev/null
+++ b/SCRIPTS/data_organiser16.sh
@@ -0,0 +1,101 @@
+cd /work/n01/n01/ashbre/INDIAN_OCEAN_AUTO/BOUNDARY_FORCING/SAL16_dir
+
+mkdir JAN
+
+mv Sal_16_000* JAN
+mv Sal_16_001* JAN
+mv Sal_16_002* JAN
+mv Sal_16_0030.nc JAN
+
+mkdir FEB
+
+mv Sal_16_003* FEB
+mv Sal_16_004* FEB
+mv Sal_16_005* FEB
+
+mkdir MAR
+
+mv Sal_16_006* MAR
+mv Sal_16_007* MAR
+mv Sal_16_008* MAR
+mv Sal_16_0090.nc MAR
+
+mkdir APR
+
+mv Sal_16_009* APR
+mv Sal_16_010* APR
+mv Sal_16_011* APR
+mv Sal_16_0120.nc APR
+
+mkdir MAY
+
+mv Sal_16_012* MAY
+mv Sal_16_013* MAY
+mv Sal_16_014* MAY
+mv Sal_16_0150.nc MAY
+mv Sal_16_0151.nc MAY
+
+mkdir JUN
+
+mv Sal_16_015* JUN
+mv Sal_16_016* JUN
+mv Sal_16_017* JUN
+mv Sal_16_0180.nc JUN
+mv Sal_16_0181.nc JUN
+
+mkdir JUL
+
+mv Sal_16_018* JUL
+mv Sal_16_019* JUL
+mv Sal_16_020* JUL
+mv Sal_16_0210.nc JUL
+mv Sal_16_0211.nc JUL
+mv Sal_16_0212.nc JUL
+
+mkdir AUG
+
+mv Sal_16_021* AUG
+mv Sal_16_022* AUG
+mv Sal_16_023* AUG
+mv Sal_16_0240.nc AUG
+mv Sal_16_0241.nc AUG
+mv Sal_16_0242.nc AUG
+mv Sal_16_0243.nc AUG
+
+mkdir SEP
+
+mv Sal_16_024* SEP
+mv Sal_16_025* SEP
+mv Sal_16_026* SEP
+mv Sal_16_0270.nc SEP
+mv Sal_16_0271.nc SEP
+mv Sal_16_0272.nc SEP
+mv Sal_16_0273.nc SEP
+
+mkdir OCT
+
+mv Sal_16_027* OCT
+mv Sal_16_028* OCT
+mv Sal_16_029* OCT
+mv Sal_16_0300.nc OCT
+mv Sal_16_0301.nc OCT
+mv Sal_16_0302.nc OCT
+mv Sal_16_0303.nc OCT
+mv Sal_16_0304.nc OCT
+
+mkdir NOV
+
+mv Sal_16_030* NOV
+mv Sal_16_031* NOV
+mv Sal_16_032* NOV
+mv Sal_16_0330.nc NOV
+mv Sal_16_0331.nc NOV
+mv Sal_16_0332.nc NOV
+mv Sal_16_0333.nc NOV
+mv Sal_16_0334.nc NOV
+
+mkdir DEC
+
+mv Sal_16_03* DEC
+
+cd ..
diff --git a/SCRIPTS/data_organiser17.sh b/SCRIPTS/data_organiser17.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8ec8016cd401313d8f9918c9c0eed598fe752aee
--- /dev/null
+++ b/SCRIPTS/data_organiser17.sh
@@ -0,0 +1,101 @@
+cd /work/n01/n01/ashbre/INDIAN_OCEAN_AUTO/BOUNDARY_FORCING/V017_dir
+
+mkdir JAN
+
+mv V0_17_000* JAN
+mv V0_17_001* JAN
+mv V0_17_002* JAN
+mv V0_17_0030.nc JAN
+
+mkdir FEB
+
+mv V0_17_003* FEB
+mv V0_17_004* FEB
+mv V0_17_0050.nc FEB
+mv V0_17_0051.nc FEB
+mv V0_17_0052.nc FEB
+mv V0_17_0053.nc FEB
+mv V0_17_0054.nc FEB
+mv V0_17_0055.nc FEB
+mv V0_17_0056.nc FEB
+mv V0_17_0057.nc FEB
+mv V0_17_0058.nc FEB
+
+mkdir MAR
+
+mv V0_17_005* MAR
+mv V0_17_006* MAR
+mv V0_17_007* MAR
+mv V0_17_008* MAR
+
+mkdir APR
+
+mv V0_17_009* APR
+mv V0_17_010* APR
+mv V0_17_011* APR
+
+mkdir MAY
+
+mv V0_17_012* MAY
+mv V0_17_013* MAY
+mv V0_17_014* MAY
+mv V0_17_0150.nc MAY
+
+mkdir JUN
+
+mv V0_17_015* JUN
+mv V0_17_016* JUN
+mv V0_17_017* JUN
+mv V0_17_0180.nc JUN
+
+mkdir JUL
+
+mv V0_17_018* JUL
+mv V0_17_019* JUL
+mv V0_17_020* JUL
+mv V0_17_0210.nc JUL
+mv V0_17_0211.nc JUL
+
+mkdir AUG
+
+mv V0_17_021* AUG
+mv V0_17_022* AUG
+mv V0_17_023* AUG
+mv V0_17_0240.nc AUG
+mv V0_17_0241.nc AUG
+mv V0_17_0242.nc AUG
+
+mkdir SEP
+
+mv V0_17_024* SEP
+mv V0_17_025* SEP
+mv V0_17_026* SEP
+mv V0_17_0270.nc SEP
+mv V0_17_0271.nc SEP
+mv V0_17_0272.nc SEP
+
+mkdir OCT
+
+mv V0_17_027* OCT
+mv V0_17_028* OCT
+mv V0_17_029* OCT
+mv V0_17_0300.nc OCT
+mv V0_17_0301.nc OCT
+mv V0_17_0302.nc OCT
+mv V0_17_0303.nc OCT
+
+mkdir NOV
+
+mv V0_17_030* NOV
+mv V0_17_031* NOV
+mv V0_17_032* NOV
+mv V0_17_0330.nc NOV
+mv V0_17_0331.nc NOV
+mv V0_17_0332.nc NOV
+mv V0_17_0333.nc NOV
+
+mkdir DEC
+
+mv V0_17_03* DEC
+
+cd ..
diff --git a/SCRIPTS/data_organiser18.sh b/SCRIPTS/data_organiser18.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e4931a3681325cad0523d7e074d356d902de72da
--- /dev/null
+++ b/SCRIPTS/data_organiser18.sh
@@ -0,0 +1,101 @@
+cd /work/n01/n01/ashbre/INDIAN_OCEAN_AUTO/BOUNDARY_FORCING/SAL18_dir
+
+mkdir JAN
+
+mv Sal_18_000* JAN
+mv Sal_18_001* JAN
+mv Sal_18_002* JAN
+mv Sal_18_0030.nc JAN
+
+mkdir FEB
+
+mv Sal_18_003* FEB
+mv Sal_18_004* FEB
+mv Sal_18_005* FEB
+
+mkdir MAR
+
+mv Sal_18_006* MAR
+mv Sal_18_007* MAR
+mv Sal_18_008* MAR
+mv Sal_18_0090.nc MAR
+
+mkdir APR
+
+mv Sal_18_009* APR
+mv Sal_18_010* APR
+mv Sal_18_011* APR
+mv Sal_18_0120.nc APR
+
+mkdir MAY
+
+mv Sal_18_012* MAY
+mv Sal_18_013* MAY
+mv Sal_18_014* MAY
+mv Sal_18_0150.nc MAY
+mv Sal_18_0151.nc MAY
+
+mkdir JUN
+
+mv Sal_18_015* JUN
+mv Sal_18_016* JUN
+mv Sal_18_017* JUN
+mv Sal_18_0180.nc JUN
+mv Sal_18_0181.nc JUN
+
+mkdir JUL
+
+mv Sal_18_018* JUL
+mv Sal_18_019* JUL
+mv Sal_18_020* JUL
+mv Sal_18_0210.nc JUL
+mv Sal_18_0211.nc JUL
+mv Sal_18_0212.nc JUL
+
+mkdir AUG
+
+mv Sal_18_021* AUG
+mv Sal_18_022* AUG
+mv Sal_18_023* AUG
+mv Sal_18_0240.nc AUG
+mv Sal_18_0241.nc AUG
+mv Sal_18_0242.nc AUG
+mv Sal_18_0243.nc AUG
+
+mkdir SEP
+
+mv Sal_18_024* SEP
+mv Sal_18_025* SEP
+mv Sal_18_026* SEP
+mv Sal_18_0270.nc SEP
+mv Sal_18_0271.nc SEP
+mv Sal_18_0272.nc SEP
+mv Sal_18_0273.nc SEP
+
+mkdir OCT
+
+mv Sal_18_027* OCT
+mv Sal_18_028* OCT
+mv Sal_18_029* OCT
+mv Sal_18_0300.nc OCT
+mv Sal_18_0301.nc OCT
+mv Sal_18_0302.nc OCT
+mv Sal_18_0303.nc OCT
+mv Sal_18_0304.nc OCT
+
+mkdir NOV
+
+mv Sal_18_030* NOV
+mv Sal_18_031* NOV
+mv Sal_18_032* NOV
+mv Sal_18_0330.nc NOV
+mv Sal_18_0331.nc NOV
+mv Sal_18_0332.nc NOV
+mv Sal_18_0333.nc NOV
+mv Sal_18_0334.nc NOV
+
+mkdir DEC
+
+mv Sal_18_03* DEC
+
+cd ..
diff --git a/SCRIPTS/data_organiser19.sh b/SCRIPTS/data_organiser19.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6e011fe98f7aaea4c7c5b65f4ae0bb3b52f1f983
--- /dev/null
+++ b/SCRIPTS/data_organiser19.sh
@@ -0,0 +1,101 @@
+cd /work/n01/n01/ashbre/INDIAN_OCEAN_AUTO/BOUNDARY_FORCING/SAL19_dir
+
+mkdir JAN
+
+mv Sal_19_000* JAN
+mv Sal_19_001* JAN
+mv Sal_19_002* JAN
+mv Sal_19_0030.nc JAN
+
+mkdir FEB
+
+mv Sal_19_003* FEB
+mv Sal_19_004* FEB
+mv Sal_19_005* FEB
+
+mkdir MAR
+
+mv Sal_19_006* MAR
+mv Sal_19_007* MAR
+mv Sal_19_008* MAR
+mv Sal_19_0090.nc MAR
+
+mkdir APR
+
+mv Sal_19_009* APR
+mv Sal_19_010* APR
+mv Sal_19_011* APR
+mv Sal_19_0120.nc APR
+
+mkdir MAY
+
+mv Sal_19_012* MAY
+mv Sal_19_013* MAY
+mv Sal_19_014* MAY
+mv Sal_19_0150.nc MAY
+mv Sal_19_0151.nc MAY
+
+mkdir JUN
+
+mv Sal_19_015* JUN
+mv Sal_19_016* JUN
+mv Sal_19_017* JUN
+mv Sal_19_0180.nc JUN
+mv Sal_19_0181.nc JUN
+
+mkdir JUL
+
+mv Sal_19_018* JUL
+mv Sal_19_019* JUL
+mv Sal_19_020* JUL
+mv Sal_19_0210.nc JUL
+mv Sal_19_0211.nc JUL
+mv Sal_19_0212.nc JUL
+
+mkdir AUG
+
+mv Sal_19_021* AUG
+mv Sal_19_022* AUG
+mv Sal_19_023* AUG
+mv Sal_19_0240.nc AUG
+mv Sal_19_0241.nc AUG
+mv Sal_19_0242.nc AUG
+mv Sal_19_0243.nc AUG
+
+mkdir SEP
+
+mv Sal_19_024* SEP
+mv Sal_19_025* SEP
+mv Sal_19_026* SEP
+mv Sal_19_0270.nc SEP
+mv Sal_19_0271.nc SEP
+mv Sal_19_0272.nc SEP
+mv Sal_19_0273.nc SEP
+
+mkdir OCT
+
+mv Sal_19_027* OCT
+mv Sal_19_028* OCT
+mv Sal_19_029* OCT
+mv Sal_19_0300.nc OCT
+mv Sal_19_0301.nc OCT
+mv Sal_19_0302.nc OCT
+mv Sal_19_0303.nc OCT
+mv Sal_19_0304.nc OCT
+
+mkdir NOV
+
+mv Sal_19_030* NOV
+mv Sal_19_031* NOV
+mv Sal_19_032* NOV
+mv Sal_19_0330.nc NOV
+mv Sal_19_0331.nc NOV
+mv Sal_19_0332.nc NOV
+mv Sal_19_0333.nc NOV
+mv Sal_19_0334.nc NOV
+
+mkdir DEC
+
+mv Sal_19_03* DEC
+
+cd ..