Changeset 1421

Timestamp:

Apr 30, 2015, 10:24:13 AM (10 years ago)

Author:

milmd

Message:

Correction of newstart and vertical interpolation of q2 in LMDZ.GENERIC and LMDZ.MARS. In LMDZ.GENERIC add flag for cloud fraction reading.

Location:

trunk

Files:

• LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/lect_start_archive.F (modified) (1 diff)
• LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F (modified) (1 diff)
• LMDZ.GENERIC/libf/phystd/phyetat0.F90 (modified) (4 diffs)
• LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/lect_start_archive.F (modified) (1 diff)
• LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/newstart.F (modified) (1 diff)

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/lect_start_archive.F

@@ -1332 +1332 @@
       write (*,*) 'lect_start_archive: q2old ', q2old (1,2,1)  ! INFO
       call interp_vert (q2old,varp1,lmold+1,llm+1,
-     &     apsold,bpsold,aps,bps,psold,(imold+1)*(jmold+1))
+     &     apsold,bpsold,ap,bp,psold,(imold+1)*(jmold+1))
       write (*,*) 'lect_start_archive: varp1 ', varp1 (1,2,1)  ! INFO
       call interp_horiz(varp1,q2s,imold,jmold,iim,jjm,llm+1,

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F

@@ -342 +342 @@
         write(*,*) 'Reading file START'
         fichnom = 'start.nc'
-        CALL dynetat0(fichnom,nqtot,vcov,ucov,teta,q,masse,
+        CALL dynetat0(fichnom,vcov,ucov,teta,q,masse,
      .       ps,phis,time)
 

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

@@ -11 +11 @@
                      inquire_dimension, inquire_dimension_length
   use slab_ice_h, only: noceanmx
+  use callkeys_mod, only: CLFvarying
 
   implicit none
@@ -251 +252 @@
 
 ! Cloud fraction (added by BC 2010)
+if (CLFvarying) then
 call get_field("cloudfrac",cloudfrac,found,indextime)
 if (.not.found) then
@@ -259 +261 @@
              minval(cloudfrac), maxval(cloudfrac)
 endif
+else
+cloudfrac(:,:)=0.0
+endif
 
 ! Total cloud fraction (added by BC 2010)
+if (CLFvarying) then
 call get_field("totcloudfrac",totcloudfrac,found,indextime)
 if (.not.found) then
@@ -268 +274 @@
   write(*,*) "phyetat0: Total cloud fraction <totcloudfrac> range:", &
              minval(totcloudfrac), maxval(totcloudfrac)
+endif
+else
+totcloudfrac(:)=0.0
 endif
 

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/lect_start_archive.F

@@ -1277 +1277 @@
       write (*,*) 'lect_start_archive: q2old ', q2old (1,2,1)  ! INFO
       call interp_vert (q2old,varp1,lmold+1,llm+1,
-     &     apsold,bpsold,aps,bps,psold,(imold+1)*(jmold+1))
+     &     apsold,bpsold,ap,bp,psold,(imold+1)*(jmold+1))
       write (*,*) 'lect_start_archive: varp1 ', varp1 (1,2,1)  ! INFO
       call interp_horiz(varp1,q2s,imold,jmold,iim,jjm,llm+1,

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/newstart.F

@@ -434 +434 @@
         write(*,*) 'Reading file START'
         fichnom = 'start.nc'
-        CALL dynetat0(fichnom,nqtot,vcov,ucov,teta,q,masse,
+        CALL dynetat0(fichnom,vcov,ucov,teta,q,masse,
      .       ps,phis,time)