Changeset 3865 for LMDZ6/trunk/libf/dyn3dpar

Timestamp:

Mar 23, 2021, 4:14:07 PM (3 years ago)

Author:

lmdz-users

Message:

Modifications from Thibaut to create an ESM with interactive CO2 + INCA aerosols

Location:

LMDZ6/trunk/libf/dyn3dpar

Files:

• dynredem.F (modified) (2 diffs)
• dynredem_p.F (modified) (2 diffs)
• gcm.F (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3dpar/dynredem.F

@@ -568 +568 @@
       call NF95_PUT_VAR(nid,nvarid,teta)
 
-      IF (type_trac == 'inca') THEN
+      IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN
 ! Ajout Anne pour lecture valeurs traceurs dans un fichier start_trac.nc
          ierr_file = NF_OPEN ("start_trac.nc", NF_NOWRITE,nid_trac)
@@ -581 +581 @@
       do iq=1,nqtot 
 
-         IF (type_trac /= 'inca') THEN
+         IF (type_trac /= 'inca' .AND. type_trac /= 'inco') THEN
             ierr = NF_INQ_VARID(nid, tname(iq), nvarid)
             IF (ierr .NE. NF_NOERR) THEN

LMDZ6/trunk/libf/dyn3dpar/dynredem_p.F

@@ -580 +580 @@
       call NF95_PUT_VAR(nid,nvarid,teta)
 
-      IF (type_trac == 'inca') THEN
+      IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN
 ! Ajout Anne pour lecture valeurs traceurs dans un fichier start_trac.nc
          inquire(FILE="start_trac.nc", EXIST=exist_file) 
@@ -597 +597 @@
       do iq=1,nqtot 
 
-         IF (type_trac /= 'inca') THEN
+         IF (type_trac /= 'inca' .AND. type_trac /= 'inco') THEN
             ierr = NF_INQ_VARID(nid, tname(iq), nvarid)
             IF (ierr .NE. NF_NOERR) THEN

LMDZ6/trunk/libf/dyn3dpar/gcm.F

@@ -209 +209 @@
 #endif
 
-      IF (type_trac == 'inca') THEN
+      IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN
 #ifdef INCA
          call init_const_lmdz(
@@ -415 +415 @@
 c   Initialisation des dimensions d'INCA :
 c   --------------------------------------
-      IF (type_trac == 'inca') THEN
+      IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN
 !$OMP PARALLEL
 #ifdef INCA