Changeset 262 for trunk

Timestamp:

06/18/19 11:22:46 (5 years ago)

Author:

aquiquet

Message:

Geometry addition for ISMIP6 Greenland: Grismip6, 5km

Location:

trunk

Files:

• INPUT/GRISMIP6 (added)
• INPUT/GRISMIP6/BedMachineGreenland-2017-09-20_grismip6.nc (added)
• INPUT/GRISMIP6/MARv3.9-yearly-MIROC5-rcp85-ltm1995-2014_grismip6.nc (added)
• INPUT/GRISMIP6/beta-GISCAM23_grismip6.nc (added)
• INPUT/GRISMIP6/ghf_shapiro-cism_grismip6.nc (added)
• INPUT/GRISMIP6/long_ZBL_CISM_5km.dat (added)
• SOURCES/Fichiers-parametres/grismip_LISTE-VAR-NETCDF.dat (added)
• SOURCES/Fichiers-parametres/grismip_TEMPS-NETCDF.dat (added)
• SOURCES/Grismip6_files (added)
• SOURCES/Grismip6_files/geography-grismip6.f90 (added)
• SOURCES/Grismip6_files/lect-grismip6_mod.f90 (added)
• SOURCES/Grismip6_files/module_choix-grismip6.f90 (added)
• SOURCES/Grismip6_files/paradim-grismip6_mod.f90 (added)
• SOURCES/Makefile.grisli.inc (modified) (8 diffs)

trunk/SOURCES/Makefile.grisli.inc

@@ -178 +178 @@
         module_choix_GrIce2sea.o
         
+Liste_grismip6 = output_anta40_mod-0.4.o \
+                dragging_prescr_beta_mod.o \
+                dragging_prescr_beta_nolin_mod.o \
+                lect-grismip6_mod.o \
+                fake-routines-ant_mod.o \
+                beta_iter_vitbil_mod.o \
+                dragging_beta_iter_vitbil_mod.o \
+                module_choix-grismip6.o \
+                track_ant40_mod.o
 
 Liste_heminord = paradim-nord40_mod.o  output_nord_mod-0.4.o \
@@ -340 +349 @@
 Dim_GrIce2sea = paradim-GrIce2sea-cut_Tamsin.o geography-GrIce2sea.o
 
+Dim_grismip6 = paradim-grismip6_mod.o geography-grismip6.o
+
 Dim_ANT16 = paradim-ant16_mod.o geography-ant16.o
 
@@ -425 +436 @@
 %.o: GrIce2sea_files/%.f90
         $(FT) $(NCDF_INC) -c GrIce2sea_files/$*.f90
+
+# Grismip6_files
+%.o: Grismip6_files/%.f90
+        $(FT) $(NCDF_INC) -c Grismip6_files/$*.f90
         
 # Ant20_files
@@ -602 +617 @@
 Grice2sea : $(Dim_GrIce2sea) $(mod_dim_communs)   \
         $(toy_recul)  \
-        $(mod_communs_RGL) \
+        $(mod_communs) \
         $(mod_clim_tof)  \
         $(mod_tracers) \
@@ -615 +630 @@
         $(Dim_GrIce2sea) $(mod_dim_communs)  \
         $(toy_recul)  \
-        $(mod_communs_RGL) \
+        $(mod_communs) \
         $(mod_clim_tof)  \
         $(mod_tracers) \
@@ -626 +641 @@
 Grice2sea_iterbeta : $(Dim_GrIce2sea) $(mod_dim_communs)   \
         $(toy_recul)  \
-        $(mod_communs_RGL) \
+        $(mod_communs) \
         $(mod_clim_tof)  \
         $(mod_tracers) \
@@ -639 +654 @@
         $(Dim_GrIce2sea) $(mod_dim_communs)  \
         $(toy_recul)  \
-        $(mod_communs_RGL) \
+        $(mod_communs) \
         $(mod_clim_tof)  \
         $(mod_tracers) \
@@ -646 +661 @@
         $(Liste_Netcdf) \
         $(routines_communes) steps_time_loop_avec_iterbeta.o \
+        $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)
+
+Grismip6 : $(Dim_grismip6) $(mod_dim_communs) \
+        $(toy_recul) \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_grismip6) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS)
+
+        $(LK) -o ../bin/Grismip6 \
+        $(Dim_grismip6) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof)  \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_grismip6) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
         $(routine_elliptiques) $(NCDF_LIB) $(MKL_LIB) $(Liste_BLAS)