Changeset 5618 for LMDZ6/branches/contrails/libf/dynphy_lonlat

Timestamp:

Apr 15, 2025, 11:56:45 AM (3 months ago)

Author:

aborella

Message:

Merge with trunk testing r5597. We have convergence in prod and debug in NPv7.0.1c

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/calfis.f90 (modified) (2 diffs)
• libf/dynphy_lonlat/calfis_loc.F90 (modified) (2 diffs)

LMDZ6/branches/contrails/libf/dynphy_lonlat/calfis.f90

@@ -279 +279 @@
   itr=0
   DO iq=1,nqtot
-     IF(.NOT.tracers(iq)%isAdvected) CYCLE
+     IF(tracers(iq)%iadv < 0) CYCLE
      itr = itr + 1
      DO l=1,llm
@@ -597 +597 @@
   itr = 0
   DO iq=1,nqtot
-     IF(.NOT.tracers(iq)%isAdvected) CYCLE
+     IF(tracers(iq)%iadv < 0) CYCLE
      itr = itr + 1
      DO l=1,llm

LMDZ6/branches/contrails/libf/dynphy_lonlat/calfis_loc.F90

@@ -356 +356 @@
   itr = 0
   DO iq=1,nqtot
-     IF(.NOT.tracers(iq)%isAdvected) CYCLE
+     IF(tracers(iq)%iadv < 0) CYCLE
      itr = itr + 1
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
@@ -1059 +1059 @@
   itr = 0
   DO iq=1,nqtot
-     IF(.NOT.tracers(iq)%isAdvected) CYCLE
+     IF(tracers(iq)%iadv < 0) CYCLE
      itr = itr + 1
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)