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

Timestamp:

Jan 10, 2018, 12:25:01 PM (7 years ago)

Author:

jvatant

Message:

Making chemistry handling more flexible - step 2.5
+ For more convenience I introduce specific modules
for chemistry stuff specific to start2archive and newstart
and not to pollute main module comchem_h.
--JVO

Location:

trunk/LMDZ.TITAN/libf/dynphy_lonlat/phytitan

Files:

• comchem_newstart_h.F90 (added)
• comchem_startarch_h.F90 (added)
• lect_start_archive.F (modified) (1 diff)
• newstart.F (modified) (3 diffs)
• start2archive.F (modified) (2 diffs)

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

@@ -5 +5 @@
 
 !      USE surfdat_h
-      USE comchem_h, ONLY: nlaykimold, preskimold
+      USE comchem_newstart_h, ONLY: nlaykimold, preskimold
       USE comsoil_h, ONLY: nsoilmx, layer, mlayer, volcapa, inertiedat
       USE infotrac, ONLY: tname, nqtot

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, nlaykimold
+      USE comchem_h, ONLY: nlaykim_up
+      USE comchem_newstart_h, ONLY: nlaykimold
       USE comsoil_h, ONLY: nsoilmx, layer, mlayer, inertiedat
       USE surfdat_h, ONLY: phisfi, albedodat,
@@ -35 +36 @@
       USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
       use tabfi_mod, only: tabfi
+      use callkeys_mod, only: callchim
       use iniphysiq_mod, only: iniphysiq
       use phyetat0_mod, only: phyetat0
@@ -1085 +1087 @@
         ! Regriding is then done, if needed
         
-        IF (nlaykimold.ne.nlaykim_up) THEN
+        IF (callchim .and. nlaykimold.ne.nlaykim_up) THEN
 
           WRITE(*,*) " Warning, nlaykimold=", nlaykimold
           WRITE(*,*) ' which implies that a regriding on upper chemistry
-     & will be performed.'
+     & fields will be performed.'
           WRITE(*,*)
           
-!          CALL  regrid_kim
+!          CALL regrid_kim(ngridmx)
           
         ENDIF

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

@@ -21 +21 @@
       use infotrac, only: infotrac_init, nqtot, tname
       USE comsoil_h
-      USE comchem_h
+      
+      USE comchem_h, only : nlaykim_up, preskim
+      USE comchem_startarch_h
 
 !      USE comgeomfi_h, ONLY: lati, long, area
@@ -233 +235 @@
      . I presume they're all here as you can't do uncomplete chemistry!"
         ! Allocates upper chemistry fields in comchem_h on physical and scalar grid
-        CALL allokim_start2archive(ngridmx,ip1jmp1)
+        CALL alloc_kim_start2archive(ngridmx,ip1jmp1)
         kim=.TRUE.
       ENDIF