Changeset 244

Timestamp:

01/16/19 16:08:14 (5 years ago)

Author:

aquiquet

Message:

Grisli-iloveclim branch merged to trunk at revision 243

Location:

branches/iLoveclim

Files:

• . (modified) (view diffs)
• Fichier-CPTR/ABUMIP-cptr.nc (copied) (copied from trunk/Fichier-CPTR/ABUMIP-cptr.nc) (view diffs)
• Fichier-CPTR/GRISLI-v2-ABUMIP-LARMIP-cptr.nc (copied) (copied from trunk/Fichier-CPTR/GRISLI-v2-ABUMIP-LARMIP-cptr.nc) (view diffs)
• Fichier-CPTR/GRISLI-v2-gmd-2018_Schoof-cptr.nc (copied) (copied from trunk/Fichier-CPTR/GRISLI-v2-gmd-2018_Schoof-cptr.nc) (view diffs)
• Fichier-CPTR/GRISLI-v2-gmd-2018_Tsai-cptr.nc (copied) (copied from trunk/Fichier-CPTR/GRISLI-v2-gmd-2018_Tsai-cptr.nc) (view diffs)
• Fichier-CPTR/TB40S252-k126-cptr.nc (copied) (copied from trunk/Fichier-CPTR/TB40S252-k126-cptr.nc) (view diffs)
• Fichier-CPTR/TB40T213-k126-cptr.nc (copied) (copied from trunk/Fichier-CPTR/TB40T213-k126-cptr.nc) (view diffs)
• INPUT/ANT-CISM-20km/ghf_fox-extended-mW_ant20.nc (copied) (copied from trunk/INPUT/ANT-CISM-20km/ghf_fox-extended-mW_ant20.nc) (view diffs)
• INPUT/ANT16km/ABUMIP-beta.grd (copied) (copied from trunk/INPUT/ANT16km/ABUMIP-beta.grd) (view diffs)
• INPUT/ANT16km/SHB_bedmap2_Ant16_relax20ans.nc (copied) (copied from trunk/INPUT/ANT16km/SHB_bedmap2_Ant16_relax20ans.nc) (view diffs)
• INPUT/ANT16km/beta-ABUMIP-LARMIP.grd (copied) (copied from trunk/INPUT/ANT16km/beta-ABUMIP-LARMIP.grd) (view diffs)
• INPUT/ANT16km/ghf_Ant_Lebrocq_16km.grd (copied) (copied from trunk/INPUT/ANT16km/ghf_Ant_Lebrocq_16km.grd) (view diffs)
• INPUT/ANT16km/ghf_fox-extended-mW_ant16.nc (copied) (copied from trunk/INPUT/ANT16km/ghf_fox-extended-mW_ant16.nc) (view diffs)
• INPUT/ANTEIS1/SHB_bedmap2_Ant40_relax20ans.nc (copied) (copied from trunk/INPUT/ANTEIS1/SHB_bedmap2_Ant40_relax20ans.nc) (view diffs)
• INPUT/ANTEIS1/ghf_Ant_Lebrocq_40km.nc (modified) (view diffs)
• INPUT/ANTEIS1/ghf_fox-extended-mW_ant40.nc (copied) (copied from trunk/INPUT/ANTEIS1/ghf_fox-extended-mW_ant40.nc) (view diffs)
• INPUT/ANTEIS1/shelves-from-initMIP-40km.nc (copied) (copied from trunk/INPUT/ANTEIS1/shelves-from-initMIP-40km.nc) (view diffs)
• INPUT/Forcage/forcage-429k-2007-Jouzel-Waelbroeck_AMOC.dat (copied) (copied from trunk/INPUT/Forcage/forcage-429k-2007-Jouzel-Waelbroeck_AMOC.dat) (view diffs)
• INPUT/Forcage/forcage-429k-quiquet-et-al_CP2013_glacial-index_Waelbroeck_AMOC.dat (copied) (copied from trunk/INPUT/Forcage/forcage-429k-quiquet-et-al_CP2013_glacial-index_Waelbroeck_AMOC.dat) (view diffs)
• INPUT/HEMIN40/climato_monthly_t2m_era_int_precip_GPCP_1979-1999_hemin40.nc (copied) (copied from trunk/INPUT/HEMIN40/climato_monthly_t2m_era_int_precip_GPCP_1979-1999_hemin40.nc) (view diffs)
• INPUT/HEMIN40/sediment_ij_hemin40.grd (added)
• Param/anteis1_param_list_Cyc-Scho.dat (copied) (copied from trunk/Param/anteis1_param_list_Cyc-Scho.dat) (view diffs)
• Param/anteis1_param_list_Cyc-Tsai.dat (copied) (copied from trunk/Param/anteis1_param_list_Cyc-Tsai.dat) (view diffs)
• Param/param-versions-10 (deleted)
• Param/paramA25C-run09-spinup (deleted)
• Param/paramci15ref1 (deleted)
• RUNS (copied) (copied from trunk/RUNS) (view diffs)
• SOURCES/3D-physique-gen_mod.f90 (modified) (view diffs)
• SOURCES/ANT15-LBq_files/module_choix_antar15_LBq.f90 (modified) (view diffs)
• SOURCES/Ant15_CISM_files/lect-Ant_CISM_15_dat.f90 (deleted)
• SOURCES/Ant15_CISM_files/lect-Ant_clim_CISM_15_dat.f90 (deleted)
• SOURCES/Ant15_CISM_files/module_choix_antar15CISM.f90 (modified) (view diffs)
• SOURCES/Ant15_CISM_files/output_anta_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Ant16_files/bmelt-ant-regions-initmip_mod.f90 (modified) (view diffs)
• SOURCES/Ant16_files/bmelt-seuil-profondeur_initmip_inv_mod.f90 (copied) (copied from trunk/SOURCES/Ant16_files/bmelt-seuil-profondeur_initmip_inv_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/Ant16_files/module_choix-ant16km.f90-std-abumip (copied) (copied from trunk/SOURCES/Ant16_files/module_choix-ant16km.f90-std-abumip) (view diffs)
• SOURCES/Ant16_files/module_choix-ant16km.f90-std-larmip (copied) (copied from trunk/SOURCES/Ant16_files/module_choix-ant16km.f90-std-larmip) (view diffs)
• SOURCES/Ant16_files/paradim-ant16_mod.f90 (modified) (view diffs)
• SOURCES/Ant20_CISM_files/module_choix_antar20CISM.f90 (modified) (view diffs)
• SOURCES/Ant25_CISM_files/module_choix_antar25CISM.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/Ant40_files/paradim-ant40_mod.f90 (modified) (view diffs)
• SOURCES/Ant45_CISM_files/lect-Ant_CISM_45_dat.f90 (deleted)
• SOURCES/Ant45_CISM_files/lect-Ant_clim_CISM_45_dat.f90 (deleted)
• SOURCES/Ant45_CISM_files/module_choix_antar45CISM.f90 (modified) (view diffs)
• SOURCES/Ant45_CISM_files/output_anta_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Antarctique_general_files/lect-Ant_CISM_gen_dat.f90 (deleted)
• SOURCES/Antarctique_general_files/lect-Ant_clim_Acc-T_gen_dat.f90 (deleted)
• SOURCES/Antarctique_general_files/lect-Ant_clim_CISM_gen_dat.f90 (deleted)
• SOURCES/Antarctique_general_files/lect-Ant_gen2010_dat.f90 (deleted)
• SOURCES/Antarctique_general_files/output_anta_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Draggings_modules/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_nolin_mod.f90 (modified) (view diffs)
• SOURCES/Eurasie40_files/bmelt-eurasie-depth-lake_mod.f90 (modified) (view diffs)
• SOURCES/Eurasie40_files/climat-forcage-eurasie_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Eurasie40_files/lakes-prescribed_mod-0.1.f90 (modified) (view diffs)
• SOURCES/Eurasie40_files/output_eurasie40_mod-0.1.f90 (modified) (view diffs)
• SOURCES/Fichiers-parametres/Makefile-foehn.inc (deleted)
• SOURCES/Fichiers-parametres/Makefile.catritz-foehn.inc (deleted)
• SOURCES/Fichiers-parametres/Makefile.catritz-gfortran-007.inc (deleted)
• SOURCES/Fichiers-parametres/Makefile.catritz-lgge007.inc (deleted)
• SOURCES/Fichiers-parametres/Makefile.catritz-pc226.inc (deleted)
• SOURCES/Fichiers-parametres/Makefile.catritz-r2d2.inc (deleted)
• SOURCES/Fichiers-parametres/Makefile.old-copy (deleted)
• SOURCES/Fichiers-parametres/Makefile.tof-asterix-parallel.inc (copied) (copied from trunk/SOURCES/Fichiers-parametres/Makefile.tof-asterix-parallel.inc) (view diffs)
• SOURCES/Fichiers-parametres/Makefile.tof-asterix-sequential.inc (copied) (copied from trunk/SOURCES/Fichiers-parametres/Makefile.tof-asterix-sequential.inc) (view diffs)
• SOURCES/Fichiers-parametres/Makefile.tof-lsce3130.inc (modified) (view diffs)
• SOURCES/Fichiers-parametres/ant16km_param_list-abuc-2018.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/ant16km_param_list-abuc-2018.dat) (view diffs)
• SOURCES/Fichiers-parametres/ant16km_param_list-larmipctrl-2018.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/ant16km_param_list-larmipctrl-2018.dat) (view diffs)
• SOURCES/Fichiers-parametres/ant16km_param_list.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_param_list-AN40S123-Schoof-gmd-2018.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/anteis1_param_list-AN40S123-Schoof-gmd-2018.dat) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_param_list-AN40T213-Tsai-gmd-2018.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/anteis1_param_list-AN40T213-Tsai-gmd-2018.dat) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_param_list-TB40S252-Schoof-gmd-2018.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/anteis1_param_list-TB40S252-Schoof-gmd-2018.dat) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_param_list-TB40T213-Tsai-gmd-2018.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/anteis1_param_list-TB40T213-Tsai-gmd-2018.dat) (view diffs)
• SOURCES/Fichiers-parametres/anteis1_param_list.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/anteis1_param_list.dat) (view diffs)
• SOURCES/Fichiers-parametres/hemin40_LISTE-VAR-NETCDF.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/hemin40_param_list.dat (modified) (view diffs)
• SOURCES/Fichiers-parametres/short-initMIPnc.dat (copied) (copied from trunk/SOURCES/Fichiers-parametres/short-initMIPnc.dat) (view diffs)
• SOURCES/GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90 (modified) (view diffs)
• SOURCES/GrIce2sea_files/lect_GrIce2sea_gen_nc.f90 (modified) (view diffs)
• SOURCES/GrIce2sea_files/module_choix_GrIce2sea.f90 (modified) (view diffs)
• SOURCES/GrIce2sea_files/output_Grice2sea_mod.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/Greeneem15_files/paradim-greeneem15_mod.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/lect-clim-act-greeneem_mar_mod.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/lect-clim-act-greeneem_mois_lapsecouche_mod.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/lect-clim-act-greeneem_mois_mod.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/lect-greeneem_mod.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/module_choix-greeneem.f90 (modified) (view diffs)
• SOURCES/Greeneem_files/output_greeneem_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Greenmint40_files/lect-greenmint_mod.f90 (modified) (view diffs)
• SOURCES/Greenmint40_files/module_choix-greenmint-40.f90 (modified) (view diffs)
• SOURCES/Greenmint40_files/output_green_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Heino_files/flottab2-0.5-heino.f90 (modified) (view diffs)
• SOURCES/Hemin15_files/lect-hemin15_mod.f90 (modified) (view diffs)
• SOURCES/Hemin15_files/module_choix-hemin15.f90 (modified) (view diffs)
• SOURCES/Hemin15_files/paradim-hemin15_mod.f90 (modified) (view diffs)
• SOURCES/Hemin40_files/bmelt-hemin40-depth_mod.f90 (modified) (view diffs)
• SOURCES/Hemin40_files/lect-hemin40_mod.f90 (modified) (view diffs)
• SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90 (modified) (view diffs)
• SOURCES/Hudson_files/bmelt_hudson_mod.f90 (modified) (view diffs)
• SOURCES/Hudson_files/climat-hudson_mod.f90 (modified) (view diffs)
• SOURCES/Hudson_files/eaubasale-0.5_hudson_mod.f90 (modified) (view diffs)
• SOURCES/Hudson_files/module_choix-hudson-0.4.f90 (modified) (view diffs)
• SOURCES/MISMIP3D_files/lect-mismip3d_mod.f90 (modified) (view diffs)
• SOURCES/MISMIP3D_files/module_choix_mismip3d.f90 (modified) (view diffs)
• SOURCES/Makefile (modified) (view diffs)
• SOURCES/Makefile.grisli.inc (modified) (view diffs)
• SOURCES/New-remplimat/remplimat-shelves-tabTu.f90 (modified) (view diffs)
• SOURCES/Old-sources/climat_forcage_mois_mod.f90 (copied) (copied from trunk/SOURCES/Old-sources/climat_forcage_mois_mod.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_CISM_15_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_CISM_15_dat.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_CISM_45_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_CISM_45_dat.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_CISM_gen_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_CISM_gen_dat.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_clim_Acc-T_gen_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_clim_Acc-T_gen_dat.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_clim_CISM_15_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_clim_CISM_15_dat.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_clim_CISM_45_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_clim_CISM_45_dat.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_clim_CISM_gen_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_clim_CISM_gen_dat.f90) (view diffs)
• SOURCES/Old-sources/lect-Ant_gen2010_dat.f90 (copied) (copied from trunk/SOURCES/Old-sources/lect-Ant_gen2010_dat.f90) (view diffs)
• SOURCES/Old-sources/minmax-format.f90 (copied) (copied from trunk/SOURCES/Old-sources/minmax-format.f90) (view diffs)
• SOURCES/Old-sources/new-flot-0.3.f90 (copied) (copied from trunk/SOURCES/Old-sources/new-flot-0.3.f90) (view diffs)
• SOURCES/Old-sources/sealevel-out.f90 (copied) (copied from trunk/SOURCES/Old-sources/sealevel-out.f90) (view diffs)
• SOURCES/Old-sources/snaptime.f90 (copied) (copied from trunk/SOURCES/Old-sources/snaptime.f90) (view diffs)
• SOURCES/Snowball_files/bmelt-snowball-depth_mod.f90 (modified) (view diffs)
• SOURCES/Snowball_files/module_choix-snowball.f90 (modified) (view diffs)
• SOURCES/Snowball_files/output_snowball_mod-0.4.f90 (modified) (view diffs)
• SOURCES/Temperature-routines/icetemp_mod.f90 (modified) (view diffs)
• SOURCES/bilan_eau_mod.f90 (modified) (view diffs)
• SOURCES/bmelt-grounded.f90 (modified) (view diffs)
• SOURCES/bmelt-seuil-profondeur_mod.f90 (modified) (view diffs)
• SOURCES/bmelt_clio_coupl_mod.f90 (modified) (view diffs)
• SOURCES/branche-Cat-spinup-dec2011/steps_time_loop.f90 (modified) (view diffs)
• SOURCES/calving_frange.f90 (modified) (view diffs)
• SOURCES/calving_frange_abuk.f90 (copied) (copied from trunk/SOURCES/calving_frange_abuk.f90) (view diffs)
• SOURCES/climat-forcage-insolation_mod.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/climat_forcage_mod.f90 (copied) (copied from trunk/SOURCES/climat_forcage_mod.f90) (view diffs)
• SOURCES/climat_forcage_mois_mod.f90 (deleted)
• SOURCES/conserv-mass-adv-diff_sept2009_mod.f90 (modified) (view diffs)
• SOURCES/deformation_mod_2lois.f90 (modified) (view diffs)
• SOURCES/dragging_param_beta_sedim_mod.f90 (modified) (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/initial-phy-2-job.f90 (modified) (view diffs)
• SOURCES/initial-phy-2.f90 (modified) (view diffs)
• SOURCES/initial2-0.4.f90 (modified) (view diffs)
• SOURCES/isostasie_mod-0.3.f90 (modified) (view diffs)
• SOURCES/main3D-0.4-40km.f90 (modified) (view diffs)
• SOURCES/minmax-format.f90 (deleted)
• SOURCES/new-flot-0.3.f90 (deleted)
• SOURCES/no_lakes.f90 (deleted)
• SOURCES/no_rsl.f90 (copied) (copied from trunk/SOURCES/no_rsl.f90) (view diffs)
• SOURCES/no_spinup_mod.f90 (modified) (view diffs)
• SOURCES/prescribe-H-i2s_mod.f90 (modified) (view diffs)
• SOURCES/resol_adv_diff_2D-sept2009.f90 (modified) (view diffs)
• SOURCES/sealevel-out.f90 (deleted)
• SOURCES/snaptime.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)
• lauching_area (copied) (copied from trunk/lauching_area) (view diffs)