Changeset 5549

Timestamp:

Feb 18, 2025, 5:49:06 PM (4 months ago)

Author:

aborella

Message:

Fix for reading aviation data with multiple OMPs

Location:

LMDZ6/branches/contrails/libf/phylmd

Files:

• limit_read_mod.f90 (modified) (1 diff)
• lmdz_aviation.f90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (2 diffs)

LMDZ6/branches/contrails/libf/phylmd/limit_read_mod.f90

@@ -48 +48 @@
 
   END SUBROUTINE init_limit_read
-  
-  SUBROUTINE init_aviation_read(first_day)
-  USE mod_grid_phy_lmdz
-  USE surface_data
-  USE mod_phys_lmdz_para
-  USE lmdz_xios
-
-  IMPLICIT NONE
-    INTEGER, INTENT(IN) :: first_day
-    LOGICAL :: ok_plane_contrail, ok_plane_h2o
-    
-    IF ( ok_plane_contrail .OR. ok_plane_h2o ) THEN
-      IF (grid_type==unstructured) THEN
-        IF (is_omp_master) CALL xios_set_file_attr("aviation_file", enabled=.TRUE.)
-      ENDIF  
-    ENDIF
-
-  END SUBROUTINE init_aviation_read
 
   SUBROUTINE limit_read_frac(itime, dtime, jour, pctsrf_new, is_modified)

LMDZ6/branches/contrails/libf/phylmd/lmdz_aviation.f90

@@ -631 +631 @@
     USE lmdz_xios
     USE print_control_mod, ONLY: lunout
-    !USE dimphy
-    !USE phys_state_var_mod
     IMPLICIT NONE
 
+    INTEGER,                    INTENT(IN)  :: klon, klev  ! number of horizontal grid points and vertical levels
     REAL, DIMENSION(klon,klev), INTENT(OUT) :: flight_dist ! Aviation distance flown within the mesh [m/s/mesh]
     REAL, DIMENSION(klon,klev), INTENT(OUT) :: flight_h2o  ! Aviation H2O emitted within the mesh [kgH2O/s/mesh]
-
-    INTEGER, INTENT(IN)                        :: klon, klev       ! number of horizontal grid points and vertical levels
 
     !----------------------------------------------------
     ! Local variable
     !----------------------------------------------------
-    INTEGER :: i, error, varid, iret
-    CHARACTER(len=*), PARAMETER :: filename='aviation.nc'
-    REAL, ALLOCATABLE :: flight_dist_mpi(:,:,:)
+    REAL, DIMENSION(klon_mpi,klev,1) :: flight_dist_mpi
 
     !--Initialisation
@@ -651 +646 @@
     flight_h2o(:,:) = 0.
 
+    ! Read the data from the file
     ! is_omp_master is necessary to make XIOS works
-    IF (is_omp_master) THEN
-
-        ! Allocation of KMFLOWN for the local MPI process
-        ALLOCATE(flight_dist_mpi(klon_mpi,klev,1), STAT=error)
-        IF (error /= 0) CALL abort_physic('airplane_mod.F90', 'pb in allocation pointer flight_dist_mpi',1)
-
-        ! Read the data from the file
-        CALL xios_recv_field("KMFLOWN_interp", flight_dist_mpi(:,:,1))
-   ENDIF !- is_omp_master
+    IF (is_omp_master) CALL xios_recv_field("KMFLOWN_interp", flight_dist_mpi(:,:,1))
 
    ! Propagate to other OMP threads: flight_dist_mpi(klon_mpi,klev) to flight_dist(klon,klev)
@@ -668 +656 @@
 END SUBROUTINE read_aviation_emissions
 
-!SUBROUTINE read_aviation_emissions( &
-!        klon, klev, latitude_deg, longitude_deg, pplay, &
-!        flight_dist, flight_h2o &
-!        )
-!
-!IMPLICIT NONE
-!!
-!! Input
-!!
-!INTEGER, INTENT(IN)                        :: klon, klev       ! number of horizontal grid points and vertical levels
-!REAL,    INTENT(IN),  DIMENSION(klon)      :: latitude_deg     ! latitude of the grid points [deg]
-!REAL,    INTENT(IN),  DIMENSION(klon)      :: longitude_deg    ! longitude of the grid points [deg]
-!REAL,    INTENT(IN),  DIMENSION(klon,klev) :: pplay            ! layer pressure [Pa]
-!!
-!! Output
-!!
-!REAL,    INTENT(OUT), DIMENSION(klon,klev) :: flight_dist      ! aviation distance flown within the mesh [m/s/mesh]
-!REAL,    INTENT(OUT), DIMENSION(klon,klev) :: flight_h2o       ! aviation H2O emitted within the mesh [kgH2O/s/mesh]
-!!
-!! Local
-!!
-!INTEGER :: i, k
-!
-!!--Initialisation
-!flight_dist(:,:) = 0.
-!flight_h2o(:,:) = 0.
-!
-!DO i=1, klon
-! IF ( ( latitude_deg(i) .GE. 42. ) .AND. ( latitude_deg(i) .LE. 48. ) ) THEN 
-!   flight_dist(i,15) = 50000.  !--5000 m of flight/second in grid cell x 10 scaling
-!   flight_h2o(i,15) = 100.  !--10 kgH2O/second in grid cell x 10 scaling
-! ENDIF
-!ENDDO
-!
-!END SUBROUTINE read_aviation_emissions
-
 END MODULE lmdz_aviation
-
-!*******************************************************************
-!
-!SUBROUTINE airplane(debut,pphis,pplay,paprs,t_seri)
-!
-!  USE dimphy
-!  USE mod_grid_phy_lmdz,  ONLY: klon_glo
-!  USE geometry_mod, ONLY: cell_area
-!  USE phys_cal_mod, ONLY : mth_cur
-!  USE mod_phys_lmdz_mpi_data, ONLY: is_mpi_root
-!  USE mod_phys_lmdz_omp_data, ONLY: is_omp_root
-!  USE mod_phys_lmdz_para, ONLY: scatter, bcast
-!  USE print_control_mod, ONLY: lunout
-!
-!  IMPLICIT NONE
-!
-!  INCLUDE "YOMCST.h"
-!  INCLUDE 'netcdf.inc'
-!
-!!
-!END SUBROUTINE airplane

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

@@ -2121 +2121 @@
          IF (is_omp_master) CALL xios_get_field_attr("temp",default_value=missing_val)
          CALL bcast_omp(missing_val)
+
+         !--Read the aviation emissions
+         IF ( ok_plane_h2o .OR. ok_plane_contrail ) THEN
+           CALL read_aviation_emissions(klon, klev, flight_dist, flight_h2o)
+         ENDIF
        !
        ! Now we activate some double radiation call flags only if some
@@ -3865 +3870 @@
          ratqs,ratqsc,ratqs_inter_,sigma_qtherm)
 
-    !--Read the aviation emissions
-    IF ( ok_plane_h2o .OR. ok_plane_contrail ) THEN
-      CALL read_aviation_emissions(klon, klev, flight_dist, flight_h2o)
-    ENDIF
-
     !--Add the water emissions from aviation
     IF ( ok_plane_h2o ) THEN