Changeset 45 for branches/iLoveclim/SOURCES/Makefile.grisli.inc

Timestamp:

02/03/16 13:10:44 (8 years ago)

Author:

dumas

Message:

Merge branche iLOVECLIM sur rev 44

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/Makefile.grisli.inc (modified) (4 diffs)

branches/iLoveclim/SOURCES/Makefile.grisli.inc

@@ -43 +43 @@
 mod_clim_tof = climat_forcage_mois_mod.o climat-forcage-insolation_mod_oneway.o \
         climat-forcage-insolation_mod.o climat_GrIce2sea_years_mod.o \
+        climat_GrIce2sea_years_perturb_mod.o \
         climat-perturb_mod-0.4.o \
         ablation_mod.o no_ablation_mod.o \
@@ -73 +74 @@
         dragging_hwatermax_0.2_mod.o dragging_calc_beta_mod.o  \
         dragging_hwat-contigu_mod.o dragging_hwat_contmaj_mod.o \
-        dragging_hwat_sedim_mod.o \
+        dragging_hwat_sedim_mod.o dragging_neff_contmaj_mod.o \
         calving_frange.o no_calving.o no_lakes.o \
         out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \
@@ -636 +637 @@
         $(F_NETCDF) GrIce2sea_files/climat_GrIce2sea_years_mod.f90
 
+climat_GrIce2sea_years_perturb_mod.o : GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90
+        $(F_NETCDF) GrIce2sea_files/climat_GrIce2sea_years_perturb_mod.f90
+
 climat-forcage-stat-mois_mod-0.1.o : climat-forcage-stat-mois_mod-0.1.f90
         $(FT)  climat-forcage-stat-mois_mod-0.1.f90
@@ -707 +711 @@
 dragging_hwat_sedim_mod.o : dragging_hwat_sedim_mod.f90
         $(FT) dragging_hwat_sedim_mod.f90
+
+dragging_neff_contmaj_mod.o : dragging_neff_contmaj_mod.f90
+        $(FT) dragging_neff_contmaj_mod.f90
 
 dragging_calc_beta_mod.o : Antarctique_general_files/dragging_calc_beta_mod.f90