Changeset 35 for branches

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/Ant40_files/bmelt-ant-regions-oce_mod.f90 (copied) (copied from trunk/SOURCES/Ant40_files/bmelt-ant-regions-oce_mod.f90)
• SOURCES/Ant40_files/lect-anteis_mod.f90 (modified) (2 diffs)
• SOURCES/Ant40_files/module_choix-antar40-0.4.f90 (modified) (2 diffs)
• SOURCES/Fichiers-parametres/anteis1_LISTE-VAR-NETCDF.dat (modified) (1 diff)
• SOURCES/Fichiers-parametres/greeneem15_LISTE-VAR-NETCDF.dat (modified) (1 diff)
• SOURCES/Fichiers-parametres/hemin15_LISTE-VAR-NETCDF.dat (modified) (1 diff)
• SOURCES/Fichiers-parametres/hemin40_LISTE-VAR-NETCDF.dat (modified) (1 diff)
• SOURCES/GrIce2sea_files/climat_GrIce2sea_years_mod.f90 (modified) (6 diffs)
• SOURCES/Makefile.grisli.inc (modified) (2 diffs)
• SOURCES/Netcdf-routines/Description_Variables.dat (modified) (1 diff)
• SOURCES/dragging_jorge_mod.f90 (copied) (copied from trunk/SOURCES/dragging_jorge_mod.f90)
• SOURCES/initial-0.3.f90 (modified) (1 diff)
• SOURCES/lect-eis.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/Ant40_files/lect-anteis_mod.f90

@@ -115 +115 @@
 !    endwhere
 
+
+    where (BSOC(:,:).LT.-9999.)
+       BSOC(:,:)=-9999.
+    endwhere
+
     sealevel0=0.  ! voir a passer dans le fichier parametre
     S0(:,:)=max(S0(:,:),sealevel0)   ! pour etre au niveau des mers : ATTENTION si SEALEV <0
@@ -231 +236 @@
     open(88,file=ghf_fich)
 
-    write(num_rep_42,*) 'flux geothermique Shapiro : ', TRIM(DIRNAMEINP)//'ijphi-40km-ant.dat'
-
-    do k=1,nx*ny
-       read(88,*) i,j,ghf(i,j)
-    end do
-    close(88)
+!    write(num_rep_42,*) 'flux geothermique Shapiro : ', TRIM(DIRNAMEINP)//'ijphi-40km-ant.dat'
+!    do k=1,nx*ny
+!       read(88,*) i,j,ghf(i,j)
+!    end do
+!    close(88)
+
+    call lect_input(1,'ghf',1,ghf,ghf_fich,file_ncdf)    ! socle
+
+
 
     ! pour passer les flux des mW/m2 au J/m2/an      

branches/iLoveclim/SOURCES/Ant40_files/module_choix-antar40-0.4.f90

@@ -45 +45 @@
 
 !--------------Lecture climat forcage---------------
-!use climat_forcage_mois_mod ! forcage mensuel GCM 1 Snapshot Fev 2015
-use climat_perturb_mod   ! climat perturbe a reverifier Dec 2015
+use climat_forcage_mois_mod ! forcage mensuel GCM 1 Snapshot Fev 2015
+!use climat_perturb_mod   ! climat perturbe a reverifier Dec 2015
+!use climat_Grice2sea_years_mod  ! climat force par fichier SMB directement (grice2sea)
 
 !use climat_forcage_mod
@@ -105 +106 @@
 
 !--------------Fusion basale------------------------
-use bmelt_ant_regions ! pour l'Antarctique avec régions
+!use bmelt_ant_regions ! pour l'Antarctique avec régions
+use bmelt_ant_regions_oce ! pour Ant region et temp ocean
 !use bmelt_nor_regions ! pour le nord avec régions
 !use bmelt_nor_depth   ! pour le nord avec profondeur d'eau

branches/iLoveclim/SOURCES/Fichiers-parametres/anteis1_LISTE-VAR-NETCDF.dat

@@ -144 +144 @@
 1       1       1                       
 -----------------------------------------------------------
+ghf
+23
+1       1      -1
+-----------------------------------------------------------
 phid            
 24      

branches/iLoveclim/SOURCES/Fichiers-parametres/greeneem15_LISTE-VAR-NETCDF.dat

@@ -144 +144 @@
 1       1       1                       
 -----------------------------------------------------------
+ghf
+23
+1       1      -1
+-----------------------------------------------------------
 phid            
 24      

branches/iLoveclim/SOURCES/Fichiers-parametres/hemin15_LISTE-VAR-NETCDF.dat

@@ -144 +144 @@
 1       1       1                       
 -----------------------------------------------------------
+ghf
+23
+1       1      -1
+-----------------------------------------------------------
 phid            
 24      

branches/iLoveclim/SOURCES/Fichiers-parametres/hemin40_LISTE-VAR-NETCDF.dat

@@ -144 +144 @@
 1       1       1                       
 -----------------------------------------------------------
+ghf
+23
+1       1      -1
+-----------------------------------------------------------
 phid            
 24      

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

branches/iLoveclim/SOURCES/Makefile.grisli.inc

@@ -214 +214 @@
         lect-anteis_mod.o \
         bmelt-ant-regions_mod.o \
+        bmelt-ant-regions-oce_mod.o \
         fake-routines-ant_mod.o module_choix-antar40-0.4.o \
         track_ant40_mod.o
@@ -515 +516 @@
 
 bmelt-ant-regions_mod.o : Ant40_files/bmelt-ant-regions_mod.f90
-        $(FT)  Ant40_files/bmelt-ant-regions_mod.f90
+        $(FT) Ant40_files/bmelt-ant-regions_mod.f90
+
+bmelt-ant-regions-oce_mod.o : Ant40_files/bmelt-ant-regions-oce_mod.f90
+        $(FT) Ant40_files/bmelt-ant-regions-oce_mod.f90
 
 bmelt-nor-regions_mod.o : Heminord_files/bmelt-nor-regions_mod.f90

branches/iLoveclim/SOURCES/Netcdf-routines/Description_Variables.dat

@@ -225 +225 @@
 "celsius"       
 "Basal temperature "
+------------------------------------------------------
+"xxx"
+23      "ghf"  1
+"o"
+"geothermal_heat_flux"
+"geothermal_heat_flux"
+"m.w/m²"
+"Geothermal heat flux"
 ------------------------------------------------------
 "xxx"

branches/iLoveclim/SOURCES/initial-0.3.f90

@@ -73 +73 @@
   endif
 
-!cdc call sortie_ncdf_cat
+  call sortie_ncdf_cat
 
   ! calcul de Hmx et Hmy -> shift=-1, dim=1 -> H(i-1,j)

branches/iLoveclim/SOURCES/lect-eis.f90

@@ -18 +18 @@
 
   implicit none
-  character(len=17)  :: DIRNAMEINP
+  character(len=20)  :: DIRNAMEINP
   integer nx,ny,i,j,kdum
   real data(nx,ny)