Changeset 287 for branches/iLoveclim

Timestamp:

10/17/19 09:42:41 (5 years ago)

Author:

aquiquet

Message:

Trunk merged to iLoveclim branch at revision 286

Location:

branches/iLoveclim

Files:

• . (modified) (view diffs)
• Fichier-CPTR/historical_ISMIP_2015.nc (copied) (copied from trunk/Fichier-CPTR/historical_ISMIP_2015.nc) (view diffs)
• Fichier-CPTR/restart_ISMIP4_relax30ans_inv5.nc (copied) (copied from trunk/Fichier-CPTR/restart_ISMIP4_relax30ans_inv5.nc) (view diffs)
• INPUT/ANT16km/SHB_bedmap2_Ant16_relax30ans_ISMIP4_inv5.nc (copied) (copied from trunk/INPUT/ANT16km/SHB_bedmap2_Ant16_relax30ans_ISMIP4_inv5.nc) (view diffs)
• INPUT/ANT16km/beta-run-12S-inv5.grd (copied) (copied from trunk/INPUT/ANT16km/beta-run-12S-inv5.grd) (view diffs)
• INPUT/GRISMIP6 (copied) (copied from trunk/INPUT/GRISMIP6) (view diffs)
• SOURCES/3D-physique-gen_mod.f90 (modified) (view diffs)
• SOURCES/Ant15_CISM_files/output_anta_mod-0.4.f90 (deleted)
• SOURCES/Ant15_CISM_files/output_anta_mod-0.4_ant15.f90 (copied) (copied from trunk/SOURCES/Ant15_CISM_files/output_anta_mod-0.4_ant15.f90) (view diffs)
• SOURCES/Ant16_files/bmelt-seuil-profondeur_initmip_inv_mod.f90 (modified) (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-std (modified) (view diffs)
• SOURCES/Ant40_files/output_anta40_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/beta_iter_vitbil_mod.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/dragging_prescr_beta_nolin_mod.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/dragging_prescr_beta_perturb_mod.f90 (copied) (copied from trunk/SOURCES/Draggings_modules/dragging_prescr_beta_perturb_mod.f90) (view diffs)
• SOURCES/Fichiers-parametres/Makefile.tof-lsce3130.inc (modified) (view diffs)
• SOURCES/Fichiers-parametres/ant16km_LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/ant16km_TEMPS-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/grismip_LISTE-VAR-NETCDF.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/grismip_LISTE-VAR-NETCDF.dat) (view diffs)
• SOURCES/Fichiers-parametres/grismip_TEMPS-NETCDF.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/grismip_TEMPS-NETCDF.dat) (view diffs)
• SOURCES/Fichiers-parametres/short-ISMIPnc.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/short-ISMIPnc.dat) (view diffs)
• SOURCES/Grismip6_files (copied) (copied from trunk/SOURCES/Grismip6_files) (view diffs)
• SOURCES/Hemin40_files/lect-hemin40_mod.f90 (modified) (view diffs)
• SOURCES/Makefile (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/remplimat-shelves-tabTu.f90 (modified) (view diffs)
• SOURCES/Temperature-routines/icetemp_mod.f90 (modified) (view diffs)
• SOURCES/bilan_eau_mod.f90 (modified) (view diffs)
• SOURCES/bilan_flux_output_mod.f90 (modified) (view diffs)
• SOURCES/bmelt-ismip6-param_mod.f90 (modified) (view diffs)
• SOURCES/calving_frange_ISMIP_fracture.f90 (copied) (copied from trunk/SOURCES/calving_frange_ISMIP_fracture.f90) (view diffs)
• SOURCES/calving_frange_ISMIP_glaciers.f90 (copied) (copied from trunk/SOURCES/calving_frange_ISMIP_glaciers.f90) (view diffs)
• SOURCES/climat_coupl_atm_mod.f90 (modified) (view diffs)
• SOURCES/climat_transient_GCM_mod.f90 (copied) (copied from trunk/SOURCES/climat_transient_GCM_mod.f90) (view diffs)
• SOURCES/conserv-mass-adv-diff_sept2009_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/initial-phy-2.f90 (modified) (view diffs)
• SOURCES/out_cptr_mod.f90 (modified) (view diffs)
• SOURCES/resol_adv_diff_2D-sept2009.f90 (modified) (view diffs)
• SOURCES/steps_time_loop.f90 (modified) (view diffs)