Context Navigation

← Previous Change
Next Change →

phy1d

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

: 3 deleted
: 17 edited
: 1 copied

. (modified) (2 props)
libf (modified) (1 prop)
libf/phy1d (modified) (1 prop)
libf/phy1d/1DUTILS.h (copied) (copied from LMDZ5/trunk/libf/phy1d/1DUTILS.h)
libf/phy1d/1DUTILS.h_no_writelim (deleted)
libf/phy1d/1DUTILS.h_with_writelim (deleted)
libf/phy1d/1DUTILS.h_with_writelim_old (deleted)
libf/phy1d/1D_decl_cases.h (modified) (1 prop)
libf/phy1d/1D_interp_cases.h (modified) (1 prop)
libf/phy1d/1D_read_forc_cases.h (modified) (1 prop)
libf/phy1d/1Dconv.h (modified) (1 prop)
libf/phy1d/add_pbl_tend.F (modified) (1 prop)
libf/phy1d/compar1d.h (modified) (1 prop)
libf/phy1d/fcg_gcssold.h (modified) (1 prop)
libf/phy1d/fcg_racmo.h (modified) (1 prop)
libf/phy1d/flux_arp.h (modified) (1 prop)
libf/phy1d/lmdz1d.F (modified) (1 diff, 1 prop)
libf/phy1d/ocean_forced_mod.F90 (modified) (1 prop)
libf/phy1d/orografi_strato.F (modified) (1 prop)
libf/phy1d/surf_land_bucket_mod.F90 (modified) (1 prop)
libf/phy1d/tsoilnudge.h (modified) (1 prop)

Legend:

: Unmodified
: Added
: Removed

LMDZ5/branches/testing
- Property svn:mergeinfo changed
  /LMDZ5/trunk merged: 1861-1863,1865-1867,1869,1871-1875,1877-1880,1882-1891,1894-1909
- 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
- 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/phy1d
- 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/phy1d/1D_decl_cases.h
- 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/phy1d/1D_interp_cases.h
- 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/phy1d/1D_read_forc_cases.h
- 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/phy1d/1Dconv.h
- 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/phy1d/add_pbl_tend.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
LMDZ5/branches/testing/libf/phy1d/compar1d.h
- 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/phy1d/fcg_gcssold.h
- 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/phy1d/fcg_racmo.h
- 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/phy1d/flux_arp.h
- 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/phy1d/lmdz1d.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
13	13	use control_mod
14	14	USE indice_sol_mod
	15	USE phyaqua_mod
15	16
16	17	implicit none

LMDZ5/branches/testing/libf/phy1d/ocean_forced_mod.F90
- 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/phy1d/orografi_strato.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
LMDZ5/branches/testing/libf/phy1d/surf_land_bucket_mod.F90
- 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/phy1d/tsoilnudge.h
- 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

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 1910 for LMDZ5/branches/testing/libf/phy1d

Legend:

Download in other formats: