- Timestamp:
- 02/03/16 13:10:44 (8 years ago)
- Location:
- branches/iLoveclim
- Files:
-
- 7 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/iLoveclim
-
branches/iLoveclim/SOURCES/Ant40_files/module_choix-antar40-0.4.f90
r35 r45 87 87 88 88 use dragging_hwat_contmaj ! frottement basal catherine grisliv8 ice stream peu actifs 89 ! use dragging_neff_contmaj ! dragging Aurelien et Christophe Fev 2016 89 90 ! use dragging_hwat_sedim version sediment HN 90 91 -
branches/iLoveclim/SOURCES/Fichiers-parametres/anteis1_TEMPS-NETCDF.dat
r27 r45 20 20 1.e10 21 21 ------------------------------------------------------------------------------------------- 22 15npredeft lecture de predef_tsort22 8 npredeft lecture de predef_tsort 23 23 10 24 24 100 25 25 200 26 26 500 27 100010 28 100100 29 200010 30 200100 31 -20990 32 -20900 33 -20500 34 -19500 35 -121990 36 -125990 37 -125900 38 -419990 39 -419500 40 -419000 41 42 27 1000 28 2000 29 5000 30 7000 43 31 ------------------------------------------------------------------------------------------- -
branches/iLoveclim/SOURCES/Makefile.grisli-gfortran.inc
r40 r45 44 44 mod_clim_tof = climat_forcage_mois_mod.o climat-forcage-insolation_mod_oneway.o \ 45 45 climat-forcage-insolation_mod.o climat_GrIce2sea_years_mod.o \ 46 climat_GrIce2sea_years_perturb_mod.o \ 46 47 climat-perturb_mod-0.4.o \ 47 48 ablation_mod.o no_ablation_mod.o \ … … 74 75 dragging_hwatermax_0.2_mod.o dragging_calc_beta_mod.o \ 75 76 dragging_hwat-contigu_mod.o dragging_hwat_contmaj_mod.o \ 76 dragging_hwat_sedim_mod.o \77 dragging_hwat_sedim_mod.o dragging_neff_contmaj_mod.o \ 77 78 calving_frange.o no_calving.o no_lakes.o \ 78 79 out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \ … … 637 638 $(F_NETCDF) GrIce2sea_files/climat_GrIce2sea_years_mod.f90 638 639 640 climat_GrIce2sea_years_perturb_mod.o : GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90 641 $(F_NETCDF) GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90 642 639 643 climat-forcage-stat-mois_mod-0.1.o : climat-forcage-stat-mois_mod-0.1.f90 640 644 $(FT) climat-forcage-stat-mois_mod-0.1.f90 … … 708 712 dragging_hwat_sedim_mod.o : dragging_hwat_sedim_mod.f90 709 713 $(FT) dragging_hwat_sedim_mod.f90 714 715 dragging_neff_contmaj_mod.o : dragging_neff_contmaj_mod.f90 716 $(FT) dragging_neff_contmaj_mod.f90 710 717 711 718 dragging_calc_beta_mod.o : Antarctique_general_files/dragging_calc_beta_mod.f90 -
branches/iLoveclim/SOURCES/Makefile.grisli.inc
r40 r45 43 43 mod_clim_tof = climat_forcage_mois_mod.o climat-forcage-insolation_mod_oneway.o \ 44 44 climat-forcage-insolation_mod.o climat_GrIce2sea_years_mod.o \ 45 climat_GrIce2sea_years_perturb_mod.o \ 45 46 climat-perturb_mod-0.4.o \ 46 47 ablation_mod.o no_ablation_mod.o \ … … 73 74 dragging_hwatermax_0.2_mod.o dragging_calc_beta_mod.o \ 74 75 dragging_hwat-contigu_mod.o dragging_hwat_contmaj_mod.o \ 75 dragging_hwat_sedim_mod.o \76 dragging_hwat_sedim_mod.o dragging_neff_contmaj_mod.o \ 76 77 calving_frange.o no_calving.o no_lakes.o \ 77 78 out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \ … … 636 637 $(F_NETCDF) GrIce2sea_files/climat_GrIce2sea_years_mod.f90 637 638 639 climat_GrIce2sea_years_perturb_mod.o : GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90 640 $(F_NETCDF) GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90 641 638 642 climat-forcage-stat-mois_mod-0.1.o : climat-forcage-stat-mois_mod-0.1.f90 639 643 $(FT) climat-forcage-stat-mois_mod-0.1.f90 … … 707 711 dragging_hwat_sedim_mod.o : dragging_hwat_sedim_mod.f90 708 712 $(FT) dragging_hwat_sedim_mod.f90 713 714 dragging_neff_contmaj_mod.o : dragging_neff_contmaj_mod.f90 715 $(FT) dragging_neff_contmaj_mod.f90 709 716 710 717 dragging_calc_beta_mod.o : Antarctique_general_files/dragging_calc_beta_mod.f90 -
branches/iLoveclim/SOURCES/dragging_hwat_sedim_mod.f90
r38 r45 325 325 326 326 if (cotemx(i,j)) then ! point cotier 327 betamx(i,j)=cf*neffmx(i,j) *0.1327 betamx(i,j)=cf*neffmx(i,j) 328 328 ! cat betamx(i,j)=min(betamx(i,j),tobmax) 329 329 ! version Jorge … … 379 379 380 380 if (cotemy(i,j)) then ! point cotier 381 betamy(i,j)=cf*neffmy(i,j) *0.1381 betamy(i,j)=cf*neffmy(i,j) 382 382 ! cat betamy(i,j)=min(betamy(i,j),tobmax) 383 383 ! version Jorge -
branches/iLoveclim/SOURCES/relaxation_water_diffusion.f90
r4 r45 128 128 erelax(i,j)=-kmy(i,j+1)*dtwdx2 ! drelax : diagonale i,j+1 129 129 130 crelax(i,j)=1.+((kmx(i,j)+kmx(i+1,j))+(kmy(i,j +1)+kmy(i,j+1)))*dtwdx2130 crelax(i,j)=1.+((kmx(i,j)+kmx(i+1,j))+(kmy(i,j)+kmy(i,j+1)))*dtwdx2 131 131 !crelax : diagonale i,j 132 132
Note: See TracChangeset
for help on using the changeset viewer.