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/cv30_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
    r1750 r1910  
    3030C   ***                     IT MUST BE LESS THAN 0              ***
    3131
    32 #include "cv30param.h"
    33 #include "conema3.h"
     32      include "cv30param.h"
     33      include "conema3.h"
    3434
    3535      integer nd
    … …  
    108108      real cpx(len,nd)
    109109
    110 #include "cvthermo.h"
    111 #include "cv30param.h"
     110      include "cvthermo.h"
     111      include "cv30param.h"
    112112
    113113
    … …  
    176176C================================================================
    177177
    178 #include "cv30param.h"
     178      include "cv30param.h"
    179179
    180180c inputs:
    … …  
    359359!----------------------------------------------------------------
    360360
    361 #include "cvthermo.h"
    362 #include "cv30param.h"
     361      include "cvthermo.h"
     362      include "cv30param.h"
    363363
    364364c inputs:
    … …  
    646646!-------------------------------------------------------------------
    647647
    648 #include "cv30param.h"
     648      include "cv30param.h"
    649649
    650650c input:
    … …  
    748748      implicit none
    749749
    750 #include "cv30param.h"
     750      include "cv30param.h"
    751751      include 'iniprint.h'
    752752
    … …  
    873873C---------------------------------------------------------------------
    874874
    875 #include "cvthermo.h"
    876 #include "cv30param.h"
    877 #include "conema3.h"
     875      include "cvthermo.h"
     876      include "cv30param.h"
     877      include "conema3.h"
    878878
    879879c inputs:
    … …  
    12331233!===================================================================
    12341234
    1235 #include "cvthermo.h"
    1236 #include "cv30param.h"
     1235      include "cvthermo.h"
     1236      include "cv30param.h"
    12371237
    12381238c input:
    … …  
    14431443!---------------------------------------------------------------------
    14441444
    1445 #include "cvthermo.h"
    1446 #include "cv30param.h"
     1445      include "cvthermo.h"
     1446      include "cv30param.h"
    14471447
    14481448c inputs:
    … …  
    18361836
    18371837
    1838 #include "cvthermo.h"
    1839 #include "cv30param.h"
    1840 #include "cvflag.h"
     1838      include "cvthermo.h"
     1839      include "cv30param.h"
     1840      include "cvflag.h"
    18411841
    18421842c inputs:
    … …  
    22002200      implicit none
    22012201
    2202 #include "cvthermo.h"
    2203 #include "cv30param.h"
    2204 #include "cvflag.h"
    2205 #include "conema3.h"
     2202      include "cvthermo.h"
     2203      include "cv30param.h"
     2204      include "cvflag.h"
     2205      include "conema3.h"
    22062206
    22072207c inputs:
    … …  
    30533053        implicit none
    30543054
    3055 #include "cv30param.h"
     3055      include "cv30param.h"
    30563056
    30573057c inputs:
    … …  
    31833183      implicit none
    31843184
    3185 #include "cv30param.h"
     3185      include "cv30param.h"
    31863186
    31873187c inputs:
Note: See TracChangeset for help on using the changeset viewer.