Changeset 330 for trunk/SOURCES/ablation_mod.f90

Timestamp:

01/26/21 17:31:08 (3 years ago)

Author:

aquiquet

Message:

Bug correction in ablation_mod affecting Ts + a bit of cleaning

File:

• trunk/SOURCES/ablation_mod.f90 (modified) (3 diffs)

trunk/SOURCES/ablation_mod.f90

@@ -94 +94 @@
   real,dimension(365) :: TT             !< air temperature yearly cycle, for PDD
 !- SC- Uniquement pour pdd Tarasov
-  REAL, DIMENSION(nx,ny) :: pr_ice_eq, snowmelt, cpsurf
+  REAL, DIMENSION(nx,ny) :: pr_ice_eq, totmelt, snowmelt, cpsurf
   REAL, DIMENSION(nx,ny) :: refr2, refreezed_ice
 
@@ -219 +219 @@
 
         WHERE (PDD(:,:).LE.PDS(:,:))
-           snowmelt(:,:) = Csnow_2D(:,:)*PDD(:,:)
+           totmelt(:,:) = Csnow_2D(:,:)*PDD(:,:)
         ELSEWHERE
-           snowmelt(:,:) = Csnow_2D(:,:)*PDS(:,:) + Cice_2D(:,:)*(PDD(:,:)-PDS(:,:))
+           totmelt(:,:) = Csnow_2D(:,:)*PDS(:,:) + Cice_2D(:,:)*(PDD(:,:)-PDS(:,:))
         ENDWHERE
 
-        snowmelt(:,:) = amin1(snowmelt(:,:),ACC(:,:))
+        snowmelt(:,:) = amin1(totmelt(:,:),ACC(:,:))
 
 ! Deux formules possibles pour la capacité calorifique (en J/kg.K):
@@ -239 +239 @@
 !           refreezed_ice(:,:) = amin1(pr_ice_eq(:,:)+snowmelt(:,:),refr2(:,:))
 !        endwhere
-        SIMAX(:,:)=refreezed_ice(:,:)
-        PDSI(:,:)=SIMAX(:,:)/Cice_2D(:,:)
-        WHERE (PDD(:,:).LE.PDS(:,:))        
-           BM(:,:)=ACC(:,:)-PDD(:,:)*Csnow_2D(:,:) + SIMAX(:,:)
-           SIF(:,:)=PDD(:,:)*Csnow_2D(:,:)*(1-SIMAX(:,:))
-        endwhere
-        WHERE ((PDS(:,:).LT.PDD(:,:)).AND.(PDD(:,:).LE.PDS(:,:)+PDSI(:,:)))
-           BM(:,:)=SIMAX(:,:)-(PDD(:,:)-PDS(:,:))*Cice_2D(:,:)
-           SIF(:,:)=SIMAX(:,:)
-        endwhere
-        WHERE (PDS(:,:)+PDSI(:,:).LE.PDD(:,:))
-           BM(:,:)=(PDS(:,:)+PDSI(:,:)-PDD(:,:))*Cice_2D(:,:)
-           SIF(:,:)=SIMAX(:,:)
-        endwhere
+
+        bm(:,:) = ACC(:,:)+refreezed_ice(:,:)-totmelt(:,:)
+        SIF(:,:)=refreezed_ice(:,:)
 
      ELSE ! pdd standard reeh