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

Timestamp:

10/20/17 09:31:39 (7 years ago)

Author:

aquiquet

Message:

Grisli-iLoveclim branch: merged to trunk at revision 145

Location:

branches/iLoveclim

Files:

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

branches/iLoveclim/SOURCES/Makefile.grisli.inc

@@ -43 +43 @@
         climat-forcage-insolation_mod.o climat_GrIce2sea_years_mod.o \
         climat_GrIce2sea_years_perturb_mod.o \
+        climat_InitMIP_years_perturb_mod.o \
         climat-perturb_mod-0.4.o \
         ablation_mod.o no_ablation_mod.o \
@@ -77 +78 @@
         calving_frange.o no_calving.o no_lakes.o \
         out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \
-        furst_schoof_mod.o \
+        furst_schoof_mod.o bilan_flux_output_mod.o \
         relaxation_water_diffusion.o \
         prescribe-H-i2s_mod.o  \
@@ -97 +98 @@
         calving_frange.o no_calving.o no_lakes.o \
         out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \
-        furst_schoof_mod.o \
+        furst_schoof_mod.o bilan_flux_output_mod.o \
         relaxation_water_diffusion.o \
         prescribe-H-i2s_mod.o   \
@@ -187 +188 @@
 
 
+Liste_ANT16 = output_anta40_mod-0.4.o \
+                dragging_prescr_beta_mod.o \
+                dragging_prescr_beta_nolin_mod.o \
+                lect-Ant_gen2010_dat.o \
+                lect-anteis_mod.o \
+                bmelt-ant-regions_mod.o \
+                bmelt-ant-regions-initmip_mod.o \
+                fake-routines-ant_mod.o \
+                beta_iter_vitbil_mod.o \
+                module_choix-ant16km.o \
+                massb-ant_perturb_Tparam.o \
+                track_ant40_mod.o
+
 Liste_ANT15-LBq = output_anta_mod-0.4.o \
                 dragging_prescr_beta_mod.o \
@@ -197 +211 @@
                 module_choix_antar15_LBq.o \
                 massb-ant_perturb_Tparam.o \
-                track_ant40_mod.o \
+                track_ant40_mod.o
 
 Liste_hudson = sedim_declar_hudson_mod.o climat-hudson_mod.o \
@@ -296 +310 @@
 
 Dim_GrIce2sea = paradim-GrIce2sea-cut_Tamsin.o geography-GrIce2sea.o
+
+Dim_ANT16 = paradim-ant16_mod.o geography-ant16.o
 
 Dim_ANT15-LBq    = paradim-ant15_LBq_mod.o geography-Ant15_LBq.o   
@@ -382 +398 @@
 %.o: Ant40_files/%.f90
         $(FT) $(NCDF_INC) -c Ant40_files/$*.f90
+
+# Ant16_files
+%.o: Ant16_files/%.f90
+        $(FT) $(NCDF_INC) -c Ant16_files/$*.f90
         
 # ANT15-LBq_files
@@ -436 +456 @@
 #---------------------------------------
 
+Ant-16 : $(Dim_ANT16) $(mod_dim_communs) \
+        $(toy_recul) \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_ANT16) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+
+        $(LK) -o ../bin/Ant-16 \
+        $(Dim_ANT16) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_ANT16) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)
+
+Ant-16_iterbeta : $(Dim_ANT16) $(mod_dim_communs) \
+        $(toy_recul) \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_ANT16) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop_avec_iterbeta.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+
+        $(LK) -o ../bin/Ant-16_iterbeta \
+        $(Dim_ANT16) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_ANT16) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop_avec_iterbeta.o \
+        $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)
+
 Ant-15 : $(Dim_ANT15-LBq) $(mod_dim_communs) \
         $(toy_recul) \