Changeset 3105 for branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC

Timestamp:

2011-11-15T12:33:20+01:00 (12 years ago)

Author:

poddo

Message:

Rename mfs bulk routine, namelist and doc files

Location:

branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles

Files:

• Chapters/Chap_SBC.tex (modified) (5 diffs)
• Namelist/namsbc (modified) (1 diff)
• Namelist/namsbc_ecmwf (deleted)
• Namelist/namsbc_mfs (added)

branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Chapters/Chap_SBC.tex

@@ -29 +29 @@
 (\np{ln\_core}~=~true), CLIO (\np{ln\_clio}~=~true) or MFS
 \footnote { Note that MFS bulk formulae compute fluxes only for the ocean component}
-(\np{ln\_ecmwf}~=~true) bulk formulae) and a coupled 
+(\np{ln\_mfs}~=~true) bulk formulae) and a coupled 
 formulation (exchanges with a atmospheric model via the OASIS coupler) 
 (\np{ln\_cpl}~=~true). When used, the atmospheric pressure forces both 
@@ -49 +49 @@
 transformation of the solar radiation (if provided as daily mean) into a diurnal 
 cycle (\np{ln\_dm2dc}~=~true); and a neutral drag coefficient can be read from an external wave 
-model (\np{ln\_cdgw}~=~true). The latter option is possible only in case core or ecmwf bulk formulas are selected.
+model (\np{ln\_cdgw}~=~true). The latter option is possible only in case core or mfs bulk formulas are selected.
 
 In this chapter, we first discuss where the surface boundary condition appears in the
@@ -481 +481 @@
 % Bulk formulation
 % ================================================================
-\section  [Bulk formulation (\textit{sbcblk\_core}, \textit{sbcblk\_clio} or \textit{sbcblk\_ecmwf}) ]
-      {Bulk formulation \small{(\mdl{sbcblk\_core} \mdl{sbcblk\_clio} \mdl{sbcblk\_ecmwf} modules)} }
+\section  [Bulk formulation (\textit{sbcblk\_core}, \textit{sbcblk\_clio} or \textit{sbcblk\_mfs}) ]
+      {Bulk formulation \small{(\mdl{sbcblk\_core} \mdl{sbcblk\_clio} \mdl{sbcblk\_mfs} modules)} }
 \label{SBC_blk}
 
@@ -490 +490 @@
 The atmospheric fields used depend on the bulk formulae used. Three bulk formulations 
 are available : the CORE, the CLIO and the MFS bulk formulea. The choice is made by setting to true
-one of the following namelist variable : \np{ln\_core} ; \np{ln\_clio} or  \np{ln\_ecmwf}.
+one of the following namelist variable : \np{ln\_core} ; \np{ln\_clio} or  \np{ln\_mfs}.
 
 Note : in forced mode, when a sea-ice model is used, a bulk formulation (CLIO or CORE) have to be used. 
@@ -585 +585 @@
 
 % -------------------------------------------------------------------------------------------------------------
-%        ECMWF Bulk formulea
-% -------------------------------------------------------------------------------------------------------------
-\subsection    [MFS Bulk formulea (\np{ln\_ecmwf}=true)]
-            {MFS Bulk formulea (\np{ln\_ecmwf}=true, \mdl{sbcblk\_ecmwf})}
-\label{SBC_blk_ecmwf}
-%------------------------------------------namsbc_ecmwf----------------------------------------------------
-\namdisplay{namsbc_ecmwf} 
+%        MFS Bulk formulae
+% -------------------------------------------------------------------------------------------------------------
+\subsection    [MFS Bulk formulea (\np{ln\_mfs}=true)]
+            {MFS Bulk formulea (\np{ln\_mfs}=true, \mdl{sbcblk\_mfs})}
+\label{SBC_blk_mfs}
+%------------------------------------------namsbc_mfs----------------------------------------------------
+\namdisplay{namsbc_mfs} 
 %----------------------------------------------------------------------------------------------------------
 

branches/2011/dev_LOCEAN_CMCC_INGV_MERCATOR_2011/DOC/TexFiles/Namelist/namsbc

@@ -8 +8 @@
    ln_blk_clio = .false.   !  CLIO bulk formulation                     (T => fill namsbc_clio) 
    ln_blk_core = .true.    !  CORE bulk formulation                     (T => fill namsbc_core) 
-   ln_blk_ecmwf= .false.   !  MFS bulk formulation                      (T => fill namsbc_ecmwf)
+   ln_blk_mfs  = .false.   !  MFS bulk formulation                      (T => fill namsbc_mfs )
    ln_cpl      = .false.   !  Coupled formulation                       (T => fill namsbc_cpl )
    ln_apr_dyn  = .false.   !  Patm gradient added in ocean & ice Eqs.   (T => fill namsbc_apr )