Changeset 89 for branches

Timestamp:

10/05/16 08:50:38 (8 years ago)

Author:

aquiquet

Message:

minor GRISLI-iLOVECLIM compatibility corrections + ifort as default compiler

Location:

branches/iLoveclim/SOURCES

Files:

• 3D-physique-gen_mod.f90 (modified) (1 diff)
• Hemin40_files/bmelt-hemin40-depth_mod.f90 (modified) (1 diff)
• Makefile (modified) (1 diff)
• climat_coupl_atm_mod.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/3D-physique-gen_mod.f90

@@ -341 +341 @@
   real,dimension(nx,ny),target :: TJULY        !< Ground air temperature July
   real,dimension(nx,ny),target :: TANN         !< Ground air temperature annual
-  real,dimension(nx,ny,12),target :: Tmois     !< Ground air temperature monthly
-  real,dimension(nx,ny,12),target :: Pmois     !< Liquid precipitation  monthly
+  real,dimension(nx,ny,12) :: Tmois     !< Ground air temperature monthly
+  real,dimension(nx,ny,12) :: Pmois     !< Liquid precipitation  monthly
   real,dimension(nx,ny) :: TSHELF       !< temperature des shelfs pour viscosite
   real,dimension(nx,ny) :: TJ0          !< initial air temperature at sea level July

branches/iLoveclim/SOURCES/Hemin40_files/bmelt-hemin40-depth_mod.f90

@@ -104 +104 @@
  
       bsupshelf=.2
-      write(32,*)
 
 

branches/iLoveclim/SOURCES/Makefile

@@ -11 +11 @@
 
 # Choice for compiler (ifort = 1, gfortran = 0)
-ifort := 0
+ifort := 1
 
 # Choice for librairies (mkl_c = 1 = MKL,  = 0 = BLAS)
 #Â NOTA: mkl_c = 1 with ifort = 0 ignores the MKL and uses BLAS anyhow
-mkl_c := 0
+mkl_c := 1
 
 ifeq ($(ifort),1)

branches/iLoveclim/SOURCES/climat_coupl_atm_mod.f90

@@ -200 +200 @@
 coefbmshelf=min(coefbmshelf,maxcoefbmelt)
 
-!**********************************************************************
-! transmission des champs climatiques de iLOVECLIM via pointeurs Tann, Acc, Tjuly, Tmois, Pmois, Bm
-! Temperatures Annuels, jja et accumulation de neige
-!**********************************************************************
-! calcul de l'accumulation si on utilise les precips liquides :
-if (.not.snow) then
-!    if (annual.eq.1) then ! la version avec Tann et Tjuly est obsolete !
-!       call accum_annual ! calcul acc a partir de Tann et Tjuly
-!    else if (annual.eq.2) then
-      acc(:,:)=sum(Pmois,dim=3,mask=Tmois < psolid) ! /12.
-      acc(:,:)=acc(:,:)*1000./ro ! m de glace/an
-!    endif
-endif
-    Tann(:,:)=SUM(Tmois(:,:,:),dim=3)/12.
-    Tjuly(:,:)=Tmois(:,:,7)
+!~ !**********************************************************************
+!~ ! transmission des champs climatiques de iLOVECLIM via pointeurs Tann, Acc, Tjuly, Tmois, Pmois, Bm
+!~ ! Temperatures Annuels, jja et accumulation de neige
+!~ !**********************************************************************
+!~ ! calcul de l'accumulation si on utilise les precips liquides :
+!~ if (.not.snow) then
+!~ !    if (annual.eq.1) then ! la version avec Tann et Tjuly est obsolete !
+!~ !       call accum_annual ! calcul acc a partir de Tann et Tjuly
+!~ !    else if (annual.eq.2) then
+!~       acc(:,:)=sum(Pmois,dim=3,mask=Tmois < psolid) ! /12.
+!~       acc(:,:)=acc(:,:)*1000./ro ! m de glace/an
+!~ !    endif
+!~ endif
+!~     Tann(:,:)=SUM(Tmois(:,:,:),dim=3)/12.
+!~     Tjuly(:,:)=Tmois(:,:,7)
 
 seasea=sealevel        ! pour les sorties