Changeset 4073 for LMDZ6

Timestamp:

Feb 2, 2022, 11:24:54 AM (3 years ago)

Author:

acozic

Message:

Made some correction to allow compilation with inca (Anne)

File:

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

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -205 +205 @@
    INTEGER :: nqtrue                                                 !--- Tracers nb from tracer.def (no higher order moments)
    INTEGER :: iad                                                    !--- Advection scheme number
-   INTEGER :: ic, ip, np, iq, jq, it, nt, im, nm, ix, iz, nz         !--- Indexes and temporary variables
+   INTEGER :: ic, ip, np, iq, jq, it, nt, im, nm, ix, iz, nz, k      !--- Indexes and temporary variables
    LOGICAL :: lerr, ll
    CHARACTER(LEN=1) :: p
@@ -298 +298 @@
       nbtr = nqINCA + nqCO2
       nqtrue = nbtr + nqo
-      IF(ALL([2,3] /= nqo) CALL abort_gcm(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1)
+      IF(ALL([2,3] /= nqo)) CALL abort_gcm(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1)
       CALL msg('nqo    = '//TRIM(int2str(nqo)),    modname)
       CALL msg('nbtr   = '//TRIM(int2str(nbtr)),   modname)
@@ -310 +310 @@
       conv_flg = [(  1,        ic=1, nqCO2),conv_flg_inca]
        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)
+       solsym  = [('CO2     ', ic=1, nqCO2), solsym_inca]
+      DEALLOCATE(conv_flg_inca, pbl_flg_inca,solsym_inca)
 #endif
    ELSE
@@ -402 +402 @@
       nbtr = nqINCA + nqCO2                                          !--- Number of tracers passed to phytrac
       nqtrue = nbtr + nqo                                            !--- Total number of "true" tracers
-      IF(ALL([2,3] /= nqo) CALL abort_gcm(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1)
+      IF(ALL([2,3] /= nqo)) CALL abort_gcm(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1)
       CALL msg('nqo    = '//TRIM(int2str(nqo)),    modname)
       CALL msg('nbtr   = '//TRIM(int2str(nbtr)),   modname)
@@ -412 +412 @@
       CALL init_transport(hadv_inca, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
       ! DC passive CO2 tracer is at position 1: H2O was removed ; nqCO2/=0 in "inco" case only
-      conv_flg = [(  1,        k=1, nqCO2), conv_flg_inca]
-       pbl_flg = [(  1,        k=1, nqCO2),  pbl_flg_inca]
-       solsym  = [('CO2     ', k=1, nqCO2)    solsym_inca]
+      conv_flg = [(  1       , k=1, nqCO2), conv_flg_inca]
+      pbl_flg  = [(  1       , k=1, nqCO2), pbl_flg_inca]
+      solsym   = [('CO2     ', k=1, nqCO2), solsym_inca]
       DEALLOCATE(conv_flg_inca, pbl_flg_inca, solsym_inca)
       ALLOCATE(ttr(nqtrue))