Changeset 68 for trunk/SOURCES/Makefile.grisli.inc

Timestamp:

06/03/16 16:06:35 (8 years ago)

Author:

dumas

Message:

No sliding in module_choix | Antarctic 15km configuration usable | Use depth instade of dist_talus in bmelt-ant-regions_mod.f90

File:

• trunk/SOURCES/Makefile.grisli.inc (modified) (3 diffs)

trunk/SOURCES/Makefile.grisli.inc

@@ -172 +172 @@
 
 
-Liste_ANT15-LBq = lect-Ant_clim_Acc-T_gen_dat.o output_anta_mod-0.4.o \
-        dragging-vit_bil_LBq_gen_mod.o dragging_LGM_mod.o dragging_plastic_LGM_mod.o \
-        dragging_prescr_beta_mod.o dragging_prescr_beta_buoyency_mod.o dragging_prescr_beta_nolin_mod.o \
-        fake-routines-ant_mod.o beta_iter_vitbil_mod.o \
-        lect-Ant_gen2010_dat.o module_choix_antar15_LBq.o \
-        massb-ant_perturb_Tparam.o track_ant40_mod.o 
-
-
+#Liste_ANT15-LBq = lect-Ant_clim_Acc-T_gen_dat.o output_anta_mod-0.4.o \
+#       dragging-vit_bil_LBq_gen_mod.o dragging_LGM_mod.o dragging_plastic_LGM_mod.o \
+#       dragging_prescr_beta_mod.o dragging_prescr_beta_buoyency_mod.o dragging_prescr_beta_nolin_mod.o \
+#       fake-routines-ant_mod.o beta_iter_vitbil_mod.o \
+#       lect-Ant_gen2010_dat.o module_choix_antar15_LBq.o \
+#       massb-ant_perturb_Tparam.o track_ant40_mod.o 
+
+Liste_ANT15-LBq = output_anta_mod-0.4.o \
+                lect-Ant_gen2010_dat.o \
+                lect-anteis_mod.o \
+                bmelt-ant-regions_mod.o \
+                fake-routines-ant_mod.o \
+                module_choix_antar15_LBq.o \
+                track_ant40_mod.o \
 
 Liste_hudson = sedim_declar_hudson_mod.o climat-hudson_mod.o \
@@ -361 +367 @@
         $(FT) $(NETCDFINCLUDE) -c Ant40_files/$*.f90
         
+# ANT15-LBq_files
+%.o: ANT15-LBq_files/%.f90
+        $(FT) $(NETCDFINCLUDE) -c ANT15-LBq_files/$*.f90
+        
 # Greeneem_files/Greeneem15_files
 %.o: Greeneem_files/Greeneem15_files/%.f90
@@ -410 +420 @@
 #---------------------------------------
 
-LBqAntar15 : $(Dim_ANT15-LBq) $(mod_dim_communs)  \
-        $(Proto_recul)  \
-        $(mod_communs) \
-        $(Proto_recul)  \
-        $(mod_clim_perturb)  \
-        $(mod_tracers) \
+Ant-15 : $(Dim_ANT15-LBq) $(mod_dim_communs) \
+        $(toy_recul) \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
         $(mod_ell) $(Liste_ANT15-LBq) \
         $(diagnoshelf) \
         $(Liste_Netcdf) \
-        $(routines_communes) steps_time_loop.o $(routine_elliptiques) 
-
-        $(LK) -o ../bin/LBqAntar-15  $(Dim_ANT15-LBq) $(mod_dim_communs) \
-        $(Proto_recul)  \
-        $(mod_communs) \
-        $(mod_clim_perturb)  \
-        $(mod_tracers) \
-        $(mod_ell) \
-        $(Liste_ANT15-LBq) \
-        $(diagnoshelf) $(Liste_Netcdf) \
-        $(routines_communes) steps_time_loop.o $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB)
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+
+        $(LK) -o ../bin/Ant-15 \
+        $(Dim_ANT15-LBq) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_ANT15-LBq) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)
 
 Recul_ice2sea : $(Dim_ANT15-LBq) $(mod_dim_communs)  \