Changeset 146 for branches/iLoveclim/SOURCES/conserv-mass-adv-diff_sept2009_mod.f90

Timestamp:

10/20/17 09:31:39 (7 years ago)

Author:

aquiquet

Message:

Grisli-iLoveclim branch: merged to trunk at revision 145

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/conserv-mass-adv-diff_sept2009_mod.f90 (modified) (2 diffs)

branches/iLoveclim/SOURCES/conserv-mass-adv-diff_sept2009_mod.f90

@@ -416 +416 @@
 
 !    if ((time.lt.time_gl(1)).or.(nt.lt.2)) then      ATTENTION test seulement si version prescribe-H_mod.f90
-       call prescribe_present_H_gl       ! prescribe present thickness at the grounding line
+   if (ibmelt_inv.eq.0) then
+      call prescribe_present_H_gl       ! prescribe present thickness at the grounding line
+   else if (ibmelt_inv.eq.1) then ! inversion bmelt
+      call prescribe_present_H_gl_bmelt ! prescribe only grounding line points
+   else
+      print*,'ibmelt_inv value must be 0 or 1 !!!'
+      stop
+   endif
 !    else
 !       call prescribe_retreat
@@ -550 +557 @@
 H(:,:)=max(H(:,:),0.)       ! pas d'epaisseur negative
 
-!~ ! calcul du masque "ice"
-!~ where (flot(:,:))        ! points flottants, sera éventuellement réévalué dans flottab
-!~    where(H(:,:).gt.max(Hmin,Hmin+BM(:,:)-Bmelt(:,:)))
-!~       ice(:,:)=1
-!~    elsewhere
-!~       ice(:,:)=0
-!~       H(:,:)=max(1.,min(0.,(sealevel - Bsoc(:,:))*row/ro-0.01))
-!~    endwhere
-!~ !   H(:,:)=max(H(:,:),1.) ! dans la partie marine l'épaisseur mini est 1 m
-!~ !   H(:,:)=max(1.,min(0.,(sealevel - Bsoc(:,:))*row/ro-0.01))
-!~ elsewhere                ! points posés
-!~    where(H(:,:).gt.0.)
-!~       ice(:,:)=1
-!~    elsewhere
-!~       ice(:,:)=0
-!~    endwhere
-!~ endwhere
-
 ! eventuellement retirer apres spinup ou avoir un cas serac
 Hdot(:,:)=(H(:,:)-vieuxH(:,:))/dt
 !$OMP END WORKSHARE
 
-!~ if (igrdline.ne.3) then
-!~    !$OMP WORKSHARE
-!~    Hdot(:,:)=min(Hdot(:,:),10.)
-!~    Hdot(:,:)=max(Hdot(:,:),-10.)
-!~    !$OMP END WORKSHARE
-!~ endif
+if (ibmelt_inv.eq.1) then ! inversion du bmelt avec igrdline=1
+   !$OMP WORKSHARE
+   where (i_Hp(:,:).eq.1)
+      H(:,:)=Hp(:,:)
+   endwhere
+   !$OMP END WORKSHARE
+endif
 
 !$OMP WORKSHARE
-where (i_hp(:,:).ne.1)
-   H(:,:)=vieuxH(:,:)+Hdot(:,:)*dt
-end where
-
-
-
 ! si mk0=-1, on garde l'epaisseur precedente
 ! en attendant un masque plus propre