Changeset 359

Timestamp:

06/10/22 17:11:04 (2 years ago)

Author:

aquiquet

Message:

Trunk merged to branch at revision 357

Location:

branches/iLoveclim

Files:

• . (modified) (view diffs)
• Fichier-CPTR/historical_ISMIP_2015.nc (modified) (view diffs)
• INPUT/ALPS1 (copied) (copied from trunk/INPUT/ALPS1) (view diffs)
• INPUT/ALPS2 (copied) (copied from trunk/INPUT/ALPS2) (view diffs)
• INPUT/ANTEIS1/MARv3.6.4-ant35km-1979-1999-monthly-means-ant40.nc (copied) (copied from trunk/INPUT/ANTEIS1/MARv3.6.4-ant35km-1979-1999-monthly-means-ant40.nc) (view diffs)
• INPUT/EURASIE (deleted)
• INPUT/EURASIE10/SHB_etopo1_euras10.nc (copied) (copied from trunk/INPUT/EURASIE10/SHB_etopo1_euras10.nc) (view diffs)
• INPUT/EURASIE10/Snapshots-GCM (copied) (copied from trunk/INPUT/EURASIE10/Snapshots-GCM) (view diffs)
• INPUT/EURASIE10/climato_monthly_t2m_precip_orog_ERA5-1979-2008-euras10.nc (copied) (copied from trunk/INPUT/EURASIE10/climato_monthly_t2m_precip_orog_ERA5-1979-2008-euras10.nc) (view diffs)
• INPUT/EURASIE10/coord-euras10.dat (modified) (view diffs)
• INPUT/EURASIE10/ghf_euras10.nc (copied) (copied from trunk/INPUT/EURASIE10/ghf_euras10.nc) (view diffs)
• INPUT/EURASIE10/ijphi_euras10.dat (deleted)
• INPUT/EURASIE10/sedmap_euras10.nc (copied) (copied from trunk/INPUT/EURASIE10/sedmap_euras10.nc) (view diffs)
• INPUT/EURASIE10/topo_euras10.dat (deleted)
• INPUT/EURASIE20/SHB_etopo1_euras20.nc (copied) (copied from trunk/INPUT/EURASIE20/SHB_etopo1_euras20.nc) (view diffs)
• INPUT/EURASIE20/Snapshots-GCM (copied) (copied from trunk/INPUT/EURASIE20/Snapshots-GCM) (view diffs)
• INPUT/EURASIE20/climato_monthly_t2m_precip_orog_ERA5-1979-2008-euras20.nc (copied) (copied from trunk/INPUT/EURASIE20/climato_monthly_t2m_precip_orog_ERA5-1979-2008-euras20.nc) (view diffs)
• INPUT/EURASIE20/coord-euras20.dat (modified) (view diffs)
• INPUT/EURASIE20/ghf_euras20.nc (copied) (copied from trunk/INPUT/EURASIE20/ghf_euras20.nc) (view diffs)
• INPUT/EURASIE20/ijphi_euras20.dat (deleted)
• INPUT/EURASIE20/lak_reg20km_eu20_ij (deleted)
• INPUT/EURASIE20/sedmap_euras20.nc (copied) (copied from trunk/INPUT/EURASIE20/sedmap_euras20.nc) (view diffs)
• INPUT/EURASIE20/topo_euras20.dat (deleted)
• INPUT/EURASIE40/SHB_etopo1_euras40.nc (copied) (copied from trunk/INPUT/EURASIE40/SHB_etopo1_euras40.nc) (view diffs)
• INPUT/EURASIE40/Snapshots-GCM/IPSL-CM5A-LR-lgm-euras40.nc (copied) (copied from trunk/INPUT/EURASIE40/Snapshots-GCM/IPSL-CM5A-LR-lgm-euras40.nc) (view diffs)
• INPUT/EURASIE40/Snapshots-GCM/IPSL-CM5A-LR-piControl-euras40.nc (copied) (copied from trunk/INPUT/EURASIE40/Snapshots-GCM/IPSL-CM5A-LR-piControl-euras40.nc) (view diffs)
• INPUT/EURASIE40/Snapshots-GCM/Saalian_test (deleted)
• INPUT/EURASIE40/Snapshots-GCM/forcage_gerhard_90k (deleted)
• INPUT/EURASIE40/climato_monthly_t2m_precip_orog_ERA5-1979-2008-euras40.nc (copied) (copied from trunk/INPUT/EURASIE40/climato_monthly_t2m_precip_orog_ERA5-1979-2008-euras40.nc) (view diffs)
• INPUT/EURASIE40/coord-euras40.dat (modified) (view diffs)
• INPUT/EURASIE40/ghf_euras40.nc (copied) (copied from trunk/INPUT/EURASIE40/ghf_euras40.nc) (view diffs)
• INPUT/EURASIE40/ijphi_euras40.dat (deleted)
• INPUT/EURASIE40/lak_reg40km_eu40_ij (deleted)
• INPUT/EURASIE40/lak_reg40km_eu40_ij_original (deleted)
• INPUT/EURASIE40/sedmap_euras40.nc (copied) (copied from trunk/INPUT/EURASIE40/sedmap_euras40.nc) (view diffs)
• INPUT/EURASIE40/topo40km.dat (deleted)
• INPUT/EURASIE40/topo_Saalien_euras40.dat (deleted)
• INPUT/EURASIE40/topo_euras40.dat (deleted)
• INPUT/HEMIN40/SHB_etopo1_hemin10.nc (copied) (copied from trunk/INPUT/HEMIN40/SHB_etopo1_hemin10.nc) (view diffs)
• INPUT/HEMIN40/climato_monthly_t2m_precip_orog_ERA5-1979-2008-hemin40.nc (copied) (copied from trunk/INPUT/HEMIN40/climato_monthly_t2m_precip_orog_ERA5-1979-2008-hemin40.nc) (view diffs)
• INPUT/HEMIN40/coord-hemin10.dat (copied) (copied from trunk/INPUT/HEMIN40/coord-hemin10.dat) (view diffs)
• INPUT/LAURE16 (copied) (copied from trunk/INPUT/LAURE16) (view diffs)
• Param/alps2_param_list.dat (copied) (copied from trunk/Param/alps2_param_list.dat) (view diffs)
• Param/ant16km_param_list.dat (copied) (copied from trunk/Param/ant16km_param_list.dat) (view diffs)
• SOURCES/3D-physique-gen_mod.f90 (modified) (view diffs)
• SOURCES/Alps_files (copied) (copied from trunk/SOURCES/Alps_files) (view diffs)
• SOURCES/Ant16_files/climat_InitMIP_years_perturb_mod.f90 (modified) (view diffs)
• SOURCES/Antarctique_general_files/dragging_prescr_beta_mod_Ant.f90 (deleted)
• SOURCES/Antarctique_general_files/output_anta_mod-0.4.f90 (deleted)
• SOURCES/Draggings_modules/dragging_beta_iter_vitbil_mod.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/dragging_prescr_beta_buoyency_mod.f90 (modified) (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/dragging_prescr_beta_perturb_mod.f90 (modified) (view diffs)
• SOURCES/Eurasie_files/fake-routines-eurasie_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/fake-routines-eurasie_mod.f90) (view diffs)
• SOURCES/Eurasie_files/geography-eurasie10_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/geography-eurasie10_mod.f90) (view diffs)
• SOURCES/Eurasie_files/geography-eurasie20_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/geography-eurasie20_mod.f90) (view diffs)
• SOURCES/Eurasie_files/geography-eurasie40_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/geography-eurasie40_mod.f90) (view diffs)
• SOURCES/Eurasie_files/lect-clim-act-eurasie_mod.f90 (deleted)
• SOURCES/Eurasie_files/lect-eurasie_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/lect-eurasie_mod.f90) (view diffs)
• SOURCES/Eurasie_files/module_choix-eurasie.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/module_choix-eurasie.f90) (view diffs)
• SOURCES/Eurasie_files/output_eurasie_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/output_eurasie_mod.f90) (view diffs)
• SOURCES/Eurasie_files/paradim-eurasie10_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/paradim-eurasie10_mod.f90) (view diffs)
• SOURCES/Eurasie_files/paradim-eurasie20_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/paradim-eurasie20_mod.f90) (view diffs)
• SOURCES/Eurasie_files/paradim-eurasie40_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/paradim-eurasie40_mod.f90) (view diffs)
• SOURCES/Eurasie_files/track_eurasie_mod.f90 (copied) (copied from trunk/SOURCES/Eurasie_files/track_eurasie_mod.f90) (view diffs)
• SOURCES/Fichiers-parametres/A-LBq15_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/A-LBq15_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/CISMA20_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/CISMA20_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/GI2S_5T_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/GI2S_5T_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/Makefile.tof-asterix-parallel.inc (modified) (view diffs)
• SOURCES/Fichiers-parametres/Makefile.tof-asterix-sequential.inc (modified) (view diffs)
• SOURCES/Fichiers-parametres/Makefile.tof-lsce3130.inc (modified) (view diffs)
• SOURCES/Fichiers-parametres/TEMPS-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/ant16km_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/ant16km_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/anteis1_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/anteis1_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/greeneem15_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/greeneem15_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/grismip_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/grismip_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/hemin15_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/hemin15_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/hemin40_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/hemin40_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/mism3_5_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/mism3_5_TEMPS-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/snowbal_LISTE-VAR-NETCDF.dat (deleted)
• SOURCES/Fichiers-parametres/snowbal_TEMPS-NETCDF.dat (deleted)
• SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90 (modified) (view diffs)
• SOURCES/Laure16_files (copied) (copied from trunk/SOURCES/Laure16_files) (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/Old-sources/dragging_hwat-contigu_mod.f90 (copied) (copied from trunk/SOURCES/Old-sources/dragging_hwat-contigu_mod.f90) (view diffs)
• SOURCES/Old-sources/dragging_hwat_contmaj_mod.f90 (copied) (copied from trunk/SOURCES/Old-sources/dragging_hwat_contmaj_mod.f90) (view diffs)
• SOURCES/Old-sources/dragging_hwat_sedim_mod.f90 (copied) (copied from trunk/SOURCES/Old-sources/dragging_hwat_sedim_mod.f90) (view diffs)
• SOURCES/Old-sources/dragging_hwatermax_0.2_mod.f90 (copied) (copied from trunk/SOURCES/Old-sources/dragging_hwatermax_0.2_mod.f90) (view diffs)
• SOURCES/Old-sources/dragging_neff_slope_mod.f90 (copied) (copied from trunk/SOURCES/Old-sources/dragging_neff_slope_mod.f90) (view diffs)
• SOURCES/Old-sources/dragging_prescr_beta_mod_Ant.f90 (copied) (copied from trunk/SOURCES/Old-sources/dragging_prescr_beta_mod_Ant.f90) (view diffs)
• SOURCES/Old-sources/output_anta_mod-0.4.f90 (copied) (copied from trunk/SOURCES/Old-sources/output_anta_mod-0.4.f90) (view diffs)
• SOURCES/ablation_mod.f90 (modified) (view diffs)
• SOURCES/bmelt-beckmann-gcm_mod.f90 (copied) (copied from trunk/SOURCES/bmelt-beckmann-gcm_mod.f90) (view diffs)
• SOURCES/bmelt-ismip6-param_mod.f90 (modified) (view diffs)
• SOURCES/calving_frange_ISMIP_glaciers.f90 (modified) (view diffs)
• SOURCES/climat_forcage_mod.f90 (modified) (view diffs)
• SOURCES/climat_transient_GCM_mod.f90 (modified) (view diffs)
• SOURCES/dragging_coulomb_friction_mod.f90 (copied) (copied from trunk/SOURCES/dragging_coulomb_friction_mod.f90) (view diffs)
• SOURCES/dragging_coulomb_friction_simplhydro_mod.f90 (copied) (copied from trunk/SOURCES/dragging_coulomb_friction_simplhydro_mod.f90) (view diffs)
• SOURCES/dragging_hwat-contigu_mod.f90 (deleted)
• SOURCES/dragging_hwat_contmaj_mod.f90 (deleted)
• SOURCES/dragging_hwat_sedim_mod.f90 (deleted)
• SOURCES/dragging_hwatermax_0.2_mod.f90 (deleted)
• SOURCES/dragging_neff_slope_mod.f90 (deleted)
• SOURCES/dragging_param_beta_mod.f90 (modified) (view diffs)
• SOURCES/dragging_param_beta_nolin_mod.f90 (deleted)
• SOURCES/dragging_param_beta_sedim_mod.f90 (modified) (view diffs)
• SOURCES/flottab2-0.7.f90 (modified) (view diffs)
• SOURCES/lake_rsl_mod.f90 (copied) (copied from trunk/SOURCES/lake_rsl_mod.f90) (view diffs)
• lauching_area/Master-files/TEMPS-NETCDF-degla.dat (copied) (copied from trunk/lauching_area/Master-files/TEMPS-NETCDF-degla.dat) (view diffs)
• lauching_area/Master-files/grisli.run (copied) (copied from trunk/lauching_area/Master-files/grisli.run) (view diffs)
• lauching_area/Master-files/grisli.run.openmp (copied) (copied from trunk/lauching_area/Master-files/grisli.run.openmp) (view diffs)
• lauching_area/Master-files/grisli.run.openmp_ant16 (copied) (copied from trunk/lauching_area/Master-files/grisli.run.openmp_ant16) (view diffs)
• lauching_area/Master-files/grisli.run.openmp_euras20 (copied) (copied from trunk/lauching_area/Master-files/grisli.run.openmp_euras20) (view diffs)
• lauching_area/Master-files/grisli.run_ant16 (copied) (copied from trunk/lauching_area/Master-files/grisli.run_ant16) (view diffs)
• lauching_area/Master-files/grisli.run_euras20 (copied) (copied from trunk/lauching_area/Master-files/grisli.run_euras20) (view diffs)
• lauching_area/degla_PMIP_euras10_param_list.dat (copied) (copied from trunk/lauching_area/degla_PMIP_euras10_param_list.dat) (view diffs)
• lauching_area/degla_PMIP_euras20_param_list.dat (copied) (copied from trunk/lauching_area/degla_PMIP_euras20_param_list.dat) (view diffs)
• lauching_area/degla_PMIP_euras40_param_list.dat (copied) (copied from trunk/lauching_area/degla_PMIP_euras40_param_list.dat) (view diffs)
• lauching_area/degla_PMIP_hemin40_param_list.dat (copied) (copied from trunk/lauching_area/degla_PMIP_hemin40_param_list.dat) (view diffs)
• lauching_area/degla_PMIP_laure16_param_list.dat (copied) (copied from trunk/lauching_area/degla_PMIP_laure16_param_list.dat) (view diffs)
• lauching_area/go_GRISLI_PMIP.sh (copied) (copied from trunk/lauching_area/go_GRISLI_PMIP.sh) (view diffs)
• lauching_area/go_ant16.sh (copied) (copied from trunk/lauching_area/go_ant16.sh) (view diffs)
• lauching_area/go_euras20_PMIP.sh (copied) (copied from trunk/lauching_area/go_euras20_PMIP.sh) (view diffs)