Changeset 356

Timestamp:

05/19/22 09:33:09 (2 years ago)

Author:

aquiquet

Message:

Adding new geometries: the Alps at 1 and 2km

Location:

trunk

Files:

• INPUT/ALPS1 (added)
• INPUT/ALPS1/SHB_SRTM_alps1.nc (added)
• INPUT/ALPS1/Snapshots-GCM (added)
• INPUT/ALPS1/Snapshots-GCM/climato_monthly_t2m_precip_orog_ERA5-1979-2008-alps1_forclim.nc (added)
• INPUT/ALPS1/Snapshots-GCM/climato_monthly_t2m_precip_orog_ERA5-1979-2008-alps2_forclim.nc (added)
• INPUT/ALPS1/climato_monthly_t2m_precip_orog_ERA5-1979-2008-alps1.nc (added)
• INPUT/ALPS1/coord-alps1.dat (added)
• INPUT/ALPS1/lonlat_alps1.nc (added)
• INPUT/ALPS2 (added)
• INPUT/ALPS2/SHB_SRTM_alps2.nc (added)
• INPUT/ALPS2/Snapshots-GCM (added)
• INPUT/ALPS2/Snapshots-GCM/climato_monthly_t2m_precip_orog_ERA5-1979-2008-alps2_forclim.nc (added)
• INPUT/ALPS2/climato_monthly_t2m_precip_orog_ERA5-1979-2008-alps2.nc (added)
• INPUT/ALPS2/coord-alps2.dat (added)
• INPUT/ALPS2/lonlat_alps2.nc (added)
• Param/alps2_param_list.dat (added)
• SOURCES/Alps_files (added)
• SOURCES/Alps_files/fake-routines-alps_mod.f90 (added)
• SOURCES/Alps_files/geography-alps1_mod.f90 (added)
• SOURCES/Alps_files/geography-alps2_mod.f90 (added)
• SOURCES/Alps_files/lect-alps_mod.f90 (added)
• SOURCES/Alps_files/module_choix-alps.f90 (added)
• SOURCES/Alps_files/output_alps_mod.f90 (added)
• SOURCES/Alps_files/paradim-alps1_mod.f90 (added)
• SOURCES/Alps_files/paradim-alps2_mod.f90 (added)
• SOURCES/Alps_files/track_alps_mod.f90 (added)
• SOURCES/Makefile.grisli.inc (modified) (4 diffs)

trunk/SOURCES/Makefile.grisli.inc

@@ -331 +331 @@
         module_choix-laurentide.o track_laurentide_mod.o
 
+Liste_alps = output_alps_mod.o \
+        lect-alps_mod.o \
+        bmelt-hemin40-depth_mod.o \
+        fake-routines-alps_mod.o \
+        dragging_prescr_beta_mod.o \
+        beta_iter_vitbil_mod.o \
+        dragging_beta_iter_vitbil_mod.o \
+        module_choix-alps.o track_alps_mod.o
+
 Liste_greenmint40 = output_green_mod-0.4.o lect-clim-act-greenmint_mod.o \
   lect-greenmint_mod.o massb_perturb_Tparam_green.o \
@@ -400 +409 @@
 
 Dim_laure16 = paradim-laure16_mod.o geography-laure16_mod.o
+
+Dim_alps1 = paradim-alps1_mod.o geography-alps1_mod.o
+
+Dim_alps2 = paradim-alps2_mod.o geography-alps2_mod.o
 
 Dim_greenmint40 = paradim-greenmint40_mod.o geography-greenmint40_mod.o
@@ -493 +506 @@
         $(FT) $(NCDF_INC) -c Laure16_files/$*.f90
         
+# Alps_files :
+%.o: Alps_files/%.f90
+        $(FT) $(NCDF_INC) -c Alps_files/$*.f90
+        
 # ANT15-LBq_files
 %.o: ANT15-LBq_files/%.f90
@@ -895 +912 @@
         $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)     
 
+Alps-2 : $(Dim_alps2) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof) \
+        $(mod_tracers) \
+        $(mod_ell) $(Liste_alps) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+
+        $(LK) -o  ../bin/Alps-2 \
+        $(Dim_alps2) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof) \
+        $(mod_tracers) \
+        $(mod_ell) $(Liste_alps) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)     
+
+Alps-1 : $(Dim_alps1) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof) \
+        $(mod_tracers) \
+        $(mod_ell) $(Liste_alps) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+
+        $(LK) -o  ../bin/Alps-1 \
+        $(Dim_alps1) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof) \
+        $(mod_tracers) \
+        $(mod_ell) $(Liste_alps) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)     
+
 Greeneem15 : $(Dim_greeneem15) $(mod_dim_communs) \
         $(toy_recul)  \