Ignore:
Timestamp:
Nov 29, 2013, 9:40:25 AM (12 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r1860:1909 into testing branch

Location:
LMDZ5/branches/testing
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf

    • Property copyright set to
      Name of program: LMDZ
      Creation date: 1984
      Version: LMDZ5
      License: CeCILL version 2
      Holder: Laboratoire de m\'et\'eorologie dynamique, CNRS, UMR 8539
      See the license file in the root directory

  • LMDZ5/branches/testing/libf/phylmd

    • Property copyright set to
      Name of program: LMDZ
      Creation date: 1984
      Version: LMDZ5
      License: CeCILL version 2
      Holder: Laboratoire de m\'et\'eorologie dynamique, CNRS, UMR 8539
      See the license file in the root directory

  • LMDZ5/branches/testing/libf/phylmd/cv3_routines.F

    • Property copyright set to
      Name of program: LMDZ
      Creation date: 1984
      Version: LMDZ5
      License: CeCILL version 2
      Holder: Laboratoire de m\'et\'eorologie dynamique, CNRS, UMR 8539
      See the license file in the root directory
    r1864 r1910  
    3030C   ***                     IT MUST BE LESS THAN 0              ***
    3131
    32 #include "cv3param.h"
    33 #include "conema3.h"
     32      include "cv3param.h"
     33      include "conema3.h"
    3434
    3535      integer nd
    … …  
    167167      real cpx(len,nd)
    168168
    169 #include "cvthermo.h"
    170 #include "cv3param.h"
     169      include "cvthermo.h"
     170      include "cv3param.h"
    171171
    172172
    … …  
    242242C================================================================
    243243
    244 #include "cv3param.h"
    245 #include "cvthermo.h"
     244      include "cv3param.h"
     245      include "cvthermo.h"
    246246
    247247c inputs:
    … …  
    434434!----------------------------------------------------------------
    435435
    436 #include "cvthermo.h"
    437 #include "cv3param.h"
     436      include "cvthermo.h"
     437      include "cv3param.h"
    438438
    439439c inputs:
    … …  
    715715!-------------------------------------------------------------------
    716716
    717 #include "cv3param.h"
     717      include "cv3param.h"
    718718
    719719c input:
    … …  
    818818      implicit none
    819819
    820 #include "cv3param.h"
     820      include "cv3param.h"
    821821      include 'iniprint.h'
    822822
    … …  
    975975C---------------------------------------------------------------------
    976976
    977 #include "cvthermo.h"
    978 #include "cv3param.h"
    979 #include "conema3.h"
    980 #include "cvflag.h"
     977      include "cvthermo.h"
     978      include "cv3param.h"
     979      include "conema3.h"
     980      include "cvflag.h"
    981981
    982982c inputs:
    … …  
    14541454!===================================================================
    14551455
    1456 #include "cvthermo.h"
    1457 #include "cv3param.h"
     1456      include "cvthermo.h"
     1457      include "cv3param.h"
    14581458
    14591459c input:
    … …  
    16971697!---------------------------------------------------------------------
    16981698
    1699 #include "cvthermo.h"
    1700 #include "cv3param.h"
    1701 #include "cvflag.h"
     1699      include "cvthermo.h"
     1700      include "cv3param.h"
     1701      include "cvflag.h"
    17021702
    17031703c inputs:
    … …  
    21192119
    21202120
    2121 #include "cvthermo.h"
    2122 #include "cv3param.h"
    2123 #include "cvflag.h"
     2121      include "cvthermo.h"
     2122      include "cv3param.h"
     2123      include "cvflag.h"
    21242124
    21252125c inputs:
    … …  
    27192719      implicit none
    27202720
    2721 #include "cvthermo.h"
    2722 #include "cv3param.h"
    2723 #include "cvflag.h"
    2724 #include "conema3.h"
     2721      include "cvthermo.h"
     2722      include "cv3param.h"
     2723      include "cvflag.h"
     2724      include "conema3.h"
    27252725
    27262726c inputs:
    … …  
    39413941        implicit none
    39423942
    3943 #include "cv3param.h"
     3943      include "cv3param.h"
    39443944
    39453945c inputs:
    … …  
    40534053      implicit none
    40544054
    4055 #include "cv3param.h"
     4055      include "cv3param.h"
    40564056
    40574057c inputs:
Note: See TracChangeset for help on using the changeset viewer.