Changeset 2466 for trunk

Timestamp:

Feb 24, 2021, 4:16:08 PM (4 years ago)

Author:

mvals

Message:

Mars GCM:
Correction in lect_start_archive.F:

• adds the variable "watercap" to insure its transmission in the case newstart.F uses start_archive.nc to create the start files.

MV

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/dynphy_lonlat/phymars/lect_start_archive.F (modified) (9 diffs)

trunk/LMDZ.MARS/README

@@ -3291 +3291 @@
 - Added handling of hdo in molecular diffusion (moldiff_red).
 
+== 24/02/2021 == MV
+Correction in lect_start_archive.F:
+- adds the variable "watercap" to insure its transmission in the case newstart.F  
+  uses start_archive.nc to create the start files.
+

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

@@ -2 +2 @@
      &     date,tsurf,tsoil,emis,q2,
      &     t,ucov,vcov,ps,co2ice,h,phisold_newgrid,
-     &     q,qsurf,tauscaling,totcloudfrac,surfith,nid)
+     &     q,qsurf,tauscaling,totcloudfrac,surfith,nid,
+     &     watercap)
 c=======================================================================
 c
@@ -50 +51 @@
       REAL,INTENT(OUT) :: tauscaling(ngrid) ! dust conversion factor
       REAL,INTENT(OUT) :: totcloudfrac(ngrid) ! sub grid cloud fraction
+      REAL,INTENT(OUT) :: watercap(ngrid) ! infinite polar cap
       REAL,INTENT(OUT) :: phisold_newgrid(iip1,jjp1)
       REAL,INTENT(OUT) :: t(iip1,jjp1,llm)
@@ -132 +134 @@
       real tauscalingS(iip1,jjp1)
       real totcloudfracS(iip1,jjp1)
+      real watercapS(iip1,jjp1)
 
       real ptotal, co2icetotal
@@ -161 +164 @@
       real, dimension(:,:), allocatable :: tauscalingold
       real, dimension(:,:), allocatable :: totcloudfracold
+      real, dimension(:,:), allocatable :: watercapold
 
       real tab_cntrl(100)
@@ -362 +366 @@
       allocate(tauscalingold(imold+1,jmold+1))
       allocate(totcloudfracold(imold+1,jmold+1))
+      allocate(watercapold(imold+1,jmold+1))
 
       allocate(var (imold+1,jmold+1,llm))
@@ -687 +692 @@
 
 c-----------------------------------------------------------------------
-c 5.1 Lecture des champs 2D (co2ice, emis,ps,tsurf,Tg[10], q2surf, tauscaling,totcloudfrac)
+c 5.1 Lecture des champs 2D (co2ice, emis,ps,tsurf,Tg[10], q2surf, tauscaling,totcloudfrac,watercap)
 c-----------------------------------------------------------------------
  
@@ -800 +805 @@
         IF (ierr .NE. NF_NOERR) THEN
            PRINT*, "lect_start_archive: Failed loading <totcloudfrac>"
+           PRINT*, NF_STRERROR(ierr)
+           CALL abort
+        ENDIF
+      ENDIF
+c
+      ierr = NF_INQ_VARID (nid, "watercap", nvarid)
+      IF (ierr .NE. NF_NOERR) THEN
+         PRINT*, "lect_start_archive: <watercap> not in file"
+         watercapold(:,:) = 0.
+      ELSE
+#ifdef NC_DOUBLE
+        ierr = NF_GET_VARA_DOUBLE(nid, nvarid,start,count,
+     &                            watercapold)
+#else
+        ierr = NF_GET_VARA_REAL(nid, nvarid,start,count,
+     &                          watercapold)
+#endif
+        IF (ierr .NE. NF_NOERR) THEN
+           PRINT*, "lect_start_archive: Failed loading <watercap>"
            PRINT*, NF_STRERROR(ierr)
            CALL abort
@@ -1091 +1115 @@
      &                   jjm,1,rlonuold,rlatvold,rlonu,rlatv)
       call gr_dyn_fi (1,iim+1,jjm+1,ngrid,totcloudfracs,totcloudfrac)
-      
+
+c Watercap
+      call interp_horiz (watercapold,watercaps,imold,jmold,iim,
+     &                   jjm,1,rlonuold,rlatvold,rlonu,rlatv)
+      call gr_dyn_fi (1,iim+1,jjm+1,ngrid,watercaps,watercap)
+
 c     write(46,*) 'emis',emis
 c-----------------------------------------------------------------------
@@ -1452 +1481 @@
       deallocate(tauscalingold)
       deallocate(totcloudfracold)
+      deallocate(watercapold)
       deallocate(var,varp1)