Changeset 5489 for LMDZ6/branches/contrails/libf/phylmd/phys_output_mod.F90

Timestamp:

Jan 17, 2025, 6:16:25 PM (13 days ago)

Author:

aborella

Message:

Merge with trunk

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_mod.F90 (modified) (6 diffs)

LMDZ6/branches/contrails/libf/phylmd/phys_output_mod.F90

@@ -7 +7 @@
   USE phys_output_write_mod, ONLY : phys_output_write
   REAL, DIMENSION(nfiles),SAVE :: ecrit_files
+  !$OMP THREADPRIVATE(ecrit_files)
+
 
 ! Abderrahmane 12 2007
@@ -139 +141 @@
     REAL, DIMENSION(nfiles), SAVE ::  phys_out_latmin  = [   -90.,    -90.,    -90.,    -90.,    -90.,    -90.,    -90.,    -90.,    -90.,    -90.]
     REAL, DIMENSION(nfiles), SAVE ::  phys_out_latmax  = [    90.,     90.,     90.,     90.,     90.,     90.,     90.,     90.,     90.,     90.]
+!$OMP THREADPRIVATE(phys_out_regfkey,phys_out_lonmin,phys_out_lonmax,phys_out_latmin,phys_out_latmax)
+
     REAL, DIMENSION(klev,2) :: Ahyb_bounds, Bhyb_bounds
     REAL, DIMENSION(klev+1)   :: lev_index
@@ -172 +176 @@
     ALLOCATE(o_dtr_evapls(nqtot),o_dtr_ls(nqtot),o_dtr_trsp(nqtot))
     ALLOCATE(o_dtr_sscav(nqtot),o_dtr_sat(nqtot),o_dtr_uscav(nqtot))
-    ALLOCATE(o_dtr_wet_con(nqtot))
+    ALLOCATE(o_dtr_wet_cv(nqtot), o_dtr_wet(nqtot))
     ALLOCATE(o_dtr_dry(nqtot),o_dtr_vdf(nqtot))
 IF (CPPKEY_STRATAER) THEN
@@ -513 +517 @@
           itr = 0; itrb = 0
           DO iq = 1, nqtot 
-            IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+            IF(.NOT.tracers(iq)%isInPhysics) CYCLE
             itr = itr + 1
             dn = 'd'//TRIM(tracers(iq)%name)//'_'
@@ -542 +546 @@
 
             lnam = 'tracer convective wet deposition'//TRIM(tracers(iq)%longName)
-            tnam = TRIM(dn)//'wet_con';       o_dtr_wet_con       (itr) = ctrl_out(flag, tnam, lnam, "-", [('',i=1,nfiles)])
+            tnam = TRIM(dn)//'wet_cv';       o_dtr_wet_cv       (itr) = ctrl_out(flag, tnam, lnam, "-", [('',i=1,nfiles)])
+            lnam = 'tracer total wet deposition'//TRIM(tracers(iq)%longName)
+            tnam = TRIM(dn)//'wet';       o_dtr_wet       (itr) = ctrl_out(flag, tnam, lnam, "-", [('',i=1,nfiles)])
             lnam = 'tracer tendency dry deposition'//TRIM(tracers(iq)%longName)
             tnam = 'cum'//TRIM(dn)//'dry';  o_dtr_dry       (itr) = ctrl_out(flag, tnam, lnam, "-", [('',i=1,nfiles)])
@@ -636 +642 @@
 
 !  DO iq=1,nqtot
-!    IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+!    IF(.NOT.tracers(iq)%isInPhysics) CYCLE
 !    WRITE(*,'(a,i1,a,10i3)')'trac(',iq,')%flag = ',o_trac(iq)%flag
 !    WRITE(*,'(a,i1,a)')'trac(',iq,')%name = '//TRIM(o_trac(iq)%name)