Changeset 268 for trunk

Timestamp:

06/21/19 17:16:38 (5 years ago)

Author:

dumas

Message:

New calving module for ISMIP ice shelf fracturation simulations

Location:

trunk/SOURCES

Files:

• Makefile.grisli.inc (modified) (4 diffs)
• calving_frange_ISMIP_fracture.f90 (added)

trunk/SOURCES/Makefile.grisli.inc

@@ -76 +76 @@
         dragging_param_beta_mod.o dragging_param_beta_sedim_mod.o \
         dragging_param_beta_nolin_mod.o bilan_eau_mod.o \
-        calving_frange.o calving_frange_abuk.o no_calving.o no_rsl.o imposed_regions_rsl.o \
+        calving_frange.o calving_frange_abuk.o calving_frange_ISMIP_fracture.o \
+        no_calving.o no_rsl.o imposed_regions_rsl.o \
         out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \
         furst_schoof_mod.o bilan_flux_output_mod.o \
@@ -91 +92 @@
         iso_declar_mod-0.3.o isostasie_mod-0.3.o noisostasie_mod-0.3.o \
         deformation_mod_2lois.o deformation_mod_2lois_isotherme.o      \
+        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  \
@@ -96 +98 @@
         dragging_hwat_sedim_mod.o dragging_neff_slope_mod.o \
         dragging_param_beta_mod.o \
-        calving_frange.o calving_frange_abuk.o no_calving.o no_rsl.o imposed_regions_rsl.o \
+        calving_frange.o calving_frange_abuk.o calving_frange_ISMIP_fracture.o \
+        no_calving.o no_rsl.o imposed_regions_rsl.o \
         out_profile_mod.o printtable_mod.o mix-SIA-L1_mod.o \
         furst_schoof_mod.o bilan_flux_output_mod.o \
@@ -946 +949 @@
         $(diagnoshelf) $(Liste_Netcdf) $(routines_communes) $(routine_elliptiques) 
 
-        $(LK) -o ../bin/Greenmint40 $(Dim_greenmint40) $(mod_dim_communs) $(mod_communs) \
-        $(mod_ell) $(Liste_greenmint40) \
+        $(mod_ell) $(Liste_greenmint40) \
         $(diagnoshelf) $(Liste_Netcdf) $(routines_communes) $(routine_elliptiques) \
         $(NCDF_LIB)  $(MKL_LIB)