Changeset 2785 for trunk/ICOSA_LMDZ/src

Timestamp:

Aug 3, 2022, 5:07:41 PM (2 years ago)

Author:

emillour

Message:

Generic PCM:
Further seperation between dynamics and physics concerning tracers:
Tracer names are extracted from traceur.def via initracer.F90 and no
longer transfered from the dynamics to the physics
LT+EM

File:

• trunk/ICOSA_LMDZ/src/phystd/interface_icosa_lmdz.f90 (modified) (4 diffs)

trunk/ICOSA_LMDZ/src/phystd/interface_icosa_lmdz.f90

@@ -37 +37 @@
   INTEGER,SAVE :: nbp_phys_glo
   
-  CHARACTER(len=30),SAVE,ALLOCATABLE :: tname(:) ! tracer names
   REAL,SAVE :: pday ! number of ellapsed sols since Ls=0
   REAL,SAVE :: ptime ! "universal time" as fraction of sol (e.g. 0.5 for noon)
@@ -204 +203 @@
 
 
-!  INTEGER                       :: nqo, nbtr
   CHARACTER(len=4)              :: type_trac
-!  CHARACTER(len=20),ALLOCATABLE :: tname(:)    ! tracer short name for restart and diagnostics
-!  CHARACTER(len=23),ALLOCATABLE :: ttext(:)     ! tracer long name for diagnostics
-!  INTEGER,ALLOCATABLE           :: niadv(:)    ! equivalent dyn / physique
-!  INTEGER,ALLOCATABLE           :: conv_flg(:) ! conv_flg(it)=0 : convection desactivated for tracer number it 
-!  INTEGER,ALLOCATABLE           :: pbl_flg(:)  ! pbl_flg(it)=0  : boundary layer diffusion desactivaded for tracer number it 
-!  CHARACTER(len=8),ALLOCATABLE  :: solsym(:)  ! tracer name from inca
+
   TYPE(t_field),POINTER,SAVE    :: f_ind_cell_glo(:)
   
   INTEGER :: iflag_phys    
   INTEGER :: nq
+  character(len=500) :: tracline ! to read traceur.def file
 
   !! to get starting date
@@ -285 +279 @@
      CALL getin('type_trac',type_trac)
 
-! init model for standard lmdz case
-!    nqo=2
-!    nbtr=2
-!$OMP MASTER
-    ALLOCATE(tname(nqtot))
-!$OMP END MASTER
-!$OMP BARRIER
-!    ALLOCATE(ttext(nqtot))
-!    ALLOCATE(niadv(nqtot))
-!    ALLOCATE(conv_flg(nbtr))
-!    ALLOCATE(pbl_flg(nbtr))
-!    ALLOCATE(solsym(nbtr))
-    
-
-! read tname() from traceur.def file
+    
+! read nq from traceur.def file
+! We allow to read the Modern-trac-V1 as well to get nqtot
     IF (is_mpi_root) THEN
 !$OMP MASTER
     OPEN(unit=42,file="traceur.def",form="formatted",status="old",iostat=ierr)
     IF (ierr==0) THEN
-      READ(42,*) nq ! should be the same as nqtot
+      READ(42,*) tracline 
+      if (trim(tracline) .ne. '#ModernTrac-v1') then !checking if we're using Modern-Trac or not
+        read(tracline,*) nq !should be equal to nqtot
+      else
+        do !loop on lines until we find uncommented lines
+          read(42,'(A)',iostat=ierr) tracline 
+          if (ierr==0) then 
+            if (index(tracline,"#") .ne. 1) then ! Allow for arbitrary number of commented lines in header
+              read(tracline,*) nq !should be equal to nqtot
+              exit
+            endif  !index(tracline,"#") .ne. 1
+          endif !ierr=0
+        enddo
+      endif !(trim(tracline) .ne. '#ModernTrac-v1')
       IF (nq /= nqtot) THEN
         WRITE(*,*) "Error: number of tracers in tracer.def should match nqtot!"
         WRITE(*,*) "       will just use nqtot=",nqtot," tracers"
       ENDIF
-      DO i=1,nqtot
-        READ(42,*) tname(i)
-      ENDDO
       CLOSE(42)
-    ENDIF
+    ENDIF !ierr==0 (1st one)
 !$OMP END MASTER
 !$OMP BARRIER
     ENDIF ! of (is_mpi_root)
 
-    DO i=1,nqtot
-      CALL bcast(tname(i))
-    ENDDO
+
 
 !    CALL init_infotrac_phy(nqtot,nqo,nbtr,tname,ttext,type_trac,&
@@ -627 +617 @@
 !$OMP BARRIER    
     CALL physiq(klon_omp, llm, nqtot, &
-                tname, &
                 debut, lafin, &
                 pday, ptime, dtphy, &