Changeset 70

Timestamp:

06/08/16 16:10:26 (8 years ago)

Author:

dumas

Message:

Bug fix in Qprod_icetemp (instability in ice temperature) : slowssa points heat = deformation SIA + sliding. Use fleuvemx and fleuvemy to identifie streams SSA and slow SSA points

Location:

trunk/SOURCES

Files:

• Ant40_files/bmelt-ant-regions_mod.f90 (modified) (2 diffs)
• Draggings_modules/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)
• Temperature-routines/Qprod_icetemp.f90 (modified) (5 diffs)
• dragging_hwatermax_0.2_mod.f90 (modified) (2 diffs)

trunk/SOURCES/Ant40_files/bmelt-ant-regions_mod.f90

@@ -206 +206 @@
     enddo bms_init
     
-    print*,'33,107bmlet',bmshelf(33,107),typeshelf(33,107),bsoc(33,107)
-        print*,'33,120bmlet',bmshelf(33,120),typeshelf(33,120),bsoc(33,120)
 
     bmshelf(:,:)=bmshelf(:,:)*bmelt_coef
@@ -231 +229 @@
              coef_talus = coefbmshelf
           else
-             coef_talus = 1         ! pas de changement au dela du talus continental
+             coef_talus = 1         ! pas de changement au dela du talus continental               
           endif talus_nochange
 

trunk/SOURCES/Draggings_modules/beta_iter_vitbil_mod.f90

@@ -345 +345 @@
     end where
 
+        fleuvemx(:,:)=gzmx(:,:)
+        fleuvemy(:,:)=gzmy(:,:)
    
   end subroutine gzm_beta_prescr

trunk/SOURCES/Draggings_modules/dragging_prescr_beta_buoyency_mod.f90

@@ -328 +328 @@
     end where
 
+        fleuvemx(:,:)=gzmx(:,:)
+        fleuvemy(:,:)=gzmy(:,:)
 
     

trunk/SOURCES/Draggings_modules/dragging_prescr_beta_mod.f90

@@ -337 +337 @@
     end where
 
-
+        fleuvemx(:,:)=gzmx(:,:)
+        fleuvemy(:,:)=gzmy(:,:)
     
   end subroutine gzm_beta_prescr

trunk/SOURCES/Draggings_modules/dragging_prescr_beta_nolin_mod.f90

@@ -435 +435 @@
     end where
 
-
+        fleuvemx(:,:)=gzmx(:,:)
+        fleuvemy(:,:)=gzmy(:,:)
     
   end subroutine gzm_beta_prescr

trunk/SOURCES/Temperature-routines/Qprod_icetemp.f90

@@ -97 +97 @@
            do J=2,Ny
               do I=2,Nx
-                 if ((.not.Flotmx(I,J)).and.(.not.Gzmx(I,J))) then
+                 if ((.not.Flotmx(I,J)).and.(.not.fleuvemx(I,J))) then ! grounded et slowssa
                     Chalx(I,J,K,L)=(Btt(I-1,J,K,L)+Btt(I,J,K,L))*Ffx(I,J,L) !&
                     !                      *Ro*G*Ee(K)**(Glen(L)+1)/Cp(I,J,K)
 
-                 else if (Gzmx(I,J)) then ! Ice Streams
+                 else if (fleuvemx(I,J)) then ! Ice Streams
                     Chalx(I,J,K,L)=0.
                  else                     ! Ice Shelves  
                     Chalx(I,J,K,L)=0.
                  endif
-                 if ((.not.Flotmy(I,J)).and.(.not.Gzmy(I,J))) then
+                 if ((.not.Flotmy(I,J)).and.(.not.fleuvemy(I,J))) then ! grounded et slowssa
                     Chaly(I,J,K,L)=(Btt(I,J-1,K,L)+Btt(I,J,K,L))*Ffy(I,J,L) !&
                     !                      *Ro*G*Ee(K)**(Glen(L)+1)/Cp(I,J,K)
-                 else if (Gzmy(I,J)) then  ! Ice Streams
+                 else if (fleuvemy(I,J)) then  ! Ice Streams
                     Chaly(I,J,K,L)=0.
-
                  else                      ! Ice Shelves
                     Chaly(I,J,K,L)=0.
@@ -284 +283 @@
            do J=2,Ny
               do I=2,Nx
-                 if ((.not.Flotmx(I,J)).and.(.not.Gzmx(I,J))) then
+                 if ((.not.Flotmx(I,J)).and.(.not.fleuvemx(I,J))) then
                     Chalx(I,J,K,L)=(Btt(I-1,J,K,L)+Btt(I,J,K,L))*Ffx(I,J,L) !&
                     !                      *Ro*G*Ee(K)**(Glen(L)+1)/Cp(I,J,K)
 
-                 else if (Gzmx(I,J)) then ! Ice Streams
+                 else if (fleuvemx(I,J)) then ! Ice Streams
                     Chalx(I,J,K,L)=0.
 
@@ -296 +295 @@
                  endif
 
-                 if ((.not.Flotmy(I,J)).and.(.not.Gzmy(I,J))) then
+                 if ((.not.Flotmy(I,J)).and.(.not.fleuvemy(I,J))) then
                     Chaly(I,J,K,L)=(Btt(I,J-1,K,L)+Btt(I,J,K,L))*Ffy(I,J,L) !&
                     !                      *Ro*G*Ee(K)**(Glen(L)+1)/Cp(I,J,K)
 
-                 else if (Gzmy(I,J)) then  ! Ice Streams
+                 else if (fleuvemy(I,J)) then  ! Ice Streams
                     Chaly(I,J,K,L)=0.
 
@@ -469 +468 @@
            do J=2,Ny
               do I=2,Nx
-                 if ((.not.Flotmx(I,J)).and.(.not.Gzmx(I,J))) then
+                 if ((.not.Flotmx(I,J)).and.(.not.fleuvemx(I,J))) then
                     Chalx(I,J,K,L)=(Btt(I-1,J,K,L)+Btt(I,J,K,L))*ddx(I,J,L)
 
-                 else if (Gzmx(I,J)) then ! Ice Streams
+                 else if (fleuvemx(I,J)) then ! Ice Streams
                     Chalx(I,J,K,L)=0.
 
@@ -480 +479 @@
                  endif
 
-                 if ((.not.Flotmy(I,J)).and.(.not.Gzmy(I,J))) then
+                 if ((.not.Flotmy(I,J)).and.(.not.fleuvemy(I,J))) then
                     Chaly(I,J,K,L)=(Btt(I,J-1,K,L)+Btt(I,J,K,L))*ddy(I,J,L)
 
-                 else if (Gzmy(I,J)) then  ! Ice Streams
+                 else if (fleuvemy(I,J)) then  ! Ice Streams
                     Chaly(I,J,K,L)=0.
 

trunk/SOURCES/dragging_hwatermax_0.2_mod.f90

@@ -106 +106 @@
                (((hwater(i,j)+hwater(i-1,j))*0.5.gt.hwatstream) &
                .and..not.flotmx(i,j))
-
+                  fleuvemx(i,j)=gzmx(i,j)
 
           ! calcul du frottement basal (ce bloc etait avant dans neffect)
@@ -130 +130 @@
                (((hwater(i,j)+hwater(i,j-1))*0.5.gt.hwatstream) &
                .and..not.flotmy(i,j))
+          fleuvemy(i,j)=gzmx(i,j)
 
           ! calcul du frottement basal (ce bloc etait avant dans neffect)