Search:
Login
Preferences
Help/Guide
About Trac
Wiki
Timeline
Roadmap
Browse Source
View Tickets
Search
Context Navigation
←
Previous Changeset
Next Changeset
→
Changeset 254
Timestamp:
04/25/19 17:30:50 (
5 years
ago)
Author:
aquiquet
Message:
Grisli-iloveclim branch merged to trunk at revision 253 + some corrections for water conservation
Location:
branches/iLoveclim
Files:
2 added
8 edited
4 copied
.
(modified)
(
view diffs
)
INPUT/ANT16km/coeff_gamma0_DeltaT_quadratic_non_local_median_ant16.nc
(copied)
(copied from
trunk/INPUT/ANT16km/coeff_gamma0_DeltaT_quadratic_non_local_median_ant16.nc
)
(
view diffs
)
INPUT/ANT16km/imbie2_basin_numbers_8km_ant16.nc
(copied)
(copied from
trunk/INPUT/ANT16km/imbie2_basin_numbers_8km_ant16.nc
)
(
view diffs
)
INPUT/ANT16km/obs_thermal_forcing_1995-2017_8km_x_60m_ant16.nc
(copied)
(copied from
trunk/INPUT/ANT16km/obs_thermal_forcing_1995-2017_8km_x_60m_ant16.nc
)
(
view diffs
)
INPUT/Forcage/forcage-429k-2007-Jouzel-Waelbroeck-Lambeck_AMOC.dat
(added)
INPUT/Forcage/forcage-429k-quiquet-et-al_CP2013_glacial-index_Waelbroeck-Lambeck_AMOC.dat
(added)
SOURCES/Fichiers-parametres/hemin40_param_list.dat
(modified)
(
view diffs
)
SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90
(modified)
(
view diffs
)
SOURCES/Hemin40_files/output_hemin40_mod.f90
(modified)
(
view diffs
)
SOURCES/Makefile.grisli.inc
(modified)
(
view diffs
)
SOURCES/bilan_eau_mod.f90
(modified)
(
view diffs
)
SOURCES/bmelt-ismip6-param_mod.f90
(copied)
(copied from
trunk/SOURCES/bmelt-ismip6-param_mod.f90
)
(
view diffs
)
SOURCES/climat_coupl_atm_mod.f90
(modified)
(
view diffs
)
SOURCES/runparam_mod.f90
(modified)
(
view diffs
)
branches/iLoveclim
Property
svn:mergeinfo
changed
/trunk
merged:
252-253
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive