Changeset 473 for branches

Timestamp:

01/31/24 15:36:50 (4 months ago)

Author:

aquiquet

Message:

Cleaning branch: update of param_list so that we are ready to switch to dragging_coulomb instead of dragging_param, results are not identical due to rounding errors so dragging_param is kept for now

Location:

branches/GRISLIv3

Files:

• Param/anteis1_param_list_Cyc-Tsai.dat (modified) (1 diff)
• SOURCES/Draggings_modules/dragging_coulomb_friction_mod.f90 (modified) (1 diff)
• SOURCES/Hemin40_files/module_choix-hemin40-0.4.f90 (modified) (1 diff)
• launching_area/Master-files/module_choix-antar40-0.4-cycles.f90 (modified) (1 diff)
• launching_area/degla_PMIP_euras10_param_list.dat (modified) (2 diffs)
• launching_area/degla_PMIP_euras20_param_list.dat (modified) (2 diffs)
• launching_area/degla_PMIP_euras40_param_list.dat (modified) (2 diffs)
• launching_area/degla_PMIP_hemin40_param_list.dat (modified) (2 diffs)
• launching_area/degla_PMIP_laure16_param_list.dat (modified) (2 diffs)

branches/GRISLIv3/Param/anteis1_param_list_Cyc-Tsai.dat

@@ -238 +238 @@
 !___________________________________________________________
 &drag_param_beta          ! nom du bloc dragging param beta
- 
+
  beta_slope            =   4.6416814E-03
- beta_expo             =    1.000000    
- betamax               =    500000.0    
- betamin               =    1.000000    
+ beta_expo             =    1.000000
+ betamax               =    500000.0
+ betamin               =    1.000000
  /
 ! Slope & expo of beta = - slope x Neff ** expo
+&drag_coulomb_friction                        ! drag_coulomb_friction
+
+cf            = 0.46416814
+m_nolin       = 1.
+niter_nolin   = 1
+betamax    = 5.e5     ! maximum value of beta
+betamin    = 1.   ! minimum value of beta
+bool_sedim = .F.
+file_sedim  = 'Ant40_hsedim.nc'
+seuil_sedim = 0.
+coef_sedim  = 1.e-2
+/
+! cf: a friction coefficient (to be tuned)
+! m_nolin: non-linear exponent, from 1 to infinity (put -1 for infinity)
+!          m_nolin=1/q in Pattyn TC 2017, q in [0:1]
+! niter_nolin: number of iterations to solve the non-linearity (expensive!)
+!
+!___________________________________________________________
  &MASS_CONSERV
  ADV_FRAC        =   2.000000    ,

branches/GRISLIv3/SOURCES/Draggings_modules/dragging_coulomb_friction_mod.f90

@@ -243 +243 @@
 ! ux/uy(:,:,nz) should be used but only uxbar/uybar are updated by diagno_L2
 ! anyway: ux/uy(:,:,nz) are uxbar/uybar (as it should be???)
-where (abs(uxbar(:,:)).gt.1)
+where (abs(uxbar(:,:)).gt.1e-9)
    betamx(:,:) = tauc_mx(:,:) * ( abs(uxbar(:,:))**(q_nolin-1.) ) / ( u0 ** q_nolin )
 elsewhere
    betamx(:,:) = tauc_mx(:,:) / ( u0 ** q_nolin )
 endwhere
-where (abs(uybar(:,:)).gt.1)
+where (abs(uybar(:,:)).gt.1e-9)
    betamy(:,:) = tauc_my(:,:) * ( abs(uybar(:,:))**(q_nolin-1.) ) / ( u0 ** q_nolin )
 elsewhere

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

@@ -94 +94 @@
 !use dragging_hwat_cont
 !use dragging_neff_slope
-!use dragging_param_beta
-use dragging_param_beta_sedim
+!use dragging_param_beta ! deprecated, should be replaced by coulomb_friction - identical except for rounding errors
+use dragging_param_beta_sedim ! deprecated, should be replaced by coulomb_friction - identical except for rounding errors
+!use dragging_coulomb_friction
+
 
 !------------ spinup -----------------------------------

branches/GRISLIv3/launching_area/Master-files/module_choix-antar40-0.4-cycles.f90

@@ -88 +88 @@
 !use dragging_hwat_contmaj ! frottement basal catherine grisliv8 ice stream peu actifs
 !use dragging_neff_slope ! dragging Aurelien et Christophe
-use dragging_param_beta
+use dragging_param_beta ! deprecated, should be replaced by coulomb_friction - identical except for rounding errors
 !use dragging_param_beta_sedim
 !use dragging_param_beta_nolin
+!use dragging_coulomb_friction
 ! use dragging_hwat_sedim version sediment HN
 

branches/GRISLIv3/launching_area/degla_PMIP_euras10_param_list.dat

@@ -335 +335 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1.
 /
 !
@@ -345 +344 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1
 file_sedim  = 'sedmap_euras10.nc'
 seuil_sedim = 200.

branches/GRISLIv3/launching_area/degla_PMIP_euras20_param_list.dat

@@ -346 +346 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1.
 /
 !
@@ -356 +355 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1
 file_sedim  = 'sedmap_euras20.nc'
 seuil_sedim = 200.

branches/GRISLIv3/launching_area/degla_PMIP_euras40_param_list.dat

@@ -335 +335 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1.
 /
 !
@@ -345 +344 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1
 file_sedim  = 'sedmap_euras40.nc'
 seuil_sedim = 200.

branches/GRISLIv3/launching_area/degla_PMIP_hemin40_param_list.dat

@@ -337 +337 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1.
 /
 !
@@ -347 +346 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1
 file_sedim  = 'sediment_ij_hemin40.grd'
 seuil_sedim = 200.
 coef_sedim  = 1.e-1
 /
+!
+!___________________________________________________________
+&drag_coulomb_friction                        ! drag_coulomb_friction
+
+cf            = 0.1584297807517
+m_nolin       = 1.
+niter_nolin   = 1
+betamax    = 5.e5     ! maximum value of beta
+betamin    = 100.   ! minimum value of beta
+bool_sedim = .T.
+file_sedim  = 'sediment_ij_hemin40.grd'
+seuil_sedim = 200.
+coef_sedim  = 1.e-1
+/
+! cf: a friction coefficient (to be tuned)
+! m_nolin: non-linear exponent, from 1 to infinity (put -1 for infinity)
+!          m_nolin=1/q in Pattyn TC 2017, q in [0:1]
+! niter_nolin: number of iterations to solve the non-linearity (expensive!)
 !
 !___________________________________________________________

branches/GRISLIv3/launching_area/degla_PMIP_laure16_param_list.dat

@@ -337 +337 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1.
 /
 !
@@ -347 +346 @@
 betamax    = 5.e5     ! maximum value of beta
 betamin    = 100. !10.   ! minimum value of beta
-coef_ile   = 1
 file_sedim  = 'sedmap_laure16.nc'
 seuil_sedim = 200.