Index: /NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml
===================================================================
--- /NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml (revision 13107)
+++ /NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml (revision 13108)
@@ -369,4 +369,8 @@
+
+
+
+
Index: /NEMO/trunk/src/OCE/SBC/sbcblk.F90
===================================================================
--- /NEMO/trunk/src/OCE/SBC/sbcblk.F90 (revision 13107)
+++ /NEMO/trunk/src/OCE/SBC/sbcblk.F90 (revision 13108)
@@ -628,4 +628,8 @@
END SELECT
+ IF( iom_use("Cd_oce") ) CALL iom_put("Cd_oce", zcd_oce)
+ IF( iom_use("Ce_oce") ) CALL iom_put("Ce_oce", zce_oce)
+ IF( iom_use("Ch_oce") ) CALL iom_put("Ch_oce", zch_oce)
+
IF( ln_skin_cs .OR. ln_skin_wl ) THEN
!! ptsk and pssq have been updated!!!
@@ -878,8 +882,9 @@
Ce_ice(:,:) = Ch_ice(:,:) ! sensible and latent heat transfer coef. are considered identical
ENDIF
-
- !! IF ( iom_use("Cd_ice") ) CALL iom_put("Cd_ice", Cd_ice) ! output value of pure ice-atm. transfer coef.
- !! IF ( iom_use("Ch_ice") ) CALL iom_put("Ch_ice", Ch_ice) ! output value of pure ice-atm. transfer coef.
-
+
+ IF( iom_use("Cd_ice") ) CALL iom_put("Cd_ice", Cd_ice)
+ IF( iom_use("Ce_ice") ) CALL iom_put("Ce_ice", Ce_ice)
+ IF( iom_use("Ch_ice") ) CALL iom_put("Ch_ice", Ch_ice)
+
! local scalars ( place there for vector optimisation purposes)
zcd_dui(:,:) = wndm_ice(:,:) * Cd_ice(:,:)
Index: /NEMO/trunk/tests/STATION_ASF/EXPREF/file_def_nemo-oce.xml
===================================================================
--- /NEMO/trunk/tests/STATION_ASF/EXPREF/file_def_nemo-oce.xml (revision 13107)
+++ /NEMO/trunk/tests/STATION_ASF/EXPREF/file_def_nemo-oce.xml (revision 13108)
@@ -28,6 +28,10 @@
-
-
+
+
+
+
+
+
Index: /NEMO/trunk/tests/STATION_ASF/EXPREF/launch_sasf.sh
===================================================================
--- /NEMO/trunk/tests/STATION_ASF/EXPREF/launch_sasf.sh (revision 13107)
+++ /NEMO/trunk/tests/STATION_ASF/EXPREF/launch_sasf.sh (revision 13108)
@@ -33,5 +33,5 @@
-if [ ! -f ${NEMO_EXE} ]; then echo " Mhhh, no compiled nemo.exe found into ${NEMO_DIR}/tests/STATION_ASF/BLD/bin !"; exit; fi
+if [ ! -f ${NEMO_EXE} ]; then echo " Mhhh, no compiled 'nemo.exe' found into `dirname ${NEMO_EXE}` !"; exit; fi
echo
Index: /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg
===================================================================
--- /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (revision 13107)
+++ /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg (revision 13108)
@@ -29,8 +29,10 @@
cn_exp = 'STATION_ASF-COARE3p6-noskin' ! experience name
nn_it000 = 1 ! first time step
- nn_itend = 26280 ! last time step (std 5840)
- nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+!!! nn_itend = 26304 ! last time step => 3 years (including 1 leap!) at dt=3600s
+!!! nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+ nn_itend = 8760 ! last time step => 3 years (including 1 leap!) at dt=3600s
+ nn_date0 = 20180101 ! 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 = 0 ! Leap year calendar (1) or not (0)
+ nn_leapy = 1 ! Leap year calendar (1) or not (0)
ln_rstart = .false. ! start from rest (F) or from a restart file (T)
ln_1st_euler = .false. ! =T force a start with forward time step (ln_rstart=T)
@@ -45,6 +47,10 @@
nn_istate = 0 ! output the initial state (1) or not (0)
ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F)
- nn_stock = 26280 ! 1year @ dt=3600 s / frequency of creation of a restart file (modulo referenced to 1)
- nn_write = 26280 ! 1year @ dt=3600 s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
+!!! nn_stock = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+!!! nn_write = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ nn_stock = 8760 ! 1 year at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+ nn_write = 8760 ! 1 year at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
ln_mskland = .false. ! mask land points in NetCDF outputs (costly: + ~15%)
ln_cfmeta = .false. ! output additional data to netCDF files required for compliance with the CF metadata standard
Index: /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg
===================================================================
--- /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (revision 13107)
+++ /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg (revision 13108)
@@ -29,8 +29,10 @@
cn_exp = 'STATION_ASF-COARE3p6' ! experience name
nn_it000 = 1 ! first time step
- nn_itend = 26280 ! last time step (std 5840)
- nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+!!! nn_itend = 26304 ! last time step => 3 years (including 1 leap!) at dt=3600s
+!!! nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+ nn_itend = 8760 ! last time step => 3 years (including 1 leap!) at dt=3600s
+ nn_date0 = 20180101 ! 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 = 0 ! Leap year calendar (1) or not (0)
+ nn_leapy = 1 ! Leap year calendar (1) or not (0)
ln_rstart = .false. ! start from rest (F) or from a restart file (T)
ln_1st_euler = .false. ! =T force a start with forward time step (ln_rstart=T)
@@ -45,6 +47,10 @@
nn_istate = 0 ! output the initial state (1) or not (0)
ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F)
- nn_stock = 26280 ! 1year @ dt=3600 s / frequency of creation of a restart file (modulo referenced to 1)
- nn_write = 26280 ! 1year @ dt=3600 s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
+!!! nn_stock = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+!!! nn_write = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ nn_stock = 8760 ! 1 year at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+ nn_write = 8760 ! 1 year at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
ln_mskland = .false. ! mask land points in NetCDF outputs (costly: + ~15%)
ln_cfmeta = .false. ! output additional data to netCDF files required for compliance with the CF metadata standard
@@ -134,5 +140,5 @@
ln_humi_rlh = .true. ! humidity specified below in "sn_humi" is relative humidity [%] if .true.
!
- cn_dir = './' ! root directory for the bulk data location
+ cn_dir = './' ! root directory for the bulk data location
!___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
@@ -163,5 +169,5 @@
ln_read_frq = .false. ! specify whether we must read frq or not
- cn_dir = './' ! root directory for the ocean data location
+ cn_dir = './' ! root directory for the ocean data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
@@ -215,5 +221,5 @@
&nameos ! ocean Equation Of Seawater (default: NO selection)
!-----------------------------------------------------------------------
- ln_eos80 = .true. ! = Use EOS80
+ ln_eos80 = .true. ! = Use EOS80
/
!!======================================================================
Index: /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg
===================================================================
--- /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (revision 13107)
+++ /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg (revision 13108)
@@ -29,8 +29,10 @@
cn_exp = 'STATION_ASF-ECMWF-noskin' ! experience name
nn_it000 = 1 ! first time step
- nn_itend = 26280 ! last time step (std 5840)
- nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+!!! nn_itend = 26304 ! last time step => 3 years (including 1 leap!) at dt=3600s
+!!! nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+ nn_itend = 8760 ! last time step => 3 years (including 1 leap!) at dt=3600s
+ nn_date0 = 20180101 ! 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 = 0 ! Leap year calendar (1) or not (0)
+ nn_leapy = 1 ! Leap year calendar (1) or not (0)
ln_rstart = .false. ! start from rest (F) or from a restart file (T)
ln_1st_euler = .false. ! =T force a start with forward time step (ln_rstart=T)
@@ -45,6 +47,10 @@
nn_istate = 0 ! output the initial state (1) or not (0)
ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F)
- nn_stock = 26280 ! 1year @ dt=3600 s / frequency of creation of a restart file (modulo referenced to 1)
- nn_write = 26280 ! 1year @ dt=3600 s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
+!!! nn_stock = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+!!! nn_write = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ nn_stock = 8760 ! 1 year at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+ nn_write = 8760 ! 1 year at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
ln_mskland = .false. ! mask land points in NetCDF outputs (costly: + ~15%)
ln_cfmeta = .false. ! output additional data to netCDF files required for compliance with the CF metadata standard
Index: /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg
===================================================================
--- /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (revision 13107)
+++ /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg (revision 13108)
@@ -29,8 +29,10 @@
cn_exp = 'STATION_ASF-ECMWF' ! experience name
nn_it000 = 1 ! first time step
- nn_itend = 26280 ! last time step (std 5840)
- nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+!!! nn_itend = 26304 ! last time step => 3 years (including 1 leap!) at dt=3600s
+!!! nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+ nn_itend = 8760 ! last time step => 3 years (including 1 leap!) at dt=3600s
+ nn_date0 = 20180101 ! 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 = 0 ! Leap year calendar (1) or not (0)
+ nn_leapy = 1 ! Leap year calendar (1) or not (0)
ln_rstart = .false. ! start from rest (F) or from a restart file (T)
ln_1st_euler = .false. ! =T force a start with forward time step (ln_rstart=T)
@@ -45,6 +47,10 @@
nn_istate = 0 ! output the initial state (1) or not (0)
ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F)
- nn_stock = 26280 ! 1year @ dt=3600 s / frequency of creation of a restart file (modulo referenced to 1)
- nn_write = 26280 ! 1year @ dt=3600 s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
+!!! nn_stock = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+!!! nn_write = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ nn_stock = 8760 ! 1 year at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+ nn_write = 8760 ! 1 year at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
ln_mskland = .false. ! mask land points in NetCDF outputs (costly: + ~15%)
ln_cfmeta = .false. ! output additional data to netCDF files required for compliance with the CF metadata standard
@@ -134,5 +140,5 @@
ln_humi_rlh = .true. ! humidity specified below in "sn_humi" is relative humidity [%] if .true.
!
- cn_dir = './' ! root directory for the bulk data location
+ cn_dir = './' ! root directory for the bulk data location
!___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
@@ -163,5 +169,5 @@
ln_read_frq = .false. ! specify whether we must read frq or not
- cn_dir = './' ! root directory for the ocean data location
+ cn_dir = './' ! root directory for the ocean data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
@@ -215,5 +221,5 @@
&nameos ! ocean Equation Of Seawater (default: NO selection)
!-----------------------------------------------------------------------
- ln_eos80 = .true. ! = Use EOS80
+ ln_eos80 = .true. ! = Use EOS80
/
!!======================================================================
Index: /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ncar_cfg
===================================================================
--- /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (revision 13107)
+++ /NEMO/trunk/tests/STATION_ASF/EXPREF/namelist_ncar_cfg (revision 13108)
@@ -29,8 +29,10 @@
cn_exp = 'STATION_ASF-NCAR' ! experience name
nn_it000 = 1 ! first time step
- nn_itend = 26280 ! last time step (std 5840)
- nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+!!! nn_itend = 26304 ! last time step => 3 years (including 1 leap!) at dt=3600s
+!!! nn_date0 = 20160101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+ nn_itend = 8760 ! last time step => 3 years (including 1 leap!) at dt=3600s
+ nn_date0 = 20180101 ! 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 = 0 ! Leap year calendar (1) or not (0)
+ nn_leapy = 1 ! Leap year calendar (1) or not (0)
ln_rstart = .false. ! start from rest (F) or from a restart file (T)
ln_1st_euler = .false. ! =T force a start with forward time step (ln_rstart=T)
@@ -45,6 +47,10 @@
nn_istate = 0 ! output the initial state (1) or not (0)
ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F)
- nn_stock = 26280 ! 1year @ dt=3600 s / frequency of creation of a restart file (modulo referenced to 1)
- nn_write = 26280 ! 1year @ dt=3600 s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
+!!! nn_stock = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+!!! nn_write = 26304 ! 3 years (including 1 leap!) at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ nn_stock = 8760 ! 1 year at dt=3600s / frequency of creation of a restart file (modulo referenced to 1)
+ nn_write = 8760 ! 1 year at dt=3600s / frequency of write in the output file (modulo referenced to nn_it000)
+ !!
ln_mskland = .false. ! mask land points in NetCDF outputs (costly: + ~15%)
ln_cfmeta = .false. ! output additional data to netCDF files required for compliance with the CF metadata standard
@@ -134,5 +140,5 @@
ln_humi_rlh = .true. ! humidity specified below in "sn_humi" is relative humidity [%] if .true.
!
- cn_dir = './' ! root directory for the bulk data location
+ cn_dir = './' ! root directory for the bulk data location
!___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
@@ -163,5 +169,5 @@
ln_read_frq = .false. ! specify whether we must read frq or not
- cn_dir = './' ! root directory for the ocean data location
+ cn_dir = './' ! root directory for the ocean data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
@@ -215,5 +221,5 @@
&nameos ! ocean Equation Of Seawater (default: NO selection)
!-----------------------------------------------------------------------
- ln_eos80 = .true. ! = Use EOS80
+ ln_eos80 = .true. ! = Use EOS80
/
!!======================================================================