From 6116efa6e8830052b2cdd6a7de9e0697da41038f Mon Sep 17 00:00:00 2001 From: Lizzie Lundgren Date: Fri, 1 Mar 2024 13:58:44 -0700 Subject: [PATCH] Read aerosol optics files on all threads Signed-off-by: Lizzie Lundgren --- GeosCore/photolysis_mod.F90 | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/GeosCore/photolysis_mod.F90 b/GeosCore/photolysis_mod.F90 index 484089891..025ec6052 100644 --- a/GeosCore/photolysis_mod.F90 +++ b/GeosCore/photolysis_mod.F90 @@ -916,16 +916,8 @@ SUBROUTINE RD_AOD( Input_Opt, State_Chm, RC ) ASYMAA => State_Chm%Phot%ASYMAA PHAA => State_Chm%Phot%PHAA -#if defined( MODEL_CESM ) - IF ( Input_Opt%amIRoot ) THEN - NJ1 = findFreeLUN() - ELSE - NJ1 = 0 - ENDIF -#else ! Get a free LUN NJ1 = findFreeLUN() -#endif ! IMPORTANT: aerosol_mod.F and dust_mod.F expect aerosols in this order ! @@ -985,11 +977,6 @@ SUBROUTINE RD_AOD( Input_Opt, State_Chm, RC ) ! If not a dry-run, read data from each species file !-------------------------------------------------------------- -#if defined( MODEL_CESM ) - ! Only read file on root thread if using CESM - IF ( Input_Opt%amIRoot ) THEN -#endif - ! Open file OPEN( NJ1, FILE=TRIM( THISFILE ), STATUS='OLD', IOSTAT=RC ) @@ -1028,14 +1015,10 @@ SUBROUTINE RD_AOD( Input_Opt, State_Chm, RC ) ! Close file CLOSE( NJ1 ) -#if defined( MODEL_CESM ) - ENDIF -#endif - ENDDO #if defined( MODEL_CESM ) - IF ( Input_Opt%amIRoot ) CALL freeUnit(NJ1) + CALL freeUnit(NJ1) #endif ! Free pointers