Changeset 13845 for NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/bibliography.bib

Timestamp:

2020-11-20T19:13:29+01:00 (4 years ago)

Author:

nicolasmartin

Message:

#2414 Removal of modifications from the big mid-year merge, except new bibliography entries

File:

• NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/bibliography.bib (modified) (4 diffs)

NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/bibliography.bib

@@ -400 +400 @@
 }
 
-@article{         brodeau.barnier.ea_JPO17,
-  title         = "Climatologically Significant Effects of Some Approximations in the Bulk Parameterizations of Turbulent Air{\textendash}Sea Fluxes",
+@article{         brodeau.barnier.ea_JPO16,
+  title         = "Climatologically Significant Effects of Some Approximations in the Bulk Parameterizations of Turbulent Air–Sea Fluxes",
   pages         = "5--28",
   journal       = "Journal of Physical Oceanography",
@@ -407 +407 @@
   number        = "1",
   author        = "Brodeau, Laurent and Barnier, Bernard and Gulev, Sergey K. and Woods, Cian",
-  year          = "2017",
+  year          = "2016",
   month         = "jan",
   publisher     = "American Meteorological Society",
@@ -3134 +3134 @@
   doi           = "10.1029/92jc00911"
 }
+<<<<<<< .working
 
 @article{large.yeager_CD09,
@@ -3205 +3206 @@
 }
 
+=======
+>>>>>>> .merge-right.r12376