Changeset 151

Timestamp:

10/30/17 17:00:49 (6 years ago)

Author:

aquiquet

Message:

Grisli-iloveclim branch merged to trunk at revision 150 + bug correction for surface temperature in climat_coupl

Location:

branches/iLoveclim/SOURCES

Files:

• climat_coupl_atm_mod.f90 (modified) (2 diffs)
• main3D-0.4-40km.f90 (modified) (1 diff)
• steps_time_loop.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/climat_coupl_atm_mod.f90

@@ -7 +7 @@
 ! C. Dumas 02/2015
 
-USE module3D_phy,only:nx,ny,sealevel,seasea,Tann,Tjuly,Tmois,Pmois,acc,coefbmshelf,ro,num_param,num_rep_42,dirforcage,num_forc,time
+USE module3D_phy,only:nx,ny,sealevel,seasea,Tann,Tjuly,Ts,Tmois,Pmois,acc,coefbmshelf,ro,num_param,num_rep_42,dirforcage,num_forc,time
 !use netcdf
 !use io_netcdf_grisli
@@ -218 +218 @@
 seasea=sealevel        ! pour les sorties
 
+! afq 30 oct 2017, we need to transfer Tann to Ts:
+  Ts(:,:)=Tann(:,:)
+
 END subroutine forclim
 

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

@@ -340 +340 @@
 11115 continue
 
+     call  bmeltshelf ! afq -- 
+
      !       ========================================================
      call flow_general

branches/iLoveclim/SOURCES/steps_time_loop.f90

@@ -303 +303 @@
      ! update values in the structures Geom_g, Temperature_g, ...
 
-     calc_temp:     if ((nt.gt.2).and.(geoplace(1:5).ne.'mism3')) then
+! afq     calc_temp:     if ((nt.gt.2).and.(geoplace(1:5).ne.'mism3')) then
+     calc_temp:     if (geoplace(1:5).ne.'mism3') then
         if (itracebug.eq.1)  call tracebug('avant appel icetemp')
         call icetemp