Changeset 35 for branches/iLoveclim/SOURCES/GrIce2sea_files/climat_GrIce2sea_years_mod.f90

Timestamp:

01/19/16 17:01:36 (8 years ago)

Author:

dumas

Message:

Merge avec la r34 du trunk

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/GrIce2sea_files/climat_GrIce2sea_years_mod.f90 (modified) (6 diffs)

branches/iLoveclim/SOURCES/GrIce2sea_files/climat_GrIce2sea_years_mod.f90

@@ -16 +16 @@
 
 
-use module3d_phy,only: nx,ny,S,S0,H,Bsoc,acc,abl,BM,Tann,Tjuly,Ts,time,dt,num_param,num_rep_42,dirnameinp
+use module3d_phy,only: nx,ny,S,S0,H,Bsoc,acc,abl,BM,Tann,Tjuly,Ts,time,dt,num_param,num_rep_42,dirnameinp,coefbmshelf
 !use lect_climref_Ice2sea
 use netcdf
@@ -86 +86 @@
 
   namelist/clim_smb_T_gen/smb_file,coef_smb_unit,temp_annual_file
+! dmr --- the namelist should be at the header position (moved up from below)
+  namelist/clim_snap/nb_snap,time_depart_snaps,ecart_snap,file_smb_snap,massb_time
 
 428 format(A)
@@ -102 +104 @@
   smb_file  = trim(dirnameinp)//trim(smb_file)
 
-  call Read_Ncdf_var('z',smb_file,tab)
+  call Read_Ncdf_var('smb',smb_file,tab)
 
 !  call lect_input(3,'smb',1,bm,smb_file,trim(dirnameinp)//trim(runname)//'.nc')
@@ -130 +132 @@
   temp_annual_file = trim(dirnameinp)//trim(temp_annual_file)
 
-  call Read_Ncdf_var('z',temp_annual_file,tab)
+  call Read_Ncdf_var('Tann',temp_annual_file,tab)
   Tann(:,:)  = tab(:,:)
 !  call lect_input(3,'Tann',1,Tann,temp_annual_file,trim(dirnameinp)//trim(runname)//'.nc')
@@ -145 +147 @@
 !lecture namelist 
 
-  namelist/clim_snap/nb_snap,time_depart_snaps,ecart_snap,file_smb_snap,massb_time
+! dmr --- namelist should be in the header part in the standard ...
+!  namelist/clim_snap/nb_snap,time_depart_snaps,ecart_snap,file_smb_snap,massb_time
 
   rewind(num_param)        ! pour revenir au debut du fichier param_list.dat
@@ -281 +284 @@
      call init_grad_smb
   endif
+! coefbmshelf coefficient pour la fusion basale sous les ice shelves
+! ici pas d'evolution temporelle donc coefbmshelf est fixe
+  coefbmshelf=1.
 
   return