Changeset 36 for branches

Timestamp:

01/20/16 10:01:25 (8 years ago)

Author:

roche

Message:

Tweaked the makefile and the main for library generation with gfortran.

Location:

branches/iLoveclim/SOURCES

Files:

• Makefile.grisli-gfortran.inc (modified) (4 diffs)
• main3D-0.4-40km.f90 (modified) (2 diffs)

branches/iLoveclim/SOURCES/Makefile.grisli-gfortran.inc

@@ -41 +41 @@
 
 # module de forcage climatique C. Dumas
+#Â Modif dmr 2016-01-20
 mod_clim_tof = climat_forcage_mois_mod.o climat-forcage-insolation_mod_oneway.o \
         climat-forcage-insolation_mod.o climat_GrIce2sea_years_mod.o \
         climat-perturb_mod-0.4.o \
-        ablation_mod.o no_ablation_mod.o 
+        ablation_mod.o no_ablation_mod.o\
+        climat_coupl_atm_mod.o
 
 # methode forcage basee sur des snapshots climats
@@ -617 +619 @@
 ablation_mod.o : ablation_mod.f90
         $(FT) ablation_mod.f90
-
+#Â Module climat pour iLOVECLIM -- dmr 2016-01-20
+climat_coupl_atm_mod.o : climat_coupl_atm_mod.f90
+        $(FT) climat_coupl_atm_mod.f90
 
 ##### anciens modules
@@ -1642 +1646 @@
         $(routine_elliptiques) $(NCDF_LIB) $(Liste_BLAS)
 
+        ar -cvr libgrisli.a $(Dim_hemin40) $(mod_dim_communs) \
+        $(toy_recul)  \
+        $(mod_communs) \
+        $(mod_clim_tof) \
+        $(mod_no_tracers) \
+        $(mod_ell) $(Liste_hemin40) \
+        $(diagnoshelf) \
+        $(Liste_Netcdf) \
+        $(routines_communes) steps_time_loop.o \
+        $(routine_elliptiques) \
+        $(Liste_BLAS) *.mod
+
 Hemin-15 : $(Dim_hemin15) $(mod_dim_communs) \
         $(toy_recul)  \
@@ -1796 +1812 @@
 
 clean   :
-        rm -f *.o *.mod *~  */*~ BLAS/*.o
+        rm -f *.o *.mod *~  */*~ BLAS/*.o LAPACK/*.o libgrisli.a
 
 

branches/iLoveclim/SOURCES/main3D-0.4-40km.f90

@@ -100 +100 @@
 !<
 
-subroutine ISM_NORD
+program main3D
+
+! dmr --- void, just added for compilation
+
+end program main3D
+
+
+subroutine ISM_NORD(timCplGRISyr)
 
   USE module3D_phy
@@ -113 +120 @@
 !  use track_debug 
 !dcdmr --- GRISLI - LOVECLIM
-  use input_timerCplGRIS
+!  use input_timerCplGRIS
 !dcdmr --- GRISLI - LOVECLIM
 
   implicit none
 
+  integer, intent(in) :: timCplGRISyr
 
 !dcdmr --- GRISLI - LOVECLIM