Changeset 2264

Timestamp:

Mar 20, 2020, 2:00:37 PM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Cleanup of phyetatO and only apply conversion of negative water ice surface
to the watercap variable if there was is initial "watercap" field in the
start file.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/phyetat0_mod.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/README

@@ -2902 +2902 @@
 if it exists, is set in watercap.
 
-
+== 20/03/2020 == EM
+Cleanup of phyetatO and only apply conversion of negative water ice surface
+to the watercap variable if there was is initial "watercap" field in the
+start file.
+

trunk/LMDZ.MARS/libf/phymars/phyetat0_mod.F90

@@ -461 +461 @@
 
 
-! Surface water ice :
-write(*,*) "qsurf(vap) : ", qsurf(:,2)
-write(*,*) "qsurf(ice) : ", qsurf(:,3)
-
-
 call get_field("watercap",watercap,found,indextime)
 if (.not.found) then
@@ -471 +466 @@
                        "<watercap> is set to zero"
   watercap(:)=0
-else
-  write(*,*) "phyetat0: Surface water ice <watercap> range:", &
-             minval(watercap), maxval(watercap)
-endif
-
-   write(*,*) 'Surface water ice cannot be allowed', &
-                   ' to be negative if not on watercap !'
-! tracer on surface
-if (nq.ge.1) then
-  do iq=1,nq
+
+  write(*,*) 'Now transfer negative surface water ice to', &
+             ' watercap !'
+  if (nq.ge.1) then
+   do iq=1,nq
     txt=noms(iq)
-!    if ((txt.eq."h2o_vap").or.(txt.eq."h2o_ice")) then
     if (txt.eq."h2o_ice") then
       do ig=1,ngrid
@@ -488 +477 @@
           watercap(ig) = qsurf(ig,iq)
           qsurf(ig,iq) = 0.0
-!        else if (qsurf(ig,iq)>0.5) then
-!          watercap(ig) = watercap(ig) + qsurf(ig,iq) - 0.5
-!          qsurf(ig,iq)=0.5
        end if
       end do
     endif
-!    if (txt.eq."h2o_vap") then
-!      do ig=1,ngrid
-!        qsurf(ig,iq)=0.0
-!        else if (qsurf(ig,iq)>0.5) then
-!          watercap(ig) = watercap(ig) + qsurf(ig,iq) - 0.5
-!          qsurf(ig,iq)=0.5
-!      end do
-!    end if
-  enddo
-endif
-! tracer on surface
-!if (nq.ge.1) then
-!  do iq=1,nq
-!    txt=noms(iq)
-!    if (txt.eq."h2o_vap") then
-      ! There is no surface tracer for h2o_vap;
-      ! "h2o_ice" should be loaded instead
-!      txt="h2o_ice"
-!      write(*,*) 'phyetat0: loading surface tracer', &
-!                           ' h2o_ice instead of h2o_vap'
-!do ig=1,ngrid
-! if (qsurf(ig,igcm_h2o_vap).lt.0.0) then
-!    watercap(ig) = watercap(ig) + qsurf(ig,igcm_h2o_vap)
-!    qsurf(ig,igcm_h2o_vap)=0.0
-!  else if (qsurf(ig,iq)>0.5) then
-!    watercap(ig) = watercap(ig) + qsurf(ig,iq) - 0.5
-!    qsurf(ig,iq)=0.5
-! end if
-!end do
-!    endif
-!  enddo
-!endif
-
-
-
-!do ig=1,ngrid
-!  if (qsurf(ig,'h2o_ice').lt.0.0) then
-!    watercap(ig) = watercap(ig) + qsurf(ig,'h2o_ice')
-!    qsurf(ig,'h2o_ice')=0.0
-!  else if (qsurf(ig,iq)>0.5) then
-!    watercap(ig) = watercap(ig) + qsurf(ig,iq) - 0.5
-!    qsurf(ig,iq)=0.5
-!  end if
-!end do
+   enddo
+  endif ! of if (nq.ge.1)
+
+else
+  write(*,*) "phyetat0: Surface water ice <watercap> range:", &
+             minval(watercap), maxval(watercap)
+endif
+
 
 ! Call to soil_settings, in order to read soil temperatures,