Changeset 333

Timestamp:

01/29/21 14:08:30 (3 years ago)

Author:

aquiquet

Message:

Addition of a non-linear Coulomb friction law + iterations on velocity computation for convergence / for m=1 gives results very similar to the standard linear law in dragging_param_beta

Location:

trunk/SOURCES

Files:

• 3D-physique-gen_mod.f90 (modified) (2 diffs)
• Draggings_modules/dragging_beta_iter_vitbil_mod.f90 (modified) (1 diff)
• Draggings_modules/dragging_prescr_beta_buoyency_mod.f90 (modified) (1 diff)
• Draggings_modules/dragging_prescr_beta_mod.f90 (modified) (1 diff)
• Draggings_modules/dragging_prescr_beta_nolin_mod.f90 (modified) (1 diff)
• Draggings_modules/dragging_prescr_beta_perturb_mod.f90 (modified) (1 diff)
• Makefile.grisli.inc (modified) (2 diffs)
• New-remplimat/diagno-L2_mod.f90 (modified) (3 diffs)
• dragging_coulomb_friction_mod.f90 (added)
• dragging_param_beta_mod.f90 (modified) (1 diff)
• dragging_param_beta_sedim_mod.f90 (modified) (1 diff)

trunk/SOURCES/3D-physique-gen_mod.f90

@@ -65 +65 @@
   integer ::  ITEMP                     !< 
   integer ::  ITBOOST                   !< 
+  integer ::  niter_nolin               !< number of velocity iterations for non-linear dragging laws
   ! integer ::  NBLIG                   ! ??????????????????????????????
   integer ::  ndebug                    !< pour faire des sorties de debug a plusieurs pas de temps
@@ -88 +89 @@
   real :: coefbmshelf                   !< coef permettant de faire varier la fusion basale :
   !< 3 dimensions pour les 3 bassins oceaniques de Climber???
-
-  real ::  cf                           !< coefficient loi frottement
-  ! real ::  CSI                          ! proportion of melted water that can refreeze *)
-  ! real ::  Cice                         ! melting factors for ice 
-  ! real ::  Csnow                        ! melting factors for snow 
 
   real ::  CL                           !< specific latent heat of fusion of ice J/Kg  

trunk/SOURCES/Draggings_modules/dragging_beta_iter_vitbil_mod.f90

@@ -178 +178 @@
 
     call init_beta_iter_vitbil
+
+    niter_nolin = 1
+
     return
 

trunk/SOURCES/Draggings_modules/dragging_prescr_beta_buoyency_mod.f90

@@ -184 +184 @@
 
     call gzm_beta_prescr
+
+    niter_nolin = 1
 
     return

trunk/SOURCES/Draggings_modules/dragging_prescr_beta_mod.f90

@@ -195 +195 @@
 
 !    call make_gaussienne(n_g,sigma_beta,M_gauss)
+
+    niter_nolin = 1
 
     return

trunk/SOURCES/Draggings_modules/dragging_prescr_beta_nolin_mod.f90

@@ -265 +265 @@
 
     call gzm_beta_prescr
+
+    niter_nolin = 1
 
     return

trunk/SOURCES/Draggings_modules/dragging_prescr_beta_perturb_mod.f90

@@ -220 +220 @@
 
 !    call make_gaussienne(n_g,sigma_beta,M_gauss)
+
+    niter_nolin = 1
 
     return

trunk/SOURCES/Makefile.grisli.inc

@@ -72 +72 @@
         fake_beta_iter_vitbil_mod.o \
         dragging_param_beta_mod.o dragging_param_beta_sedim_mod.o \
-        bilan_eau_mod.o \
+        dragging_coulomb_friction_mod.o bilan_eau_mod.o \
         calving_frange.o calving_frange_abuk.o \
         calving_frange_ISMIP_glaciers.o calving_frange_ISMIP_fracture.o \
@@ -92 +92 @@
   sliding_Bindshadler_mod.o no_sliding.o                      \
   dragging_param_beta_mod.o dragging_param_beta_sedim_mod.o \
+  dragging_coulomb_friction_mod.o \
   calving_frange.o calving_frange_abuk.o calving_frange_ISMIP_fracture.o \
         no_calving.o no_rsl.o imposed_regions_rsl.o lake_rsl_mod.o \

trunk/SOURCES/New-remplimat/diagno-L2_mod.f90

@@ -42 +42 @@
 logical :: stopvisco,viscolin
 logical :: test_visc
+
+integer :: itour_nolin
 
 contains    
@@ -101 +103 @@
   if (itracebug.eq.1)  call tracebug(' Entree dans diagnoshelf')
 
+  do itour_nolin=1,niter_nolin
 
   itour_pvi=itour_pvi+1       ! boucle sur la viscosite (pour l'instant pas actif)
@@ -340 +343 @@
   !write(6,*) 'time',time, uxbar(92,152),gzmx(92,152),ilemx(92,152),flotmx(92,152), flgzmx(92,152)
 
+  end do ! afq -- sur itour_nolin
+
   return
 end subroutine diagnoshelf

trunk/SOURCES/dragging_param_beta_mod.f90

@@ -100 +100 @@
 
 !afq -- toblim = 0. !0.7e5 ! afq -- pour les iles, mais est-ce vraiment utile?
-  
+
+niter_nolin = 1
+
 return
 end subroutine init_dragging

trunk/SOURCES/dragging_param_beta_sedim_mod.f90

@@ -124 +124 @@
  
       !afq -- toblim = 0. !0.7e5 ! afq -- pour les iles, mais est-ce vraiment utile?
+
+      niter_nolin = 1
 
       return