Changeset 123

Timestamp:

06/30/17 18:22:26 (7 years ago)

Author:

aquiquet

Message:

Merged branch iLOVECLIM to trunk at rev 121

Location:

branches/iLoveclim

Files:

• . (modified) (view diffs)
• Fichier-CPTR/RGL-0194_an2040.nc (copied) (copied from trunk/Fichier-CPTR/RGL-0194_an2040.nc) (view diffs)
• INPUT/ANT-LBq-15km/acca_15km.grd (modified) (view diffs)
• INPUT/ANT-LBq-15km/temp_15km.grd (modified) (view diffs)
• INPUT/ANTEIS1/ETOPO1_slope_R2min_Ant40km.nc (copied) (copied from trunk/INPUT/ANTEIS1/ETOPO1_slope_R2min_Ant40km.nc) (view diffs)
• INPUT/ANTEIS1/SHB_Ant_Lebrocq_40km.nc (copied) (copied from trunk/INPUT/ANTEIS1/SHB_Ant_Lebrocq_40km.nc) (view diffs)
• INPUT/ANTEIS1/SHB_bedmap2_Ant40.nc (copied) (copied from trunk/INPUT/ANTEIS1/SHB_bedmap2_Ant40.nc) (view diffs)
• INPUT/ANTEIS1/TANN_Ant_Lebrocq_40km.nc (copied) (copied from trunk/INPUT/ANTEIS1/TANN_Ant_Lebrocq_40km.nc) (view diffs)
• INPUT/ANTEIS1/acc_Ant_Lebrocq_40km.nc (copied) (copied from trunk/INPUT/ANTEIS1/acc_Ant_Lebrocq_40km.nc) (view diffs)
• INPUT/ANTEIS1/ghf_Ant_Lebrocq_40km.nc (copied) (copied from trunk/INPUT/ANTEIS1/ghf_Ant_Lebrocq_40km.nc) (view diffs)
• INPUT/ANTEIS1/numer-ice-shelves-sept16.nc (copied) (copied from trunk/INPUT/ANTEIS1/numer-ice-shelves-sept16.nc) (view diffs)
• INPUT/Forcage/LGM_permanent.dat (modified) (view diffs)
• INPUT/Forcage/forcage-800k-2007-Jouzel-Bassinot.dat (copied) (copied from trunk/INPUT/Forcage/forcage-800k-2007-Jouzel-Bassinot.dat) (view diffs)
• SOURCES/3D-physique-gen_mod.f90 (modified) (view diffs)
• SOURCES/ANT15-LBq_files/module_choix_antar15_LBq.f90 (modified) (view diffs)
• SOURCES/Ant40_files/lect-anteis_mod.f90 (modified) (view diffs)
• SOURCES/Ant40_files/module_choix-antar40-0.4.f90 (modified) (view diffs)
• SOURCES/Ant40_files/output_anta40_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/dragging_prescr_beta_nolin_mod.f90 (modified) (view diffs)
• SOURCES/Fichiers-parametres/A-LBq15_param_list_Schoof.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/A-LBq15_param_list_Schoof.dat) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/greeneem15_LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/greeneem15_TEMPS-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/greeneem15_param_list.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/greeneem15_param_list.dat) (view diffs)
• SOURCES/Fichiers-parametres/hemin40_LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/hemin40_TEMPS-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/hemin40_param_list.dat (modified) (view diffs)
• SOURCES/GrIce2sea_files/module_choix_GrIce2sea.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/lect-greeneem_mod.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/output_greeneem_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Hemin15_files/module_choix-hemin15.f90 (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-gfortran.inc (modified) (view diffs)
• SOURCES/Makefile.grisli.inc (modified) (view diffs)
• SOURCES/Netcdf-routines/Description_Variables.dat (modified) (view diffs)
• SOURCES/Netcdf-routines/sortie_netcdf_GRISLI_mod.0.2-hassine.f90 (modified) (view diffs)
• SOURCES/New-remplimat/diagno-L2_mod.f90 (modified) (view diffs)
• SOURCES/New-remplimat/remplimat-shelves-tabTu.f90 (modified) (view diffs)
• SOURCES/Snowball_files/module_choix-snowball.f90 (modified) (view diffs)
• SOURCES/Temperature-routines/icetemp_mod.f90 (modified) (view diffs)
• SOURCES/Temperature-routines/temp_col.f90 (modified) (view diffs)
• SOURCES/ablation_bord.f90 (modified) (view diffs)
• SOURCES/bilan_eau_mod.f90 (copied) (copied from trunk/SOURCES/bilan_eau_mod.f90) (view diffs)
• SOURCES/calving_frange.f90 (modified) (view diffs)
• SOURCES/climat-forcage-insolation_mod_oneway.f90 (modified) (view diffs)
• SOURCES/climat-perturb_mod-0.4.f90 (modified) (view diffs)
• SOURCES/conserv-mass-adv-diff_sept2009_mod.f90 (modified) (view diffs)
• SOURCES/deformation_mod_2lois.f90 (modified) (view diffs)
• SOURCES/dragging_param_beta_mod.f90 (copied) (copied from trunk/SOURCES/dragging_param_beta_mod.f90) (view diffs)
• SOURCES/flottab2-0.7.f90 (modified) (view diffs)
• SOURCES/furst_schoof_mod.f90 (copied) (copied from trunk/SOURCES/furst_schoof_mod.f90) (view diffs)
• SOURCES/initial-0.3.f90 (modified) (view diffs)
• SOURCES/initial-phy-2.f90 (modified) (view diffs)
• SOURCES/lineartemp-0.2.f90 (modified) (view diffs)
• SOURCES/main3D-0.4-40km.f90 (modified) (view diffs)
• SOURCES/spinup_mod.f90 (modified) (view diffs)
• SOURCES/steps_time_loop.f90 (modified) (view diffs)
• SOURCES/steps_time_loop_avec_iterbeta.f90 (modified) (view diffs)