Changeset 4627 for LMDZ6/trunk/libf/phylmd

Timestamp:

Jul 13, 2023, 3:31:36 PM (16 months ago)

Author:

acozic

Message:

add a test on aerosol_couple before reading aerosol files in init_aero_fromfile. If we are using inca aerosols, we don't need to read these files

Location:

LMDZ6/trunk/libf/phylmd

Files:

• physiq_mod.F90 (modified) (1 diff)
• readaerosol_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -1729 +1729 @@
 
 !       CALL create_climoz(read_climoz)
-      IF (.NOT. create_etat0_limit) CALL init_aero_fromfile(flag_aerosol)  !! initialise aero from file for XIOS interpolation (unstructured_grid)
+      IF (.NOT. create_etat0_limit) CALL init_aero_fromfile(flag_aerosol, aerosol_couple)  !! initialise aero from file for XIOS interpolation (unstructured_grid)
       IF (.NOT. create_etat0_limit) CALL init_readaerosolstrato(flag_aerosol_strat)  !! initialise aero strato from file for XIOS interpolation (unstructured_grid)
 

LMDZ6/trunk/libf/phylmd/readaerosol_mod.F90

@@ -173 +173 @@
 
 
-SUBROUTINE init_aero_fromfile(flag_aerosol)
+SUBROUTINE init_aero_fromfile(flag_aerosol, aerosol_couple)
   USE netcdf
   USE mod_phys_lmdz_para
@@ -179 +179 @@
   USE lmdz_xios
   IMPLICIT NONE
+
   INTEGER, INTENT(IN) :: flag_aerosol
+  LOGICAL, INTENT(IN) :: aerosol_couple
+  
   REAL,ALLOCATABLE :: lat_src(:)
   REAL,ALLOCATABLE :: lon_src(:)
@@ -189 +192 @@
 
   IF (using_xios) THEN
-    IF (flag_aerosol>0 .AND. grid_type==unstructured) THEN
+    IF (flag_aerosol>0 .AND. grid_type==unstructured .AND. (.NOT. aerosol_couple) ) THEN
   
       IF (is_omp_root) THEN