Changeset 77 for branches/iLoveclim/SOURCES/Makefile.grisli-gfortran.inc

Timestamp:

07/05/16 11:20:52 (8 years ago)

Author:

dumas

Message:

Merge branche iLOVECLIM sur rev 76

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/Makefile.grisli-gfortran.inc (modified) (12 diffs)

branches/iLoveclim/SOURCES/Makefile.grisli-gfortran.inc

@@ -75 +75 @@
         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_neff_contmaj_mod.o \
+        dragging_hwat_sedim_mod.o dragging_neff_slope_mod.o \
         calving_frange.o no_calving.o no_lakes.o \
         out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \
@@ -219 +219 @@
         fake-routines-ant_mod.o module_choix-antar40-0.4.o \
         track_ant40_mod.o
+        
+Liste_Snowball = output_snowball_mod-0.4.o \
+        lect-snowball_mod.o \
+        bmelt-snowball-depth_mod.o \
+        fake-routines-snowball_mod.o \
+        module_choix-snowball.o \
+        track_snowball_mod.o
+                
 
 Liste_eura40 = output_eurasie40_mod-0.1.o \
@@ -280 +288 @@
 
 Dim_Ant40 = paradim-ant40_mod.o geography-ant40_mod.o
+
+Dim_Snowball = paradim-snowball_mod.o geography-snowball_mod.o
 
 Dim_eura40 = paradim-euras40_mod.o geography-euras40_mod.o
@@ -712 +722 @@
         $(FT) dragging_hwat_sedim_mod.f90
 
-dragging_neff_contmaj_mod.o : dragging_neff_contmaj_mod.f90
-        $(FT) dragging_neff_contmaj_mod.f90
+dragging_neff_slope_mod.o : dragging_neff_slope_mod.f90
+        $(FT) dragging_neff_slope_mod.f90
 
 dragging_calc_beta_mod.o : Antarctique_general_files/dragging_calc_beta_mod.f90
@@ -734 +744 @@
 
 beta_iter_vitbil_mod.o : Draggings_modules/beta_iter_vitbil_mod.f90
-        $(FT)  Draggings_modules/beta_iter_vitbil_mod.f90
+        $(F_NETCDF)  Draggings_modules/beta_iter_vitbil_mod.f90
 
 dragging_stream_impose_vitbil_mod.o : Ant40_files/dragging_stream_impose_vitbil_mod.f90
@@ -841 +851 @@
 output_anta40_mod-0.4.o : Ant40_files/output_anta40_mod-0.4.f90
         $(FT) Ant40_files/output_anta40_mod-0.4.f90
+        
+output_snowball_mod-0.4.o : Snowball_files/output_snowball_mod-0.4.f90
+        $(FT) Snowball_files/output_snowball_mod-0.4.f90        
 
 output_global_mod.o :output_global_mod.f90
@@ -1285 +1298 @@
 track_hemin15_mod.o : Hemin15_files/track_hemin15_mod.f90
         $(FT) Hemin15_files/track_hemin15_mod.f90
+        
+        
+# routines Snowball
+paradim-snowball_mod.o : Snowball_files/paradim-snowball_mod.f90
+        $(FT) Snowball_files/paradim-snowball_mod.f90
+        
+geography-snowball_mod.o : Snowball_files/geography-snowball_mod.f90
+        $(FT) Snowball_files/geography-snowball_mod.f90
+        
+lect-snowball_mod.o : Snowball_files/lect-snowball_mod.f90
+        $(FT) Snowball_files/lect-snowball_mod.f90
+        
+bmelt-snowball-depth_mod.o : Snowball_files/bmelt-snowball-depth_mod.f90
+        $(FT) Snowball_files/bmelt-snowball-depth_mod.f90
+        
+fake-routines-snowball_mod.o : Snowball_files/fake-routines-snowball_mod.f90
+        $(FT) Snowball_files/fake-routines-snowball_mod.f90
+        
+module_choix-snowball.o : Snowball_files/module_choix-snowball.f90
+        $(FT) Snowball_files/module_choix-snowball.f90
+        
+track_snowball_mod.o : Snowball_files/track_snowball_mod.f90
+        $(FT) Snowball_files/track_snowball_mod.f90
+        
 
 # routines Eurasie-40
@@ -1598 +1635 @@
         $(diagnoshelf) \
         $(Liste_Netcdf) \
-        $(routines_communes) steps_time_loop.o $(routine_elliptiques) 
+        $(routines_communes) steps_time_loop.o $(routine_elliptiques)  \
+        $(Liste_BLAS)
 
         $(LK) -o ../bin/Grice2sea \
@@ -1610 +1648 @@
         $(Liste_Netcdf) \
         $(routines_communes) steps_time_loop.o \
-        $(routine_elliptiques) $(NCDF_LIB)  $(MKL_LIB)
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+        $(NCDF_LIB)  $(MKL_LIB)
 
 Grice2sea_iterbeta : $(Dim_GrIce2sea) $(mod_dim_communs)   \
@@ -1639 +1679 @@
         $(mod_communs) \
         $(mod_clim_tof) \
-        $(mod_no_tracers) \
+        $(mod_tracers) \
         $(mod_ell) $(Liste_hemin40) \
         $(diagnoshelf) \
@@ -1652 +1692 @@
         $(mod_communs) \
         $(mod_clim_tof) \
-        $(mod_no_tracers) \
+        $(mod_tracers) \
         $(mod_ell) $(Liste_hemin40) \
         $(diagnoshelf) \
@@ -1740 +1780 @@
         $(routines_communes) steps_time_loop.o \
         $(routine_elliptiques) $(NCDF_LIB)  $(MKL_LIB) $(Liste_BLAS)
-
+        
+Snowball : $(Dim_Snowball) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof) \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_Snowball) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+
+        $(LK) -o  ../bin/Snowball \
+        $(Dim_Snowball) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof) \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_Snowball) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) $(NCDF_LIB)  $(MKL_LIB) $(Liste_BLAS)
+