Changeset 4077 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Feb 4, 2022, 3:23:49 PM (3 years ago)

Author:

acozic

Message:

modification to run with INCA :
1- modify deallocate for an array use after
2- change definition for allocate component for each tracer
3- modify definition of isInPhysics (H2O in INCA need to be in Physic)
4- modify test to check calcul of nqttotr

File:

• LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -311 +311 @@
        pbl_flg = [(  1,        ic=1, nqCO2), pbl_flg_inca]
        solsym  = [('CO2     ', ic=1, nqCO2), solsym_inca]
-      DEALLOCATE(conv_flg_inca, pbl_flg_inca,solsym_inca)
+      DEALLOCATE(conv_flg_inca, pbl_flg_inca)
 #endif
    ELSE
@@ -356 +356 @@
       CALL msg('tnom_transp(iq)=<'//TRIM(tnom_transp(iq))//'>', modname)
    END DO
+   DEALLOCATE(solsym_inca) 
 
    CLOSE(90)
@@ -378 +379 @@
    tracers(:)%phase     = 'g'
    tracers(:)%component = type_trac
+
+
    DO iq = 1, nqtrue
-      IF(lINCA) tracers(iq)%component = 'lmdz'
-      ip = strIdx([('H2O'//old_phases(ix:ix), ix=1, nphases)], strHead(tracers(iq)%name,'_'))
+      ip = strIdx([(addPhase('H2O',old_phases(ix:ix),''), ix=1, nphases)], strHead(tracers(iq)%name,'_',.TRUE.))
       IF(ip == 0) CYCLE
       tracers(iq)%phase = known_phases(ip:ip)
+      tracers(iq)%component = 'lmdz'
    END DO
    IF(lINCA) tracers(1+nqo:nqCO2+nqo)%component = 'co2i'
@@ -517 +520 @@
       t1%iadv       = iad
       t1%isAdvected = iad >= 0
-      t1%isInPhysics= delPhase(t1%gen0Name) /= 'H2O'  !=== TO BE COMPLETED WITH OTHER EXCEPTIONS: CO2i, SURSATURATED CLOUDS...
+      t1%isInPhysics= .not. (delPhase(t1%gen0Name) == 'H2O' .and. t1%component=='lmdz')  !=== TO BE COMPLETED WITH OTHER EXCEPTIONS: CO2i, SURSATURATED CLOUDS...
       ttr(iq)       = t1
 
@@ -577 +580 @@
    CALL msg('704: nqtottr, nqtot, nqo = '//strStack(int2str([nqtottr, nqtot, nqo])), modname)
    ! Rq: nqtottr n'est pas forcement egal a nbtr dans le cas ou nmom/=0
-   IF(COUNT(tracers%iso_iName == 0 .AND. delPhase(tracers(:)%name)/='H2O') /= nqtottr) &
+   IF(COUNT(tracers%iso_iName == 0) - COUNT(delPhase(tracers(:)%name) == 'H2O' .AND. tracers(:)%component=='lmdz') /= nqtottr) &
       CALL abort_gcm('infotrac_init', 'pb dans le calcul de nqtottr', 1)
 
@@ -668 +671 @@
       iqfils(tracers(ipere)%nqChilds,ipere) = iq
    END DO
+
    CALL msg('nqGen0   = '//int2str(COUNT(tracers(:)%parent == 'air')), modname)
    CALL msg('nqChilds = '//strStack(int2str(tracers(:)%nqChilds)),     modname)
    CALL msg('iqParent = '//strStack(int2str(tracers(:)%iqParent)),     modname)
    CALL msg('iqChilds = '//strStack(int2str(PACK(iqfils,MASK=.TRUE.))),modname)
+
 
    !=== SET FIELDS %iGeneration, %iqDescen, %nqDescen
@@ -694 +699 @@
    CALL msg('nqDescen_tot = ' //TRIM(int2str(SUM(tracers(:)%nqDescen))), modname)
    CALL msg('iqChilds = '//strStack(int2str(PACK(iqfils, MASK=.TRUE.))), modname)
+
 
 END SUBROUTINE infotrac_setHeredity