Changeset 170 for trunk/SOURCES

Timestamp:

12/13/17 18:24:44 (6 years ago)

Author:

dumas

Message:

Makefile update for spinup compatibility | For iterbeta spinup, use dragging_beta_iter_vitbil_mod in module_choix

File:

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

trunk/SOURCES/Makefile.grisli.inc

@@ -71 +71 @@
         deformation_mod_2lois.o deformation_mod_2lois_isotherme.o     \
         sliding_Bindshadler_mod.o no_sliding.o                      \
-        dragging_hwatermax_0.2_mod.o dragging_calc_beta_mod.o  \
+        fake_beta_iter_vitbil_mod.o \
+        dragging_hwatermax_0.2_mod.o \
         dragging_hwat-contigu_mod.o dragging_hwat_contmaj_mod.o \
         dragging_hwat_sedim_mod.o dragging_neff_slope_mod.o \
@@ -169 +170 @@
 # Liste_GrIce2sea
 Liste_GrIce2sea =  lect_GrIce2sea_gen_nc.o  \
-        output_Grice2sea_mod.o  fake-routines_Grice2sea_mod.o \
-        dragging_prescr_beta_mod.o beta_iter_vitbil_mod.o module_choix_GrIce2sea.o
+  output_Grice2sea_mod.o \
+  fake-routines_Grice2sea_mod.o \
+        dragging_prescr_beta_mod.o \
+        beta_iter_vitbil_mod.o \
+        dragging_beta_iter_vitbil_mod.o \
+        module_choix_GrIce2sea.o
         
 
@@ -196 +201 @@
                 lect-anteis_mod.o \
                 bmelt-ant-regions_mod.o \
-                bmelt-ant-regions-initmip_mod.o \
+    bmelt-ant-regions-initmip_mod.o \
                 fake-routines-ant_mod.o \
                 beta_iter_vitbil_mod.o \
+                dragging_beta_iter_vitbil_mod.o \
                 module_choix-ant16km.o \
                 massb-ant_perturb_Tparam.o \
@@ -211 +217 @@
                 fake-routines-ant_mod.o \
                 beta_iter_vitbil_mod.o \
+                dragging_beta_iter_vitbil_mod.o \
                 module_choix_antar15_LBq.o \
                 massb-ant_perturb_Tparam.o \
@@ -228 +235 @@
         bmelt-hemin40-regions_mod.o bmelt-hemin40-depth_mod.o \
         fake-routines-hemin40_mod.o \
-        dragging_prescr_beta_mod.o beta_iter_vitbil_mod.o \
+        dragging_prescr_beta_mod.o \
+        beta_iter_vitbil_mod.o \
+        dragging_beta_iter_vitbil_mod.o \
         module_choix-hemin40-0.4.o track_hemin40_mod.o
 
@@ -241 +250 @@
         dragging_neem_mod.o \
         fake-routines-greeneem_mod.o \
-        dragging_prescr_beta_mod.o beta_iter_vitbil_mod.o \
+        dragging_prescr_beta_mod.o \
+        beta_iter_vitbil_mod.o \
+        dragging_beta_iter_vitbil_mod.o \
         module_choix-greeneem.o \
         track_greeneem_mod.o 
@@ -251 +262 @@
         bmelt-ant-regions-initmip_mod.o \
         fake-routines-ant_mod.o \
-        dragging_prescr_beta_mod.o beta_iter_vitbil_mod.o \
+        dragging_prescr_beta_mod.o \
+        beta_iter_vitbil_mod.o \
+        dragging_beta_iter_vitbil_mod.o \
         module_choix-antar40-0.4.o \
         track_ant40_mod.o