Changeset 254 for branches/iLoveclim/SOURCES

Timestamp:

04/25/19 17:30:50 (5 years ago)

Author:

aquiquet

Message:

Grisli-iloveclim branch merged to trunk at revision 253 + some corrections for water conservation

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/Fichiers-parametres/hemin40_param_list.dat (modified) (5 diffs)
• SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90 (modified) (1 diff)
• SOURCES/Hemin40_files/output_hemin40_mod.f90 (modified) (1 diff)
• SOURCES/Makefile.grisli.inc (modified) (2 diffs)
• SOURCES/bilan_eau_mod.f90 (modified) (2 diffs)
• SOURCES/bmelt-ismip6-param_mod.f90 (copied) (copied from trunk/SOURCES/bmelt-ismip6-param_mod.f90)
• SOURCES/climat_coupl_atm_mod.f90 (modified) (2 diffs)
• SOURCES/runparam_mod.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/Fichiers-parametres/hemin40_param_list.dat

@@ -81 +81 @@
  hmax_till      =    20.00000    
  poro_till      =   0.5000000    
- kond0          =   0.000159253594556078   !10.000000E-05
+ kond0          =   0.000193342957286257   !10.000000E-05
 /
 ! hmax_till (m) : epaisseur max du sediment 
@@ -111 +111 @@
 exposant_1       = 3.
 temp_trans_1     = -6.5
-enhanc_fact_1    = 1.98278645427898          ! Grice2sea 3.         
+enhanc_fact_1    = 1.82595387172575          ! Grice2sea 3.         
 coef_cold_1      = 1.660E-16
 Q_cold_1         = 7.820E+04
@@ -165 +165 @@
 ! gr_select  = ',gr_select
 ! gr_select = 1 : Tsai , 2 : Schoof'
+!___________________________________________________________
+&lapse_month                                  !  module climat_forcage_mois_mod'
+
+lect_lapse      = 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0  ! 12 mois
+/
+! laspe rates janvier -> decembre en deg/km
 !___________________________________________________________
 &clim_coupl_atm                                ! nom du bloc
@@ -323 +329 @@
 &drag_param_beta                              ! drag_beta_param_mod
 
-beta_slope     = 0.00104788639898179     !1.e-3
+beta_slope     = 0.001584297807517     !1.e-3
 beta_expo      = 1.      !1.0
 betamax    = 5.e5     ! maximum value of beta
@@ -333 +339 @@
 &drag_param_beta_sedim                       ! drag_beta_param_sedim_mod
 
-beta_slope    = 0.00104788639898179    !1.e-3
+beta_slope    = 0.001584297807517    !1.e-3
 beta_expo     = 1.     !1.0
 betamax    = 5.e5     ! maximum value of beta

branches/iLoveclim/SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90

@@ -65 +65 @@
 ! pas de differences locales de niveau marin
 use no_rsl
+!use imposed_regions_rsl
 
 ! suivi des traceurs ou pas ?

branches/iLoveclim/SOURCES/Hemin40_files/output_hemin40_mod.f90

@@ -185 +185 @@
 ! afq for CONSEAU      REAL, dimension(nx,ny) :: delta_H_dtt
 
-      ilc_units = dx*dy/DICE
+      ilc_units = -dx*dy/DICE !afq minus sign because ocean expect a positive flux for melt water
 
 !     open(unit=4145,file='reg_output_nord.dat')

branches/iLoveclim/SOURCES/Makefile.grisli.inc

@@ -196 +196 @@
                 dragging_prescr_beta_mod.o \
                 dragging_prescr_beta_nolin_mod.o \
-                lect-Ant_gen2010_dat.o \
                 lect-anteis_mod.o \
                 bmelt-ant-regions_mod.o \
                 bmelt-ant-regions-initmip_mod.o \
                 bmelt-ant-regions-larmip_mod.o \
+                bmelt-ismip6-param_mod.o \
                 fake-routines-ant_mod.o \
                 beta_iter_vitbil_mod.o \
@@ -211 +211 @@
                 dragging_prescr_beta_mod.o \
                 dragging_prescr_beta_nolin_mod.o \
-                lect-Ant_gen2010_dat.o \
                 lect-anteis_mod.o \
                 bmelt-ant-regions_mod.o \

branches/iLoveclim/SOURCES/bilan_eau_mod.f90

@@ -47 +47 @@
         diff_H=0.
         sum_H_old = sum(H(2:nx-1,2:ny-1),mask=ice(2:nx-1,2:ny-1)==1)
+        H_beau_old(:,:)=H(:,:)
         tot_water(:,:)=0.
         bm_dt(:,:)=0.
@@ -135 +136 @@
 
 
-if (isynchro.eq.1) then
+!afq -- if (isynchro.eq.1) then
+if ((isynchro.eq.1).or.(nt.eq.1)) then
+
 ! on raisonne en bilan annuel pour simplifier :
 !~      where (ice(2:nx-1,2:ny-1).eq.1)

branches/iLoveclim/SOURCES/climat_coupl_atm_mod.f90

@@ -7 +7 @@
 ! C. Dumas 02/2015
 
-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 module3D_phy,only:nx,ny,sealevel,sealevel_2D,Tann,Tjuly,Ts,Tmois,Pmois,acc,coefbmshelf,ro,num_param,num_rep_42,dirforcage,num_forc,time
 !use netcdf
 !use io_netcdf_grisli
@@ -216 +216 @@
 !~     Tjuly(:,:)=Tmois(:,:,7)
 
-seasea=sealevel        ! pour les sorties
+sealevel_2D(:,:)=sealevel
 
 ! afq 30 oct 2017, we need to transfer Tann to Ts:

branches/iLoveclim/SOURCES/runparam_mod.f90

@@ -19 +19 @@
 real ::  TEND                         !< temps fin
 real ::  dttest                       !< plus petit pas de temps=dtmin, sert dans plein de tests
-real ::  seasea                       !< niveau des mers (sert pour les sorties ...)
 character(len=40)  :: DIRNAMEOUT      !< declaration du dir de sortie, pour les resultats
 character(len=8)   :: RUNNAME         !<