New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13845 – NEMO

Changeset 13845


Ignore:
Timestamp:
2020-11-20T19:13:29+01:00 (3 years ago)
Author:
nicolasmartin
Message:

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

Location:
NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main
Files:
4 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/appendices.tex

    r13825 r13845  
    1010%\subfile{../subfiles/chap_DIU} 
    1111%\subfile{../subfiles/chap_conservation} 
    12 %\subfile{../subfiles/annex_E}            %% Notes on some on going staff 
    13  
     12%\subfile{../subfiles/apdx_algos}   %% Notes on some on going staff 

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

    r13825 r13845  
    400400} 
    401401 
    402 @article{         brodeau.barnier.ea_JPO17, 
    403   title         = "Climatologically Significant Effects of Some Approximations in the Bulk Parameterizations of Turbulent Air{\textendash}Sea Fluxes", 
     402@article{         brodeau.barnier.ea_JPO16, 
     403  title         = "Climatologically Significant Effects of Some Approximations in the Bulk Parameterizations of Turbulent Air–Sea Fluxes", 
    404404  pages         = "5--28", 
    405405  journal       = "Journal of Physical Oceanography", 
    … …  
    407407  number        = "1", 
    408408  author        = "Brodeau, Laurent and Barnier, Bernard and Gulev, Sergey K. and Woods, Cian", 
    409   year          = "2017", 
     409  year          = "2016", 
    410410  month         = "jan", 
    411411  publisher     = "American Meteorological Society", 
    … …  
    31343134  doi           = "10.1029/92jc00911" 
    31353135} 
     3136<<<<<<< .working 
    31363137 
    31373138@article{large.yeager_CD09, 
    … …  
    32053206} 
    32063207 
     3208======= 
     3209>>>>>>> .merge-right.r12376 

  • NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/chapters.tex

    r13825 r13845  
     1<<<<<<< .working 
     2<<<<<<< .working 
    13\subfile{../subfiles/introduction}        %% Introduction 
    24\subfile{../subfiles/chap_model_basics} 
    … …  
    1517\subfile{../subfiles/chap_misc}           %% Miscellaneous topics 
    1618\subfile{../subfiles/chap_cfgs}         %% Predefined configurations 
     19======= 
     20\subfile{../subfiles/chap_model_basics}   %% 1. 
     21\subfile{../subfiles/chap_time_domain}    %% 2.  Time discretisation (time stepping strategy) 
     22\subfile{../subfiles/chap_DOM}            %% 3.  Space discretisation 
     23\subfile{../subfiles/chap_TRA}            %% 4.  Tracer advection/diffusion equation 
     24\subfile{../subfiles/chap_DYN}            %% 5.  Dynamics : momentum equation 
     25\subfile{../subfiles/chap_SBC}            %% 6.  Surface Boundary Conditions 
     26\subfile{../subfiles/chap_LBC}            %% 7.  Lateral Boundary Conditions 
     27\subfile{../subfiles/chap_LDF}            %% 8.  Lateral diffusion 
     28\subfile{../subfiles/chap_ZDF}            %% 9.  Vertical diffusion 
     29\subfile{../subfiles/chap_DIA}            %% 10. Outputs and Diagnostics 
     30\subfile{../subfiles/chap_OBS}            %% 11. Observation operator 
     31\subfile{../subfiles/chap_ASM}            %% 12. Assimilation increments 
     32\subfile{../subfiles/chap_STO}            %% 13. Stochastic param. 
     33\subfile{../subfiles/chap_misc}           %% 14. Miscellaneous topics 
     34\subfile{../subfiles/chap_cfgs}           %% 15. Predefined configurations 
     35 
     36%% Not included 
     37%\subfile{../subfiles/chap_model_basics_zstar} 
     38%\subfile{../subfiles/chap_DIU} 
     39%\subfile{../subfiles/chap_conservation} 
     40>>>>>>> .merge-right.r12376 
     41======= 
     42\subfile{../subfiles/chap_model_basics}   %% 1. 
     43\subfile{../subfiles/chap_time_domain}    %% 2.  Time discretisation (time stepping strategy) 
     44\subfile{../subfiles/chap_DOM}            %% 3.  Space discretisation 
     45\subfile{../subfiles/chap_TRA}            %% 4.  Tracer advection/diffusion equation 
     46\subfile{../subfiles/chap_DYN}            %% 5.  Dynamics : momentum equation 
     47\subfile{../subfiles/chap_SBC}            %% 6.  Surface Boundary Conditions 
     48\subfile{../subfiles/chap_LBC}            %% 7.  Lateral Boundary Conditions 
     49\subfile{../subfiles/chap_LDF}            %% 8.  Lateral diffusion 
     50\subfile{../subfiles/chap_ZDF}            %% 9.  Vertical diffusion 
     51\subfile{../subfiles/chap_DIA}            %% 10. Outputs and Diagnostics 
     52\subfile{../subfiles/chap_OBS}            %% 11. Observation operator 
     53\subfile{../subfiles/chap_ASM}            %% 12. Assimilation increments 
     54\subfile{../subfiles/chap_STO}            %% 13. Stochastic param. 
     55\subfile{../subfiles/chap_misc}           %% 14. Miscellaneous topics 
     56\subfile{../subfiles/chap_cfgs}           %% 15. Predefined configurations 
     57 
     58%% Not included 
     59%\subfile{../subfiles/chap_model_basics_zstar} 
     60%\subfile{../subfiles/chap_DIU} 
     61%\subfile{../subfiles/chap_conservation} 
     62>>>>>>> .merge-right.r12376 
Note: See TracChangeset for help on using the changeset viewer.