Changeset 1903 for trunk/LMDZ.TITAN/libf/dynphy_lonlat

Timestamp:

Jan 29, 2018, 11:41:36 PM (7 years ago)

Author:

jvatant

Message:

+ Generalize the use of nkim parameter in comchem_h instead
of having x=44 hardcoded everywhere in the code.
If ever one day we have nkim!=44 it will be useful !
+ Also add the other parameters for the chem. in comchem_h
+ Some rearrangment in physiq_mod of chemistry variables

-> especially less unsane "nq-nmicro" -> nkim instead.

+ In calchim, preliminary modifs to adapt to the new managment
of i/o chemistry implemented in last commits.
--JVO

Location:

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan

Files:

• lect_start_archive.F (modified) (4 diffs)
• newstart.F (modified) (3 diffs)
• start2archive.F (modified) (5 diffs)
• vert_regrid_kim.F90 (modified) (5 diffs)

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan/lect_start_archive.F

@@ -5 +5 @@
 
 !      USE surfdat_h
-      USE comchem_h, only : cnames
+      USE comchem_h, only : cnames, nkim
       USE comchem_newstart_h
       USE comsoil_h, ONLY: nsoilmx, layer, mlayer, volcapa, inertiedat
@@ -305 +305 @@
       
       allocate(preskimold(nlaykimold))
-      allocate(ykim_upS(44,iip1,jjp1,nlaykimold))
-      allocate(ykim_upoldS(44,imold+1,jmold+1,nlaykimold))
-      allocate(ykim_up_oldv(44,ngrid,nlaykimold))
+      allocate(ykim_upS(nkim,iip1,jjp1,nlaykimold))
+      allocate(ykim_upoldS(nkim,imold+1,jmold+1,nlaykimold))
+      allocate(ykim_up_oldv(nkim,ngrid,nlaykimold))
 
       allocate(var (imold+1,jmold+1,llm))
@@ -879 +879 @@
                    
           ! Then read all the others by their name if needed
-          DO iq=2,44
+          DO iq=2,nkim
             ierr=NF_INQ_VARID(nid,trim(cnames(iq))//"_up",nvarid)
             IF (ierr .NE. NF_NOERR) THEN
@@ -1248 +1248 @@
 
       ! Do the horizontal interpolation
-      DO i=1,44
+      DO i=1,nkim
         call interp_horiz(ykim_upoldS(i,:,:,:),ykim_upS(i,:,:,:),
      &                  imold,jmold,iim,jjm,nlaykimold,

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan/newstart.F

@@ -17 +17 @@
      &                              is_master
       use infotrac, only: infotrac_init, nqtot, tname
-      USE comchem_h, ONLY: nlaykim_up, ykim_up
+      USE comchem_h, ONLY: nkim, nlaykim_up, ykim_up
       USE comchem_newstart_h
       USE comsoil_h, ONLY: nsoilmx, layer, mlayer, inertiedat
@@ -1091 +1091 @@
             
           IF (.NOT.allocated(ykim_up)) THEN
-            ALLOCATE(ykim_up(44,ngridmx,nlaykim_up))
+            ALLOCATE(ykim_up(nkim,ngridmx,nlaykim_up))
           ENDIF
           
@@ -1100 +1100 @@
 
             WRITE(*,*) " Warning, nlaykimold=", nlaykimold
-            WRITE(*,*) ' which implies that a vertical regrid on upper  
+            WRITE(*,*) '  which implies that a vertical regrid on upper 
      &chemistry fields will be performed. If the ceiling is lowered I
-     & will also adjust GCM uppermost layers chem. tracers.'
+     &will also adjust GCM uppermost layers chem. tracers.'
             WRITE(*,*)
           

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan/start2archive.F

@@ -21 +21 @@
       use infotrac, only: infotrac_init, nqtot, tname
       USE comsoil_h
-      USE comchem_h, only : cnames, nlaykim_up, preskim, ykim_up
+      USE comchem_h, only : cnames, nkim, nlaykim_up, preskim, ykim_up
 !      USE comgeomfi_h, ONLY: lati, long, area
 !      use control_mod
@@ -234 +234 @@
      . I presume they're all here as you can't do uncomplete chemistry!"
      
-        ALLOCATE(ykim_up(44,ngridmx,nlaykim_up))
-        ALLOCATE(ykim_upS(44,ip1jmp1,nlaykim_up))
+        ALLOCATE(ykim_up(nkim,ngridmx,nlaykim_up))
+        ALLOCATE(ykim_upS(nkim,ip1jmp1,nlaykim_up))
         
         kim=.TRUE.
@@ -358 +358 @@
 c qsurf --> qsurfS
 c tankCH4 --> tankCH4S
-c ykim_up --> ykim_upS ( 44 upper chemistry fields )
+c ykim_up --> ykim_upS ( nkim=44 upper chemistry fields )
 c
 c-----------------------------------------------------------------------
@@ -372 +372 @@
 
       IF (kim) THEN ! NB : fields are in comchem_startarch_h
-         DO iq=1,44
+         DO iq=1,nkim
            call gr_fi_dyn(nlaykim_up,ngridmx,iip1,jjp1,ykim_up(iq,:,:),
      &                                                 ykim_upS(iq,:,:))
@@ -523 +523 @@
 c-----------------------------------------------------------------
 c Ecriture des champs upper_chemistry
-c NB : We assume a given order of the 44 chemistry tracers !
-c ( H=1, H2=2 ..., C4N2=44) -> hardcoded in comchem_h.
+c NB : We assume a given order of the nkim=44 chemistry tracers !
+c ( H=1, H2=2 ..., C4N2=nkim=44) -> hardcoded in comchem_h.
 c-----------------------------------------------------------------
 
       IF (kim) THEN
-        DO iq=1,44
+        DO iq=1,nkim
           call write_archive(nid,ntime,trim(cnames(iq))//'_up',
      .                trim(cnames(iq))//' in upper atmosphere',

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan/vert_regrid_kim.F90

@@ -16 +16 @@
   ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-  USE comchem_h, ONLY: cnames, nlaykim_up, preskim, ykim_up
+  USE comchem_h, ONLY: nkim, nlaykim_up, preskim, ykim_up
   USE comchem_newstart_h
   USE tracer_h
@@ -64 +64 @@
     lowered = .TRUE.
 
-    ALLOCATE(avg_qtop(44,ngridmx))
+    ALLOCATE(avg_qtop(nkim,ngridmx))
 
-    DO ichem=1,44
+    DO ichem=1,nkim
       avg_qtop(ichem,:)=0.0
       DO ilon=1,iim
@@ -111 +111 @@
 
       IF ( preskim(ln) .GT. preskimold(1) ) THEN
-          DO ichem=1,44
+          DO ichem=1,nkim
             coef = ( preskim(ln)-aps(llm) ) / ( preskimold(1)-aps(llm) )
             ykim_up(ichem,:,ln) = (1.0-coef)*avg_qtop(ichem,:) + coef*ykim_up_oldv(ichem,:,1)
@@ -145 +145 @@
       coef = ( aps(ilay) - preskim(1) ) / ( aps(isup) - preskim(1) )
 
-      DO ichem=1,44
+      DO ichem=1,nkim
 
         ! We need to convert ykim_up on phys grid to q on dyn grid
@@ -174 +174 @@
 
           ENDDO ! do ilat=2,jjm
-      ENDDO ! do ichem=1,44
+      ENDDO ! do ichem=1,nkim
     ENDDO ! do ilay=1,llm