Changeset 187 for branches

Timestamp:

03/15/18 14:18:24 (6 years ago)

Author:

aquiquet

Message:

Grisli-iloveclim branch merged to trunk at revision 185

Location:

branches/iLoveclim

Files:

• . (modified) (view diffs)
• INPUT/ANT16km/LARMIP_regions_initMIPgrid_16.nc (copied) (copied from trunk/INPUT/ANT16km/LARMIP_regions_initMIPgrid_16.nc) (view diffs)
• INPUT/ANTEIS1/RACMO2.3p2_ANT27_smb_ltm_1979_2016_ant40.grd (copied) (copied from trunk/INPUT/ANTEIS1/RACMO2.3p2_ANT27_smb_ltm_1979_2016_ant40.grd) (view diffs)
• INPUT/ANTEIS1/RACMO2.3p2_ANT27_t2m_ltm_1979_2016_ant40.grd (copied) (copied from trunk/INPUT/ANTEIS1/RACMO2.3p2_ANT27_t2m_ltm_1979_2016_ant40.grd) (view diffs)
• INPUT/ANTEIS1/SMB-MAR-ant35km-grisli-40km.grd (copied) (copied from trunk/INPUT/ANTEIS1/SMB-MAR-ant35km-grisli-40km.grd) (view diffs)
• INPUT/ANTEIS1/Tann-MAR-ant35km-grisli-40km.grd (copied) (copied from trunk/INPUT/ANTEIS1/Tann-MAR-ant35km-grisli-40km.grd) (view diffs)
• INPUT/ANTEIS1/distance_talus_1500m.grd (copied) (copied from trunk/INPUT/ANTEIS1/distance_talus_1500m.grd) (view diffs)
• INPUT/Forcage/forcage-800k-2007-Jouzel-Bassinot.dat (modified) (view diffs)
• INPUT/Forcage/forcage-900k-2007-Parrenin-Bassinot.dat (modified) (view diffs)
• SOURCES/3D-physique-gen_mod.f90 (modified) (view diffs)
• SOURCES/ANT15-LBq_files/module_choix_antar15_LBq.f90 (modified) (view diffs)
• SOURCES/Ant16_files/bmelt-ant-regions-initmip_mod.f90 (modified) (view diffs)
• SOURCES/Ant16_files/bmelt-ant-regions-larmip_mod.f90 (copied) (copied from trunk/SOURCES/Ant16_files/bmelt-ant-regions-larmip_mod.f90) (view diffs)
• SOURCES/Ant16_files/climat_InitMIP_years_perturb_mod.f90 (modified) (view diffs)
• SOURCES/Ant16_files/module_choix-ant16km.f90 (modified) (view diffs)
• SOURCES/Ant16_files/module_choix-ant16km.f90-iterbeta (modified) (view diffs)
• SOURCES/Ant16_files/module_choix-ant16km.f90-spinupvitbil (modified) (view diffs)
• SOURCES/Ant16_files/module_choix-ant16km.f90-std (modified) (view diffs)
• SOURCES/Ant40_files/bmelt-ant-regions-oce_mod.f90 (modified) (view diffs)
• SOURCES/Ant40_files/module_choix-antar40-0.4.f90 (modified) (view diffs)
• SOURCES/Ant40_files/module_choix-antar40-0.4_old.f90 (deleted)
• SOURCES/Draggings_modules/beta_iter_vitbil_mod.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/dragging_beta_iter_vitbil_mod.f90 (copied) (copied from trunk/SOURCES/Draggings_modules/dragging_beta_iter_vitbil_mod.f90) (view diffs)
• SOURCES/Draggings_modules/dragging_prescr_beta_mod.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/dragging_prescr_beta_nolin_mod.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/fake_beta_iter_vitbil_mod.f90 (copied) (copied from trunk/SOURCES/Draggings_modules/fake_beta_iter_vitbil_mod.f90) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/hemin40_param_list.dat (modified) (view diffs)
• SOURCES/GrIce2sea_files/climat_GrIce2sea_years_mod.f90 (modified) (view diffs)
• SOURCES/GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90 (modified) (view diffs)
• SOURCES/GrIce2sea_files/module_choix_GrIce2sea.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/module_choix-greeneem.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/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/eq_ellipt_sgbsv_mod-0.2.f90 (modified) (view diffs)
• SOURCES/New-remplimat/remplimat-shelves-tabTu.f90 (modified) (view diffs)
• SOURCES/Old-sources/out_horiz_mod.f90 (copied) (copied from trunk/SOURCES/Old-sources/out_horiz_mod.f90) (view diffs)
• SOURCES/Old-sources/sortie-hz-multivar.f90 (copied) (copied from trunk/SOURCES/Old-sources/sortie-hz-multivar.f90) (view diffs)
• SOURCES/Snowball_files/module_choix-snowball.f90 (modified) (view diffs)
• SOURCES/calving_frange.f90 (modified) (view diffs)
• SOURCES/courbures.f90 (modified) (view diffs)
• SOURCES/dragging_hwat-contigu_mod.f90 (modified) (view diffs)
• SOURCES/dragging_hwat_contmaj_mod.f90 (modified) (view diffs)
• SOURCES/dragging_hwat_sedim_mod.f90 (modified) (view diffs)
• SOURCES/dragging_hwatermax_0.2_mod.f90 (modified) (view diffs)
• SOURCES/dragging_neff_slope_mod.f90 (modified) (view diffs)
• SOURCES/dragging_param_beta_mod.f90 (modified) (view diffs)
• SOURCES/dragging_param_beta_nolin_mod.f90 (copied) (copied from trunk/SOURCES/dragging_param_beta_nolin_mod.f90) (view diffs)
• SOURCES/dragging_param_beta_sedim_mod.f90 (copied) (copied from trunk/SOURCES/dragging_param_beta_sedim_mod.f90) (view diffs)
• SOURCES/eaubasale-0.5_mod.f90 (modified) (view diffs)
• SOURCES/flottab2-0.7.f90 (modified) (view diffs)
• SOURCES/furst_schoof_mod.f90 (modified) (view diffs)
• SOURCES/initial-0.3.f90 (modified) (view diffs)
• SOURCES/iso_declar_mod-0.3.f90 (modified) (view diffs)
• SOURCES/isostasie_mod-0.3.f90 (modified) (view diffs)
• SOURCES/litho-0.4.f90 (modified) (view diffs)
• SOURCES/main3D-0.4-40km.f90 (modified) (view diffs)
• SOURCES/noisostasie_mod-0.3.f90 (modified) (view diffs)
• SOURCES/out_cptr_mod.f90 (modified) (view diffs)
• SOURCES/out_horiz_mod.f90 (deleted)
• SOURCES/relaxation_water_diffusion.f90 (modified) (view diffs)
• SOURCES/sortie-hz-multivar.f90 (deleted)
• 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)
• SOURCES/taubed-0.3.f90 (modified) (view diffs)