Changeset 365 for trunk/LMDZ.GENERIC/libf/phystd

Timestamp:

Nov 9, 2011, 3:46:11 PM (13 years ago)

Author:

rwordsworth

Message:

slight modifs to ice iteration algorithm

File:

• trunk/LMDZ.GENERIC/libf/phystd/physiq.F90 (modified) (11 diffs)

trunk/LMDZ.GENERIC/libf/phystd/physiq.F90

@@ -447 +447 @@
 !        read startfi (initial parameters)
 !        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-         
+
          call phyetat0("startfi.nc",0,0,nsoilmx,nq,           &
                day_ini,time_phys,tsurf,tsoil,emis,q2,qsurf,   &
                cloudfrac,totcloudfrac,hice)
-
 
          if (pday.ne.day_ini) then
@@ -503 +502 @@
             close(128)
         
-            if(num_run.ne.0.and.mod(num_run,3).eq.0)then
+            if(num_run.ne.0.and.mod(num_run,2).eq.0)then
+            !if(num_run.ne.0.and.mod(num_run,3).eq.0)then
                print*,'Updating ice at end of this year!'
                ice_update=.true.
@@ -512 +512 @@
 !        define surface as continent or ocean
 !        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!         print*,'OCEAN EVERYWHERE FOR GJ581d RUNS'
          do ig=1,ngridmx
             rnat(ig)=1
@@ -565 +564 @@
             qzero1D=0.0
 
-            watertest=.true. ! standard for now
+            if(enertest)then
+               watertest = .true.
+            endif
+
             if(ngrid.eq.1)then
                qzero1D               = 0.0
@@ -933 +935 @@
             dEtot=0.0
             dEtots=0.0
+
             vdifcdE(:)=0.0
             do ig = 1, ngrid
@@ -946 +949 @@
 
                enddo
+               dEtot = dEtot - zflubid(ig)*area(ig) ! subtract flux from ground
+
                dEtots = dEtots + capcal(ig)*zdtsdif(ig)*area(ig)
                vdifcdE(ig) = vdifcdE(ig) + capcal(ig)*zdtsdif(ig)
@@ -957 +962 @@
          endif
          !-------------------------
+
 
          !-------------------------
@@ -1608 +1614 @@
       endif   !  of if (tracer) 
 
-
-!      print*,'we got this far 1'
-
 !-----------------------------------------------------------------------
 !   9. Surface and sub-surface soil temperature
@@ -1707 +1710 @@
          Ts1 = Ts1 + area(ig)*tsurf(ig)
          Ts2 = min(Ts2,tsurf(ig))  
-         Ts3 = max(Ts3,tsurf(ig))
+         Ts3 = max(Ts3,tsurf(ig))
          TsS = TsS + area(ig)*tsoil(ig,nsoilmx)
       end do
@@ -1907 +1910 @@
                   delta_ice = (qsurf(ig,igcm_h2o_ice)-ice_initial(ig))
 
-                  ! add one hundred years/timesteps of evolution
+                  ! add multiple years of evolution
                   qsurf_hist(ig,igcm_h2o_ice) = &
-                     qsurf_hist(ig,igcm_h2o_ice) + delta_ice*100.0 
+                     !qsurf_hist(ig,igcm_h2o_ice) + delta_ice*100.0 
+                     qsurf_hist(ig,igcm_h2o_ice) + delta_ice*10.0 
 
                   ! if ice has gone -ve, set to zero
                   if(qsurf_hist(ig,igcm_h2o_ice).lt.0.0)then
                      qsurf_hist(ig,igcm_h2o_ice) = 0.0 
-                     qsurf_hist(ig,igcm_h2o_vap) = 0.0
+                     !qsurf_hist(ig,igcm_h2o_vap) = 0.0
                   endif
 
-                  ! set maximum to ice
-                  if(qsurf_hist(ig,igcm_h2o_ice).gt.1.e3)then
-                     qsurf_hist(ig,igcm_h2o_ice) = 1.e3 
-                     qsurf_hist(ig,igcm_h2o_vap) = 0.0
+                  ! if ice is seasonal, set to zero (NEW)
+                  if(ice_min(ig).lt.0.01)then
+                     qsurf_hist(ig,igcm_h2o_ice) = 0.0 
+                     !qsurf_hist(ig,igcm_h2o_vap) = 0.0
                   endif
 
@@ -1940 +1944 @@
             write(*,*)'PHYSIQ: for physdem ztime_fin =',ztime_fin
             call physdem1("restartfi.nc",long,lati,nsoilmx,nq,            &
-!                    ptimestep,pday,ztime_fin,tsurf,tsoil,emis,q2,qsurf,      &
                     ptimestep,pday,ztime_fin,tsurf,tsoil,emis,q2,qsurf_hist, &
                     area,albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe,      &