Changeset 3650 for trunk

Timestamp:

Feb 26, 2025, 10:41:29 AM (4 months ago)

Author:

afalco

Message:

Pluto: fix bug in aerosol_mod in parallel. Setting deprecated aerohaze=true gives an error.
AF

Location:

trunk/LMDZ.PLUTO/libf/phypluto

Files:

• aerosol_mod.F90 (modified) (1 diff)
• inifis_mod.F90 (modified) (5 diffs)
• interp_line.F (modified) (2 diffs)

trunk/LMDZ.PLUTO/libf/phypluto/aerosol_mod.F90 ¶

@@ -75 +75 @@
             STOP "No filename given for haze profile. Either set hazemmr_file or hazedens_file"
         endif
-
-        if (is_master) then
-            if(.not.allocated(levdat)) then
-                allocate(levdat(Nfine))
-            endif
-            if(.not.allocated(densdat)) then
-                allocate(densdat(Nfine))
-            endif
+!$OMP MASTER
+        if(.not.allocated(levdat)) then
+            allocate(levdat(Nfine))
+        endif
+        if(.not.allocated(densdat)) then
+            allocate(densdat(Nfine))
+        endif
 
 
-            file_path=trim(datadir)//'/haze_prop/'//file_name
-            open(224,file=file_path,form='formatted')
-            do ifine=1,Nfine
-            read(224,*) levdat(ifine), densdat(ifine)
-            enddo
-            close(224)
-            print*, 'Read Haze profile: ',file_path
-        endif
+        file_path=trim(datadir)//'/haze_prop/'//file_name
+        open(224,file=file_path,form='formatted')
+        do ifine=1,Nfine
+        read(224,*) levdat(ifine), densdat(ifine)
+        enddo
+        close(224)
+        print*, 'Read Haze profile: ',file_path
+!$OMP END MASTER
 !$OMP BARRIER
       ENDIF

trunk/LMDZ.PLUTO/libf/phypluto/inifis_mod.F90 ¶

@@ -83 +83 @@
   REAL SSUM
 
+  ! deprecated parameter
+  logical aerohaze
+
   ! Initialize flags lunout, prt_level, debug (in print_control_mod)
   CALL init_print_control
@@ -679 +682 @@
      call getin_p("callmufi",callmufi)
      if (is_master) write(*,*)" callmufi = ",callmufi
-     
+
      ! sanity check
      if (callmufi.and.(.not.tracer)) then
@@ -686 +689 @@
        stop
      endif
- 
+
      if (is_master) write(*,*) "Path to microphysical config file?"
      config_mufi='datagcm/microphysics/config.cfg' ! default value
@@ -701 +704 @@
      call getin_p("aerfprop_file",aerfprop_file)
      if (is_master) write(*,*) trim(rname)//" aerfprop_file = ",trim(aerfprop_file)
- 
+
      if (is_master) write(*,*) "Use haze production from CH4 photolysis or production rate?"
      call_haze_prod_pCH4=.false. ! default value
      call getin_p("call_haze_prod_pCH4",call_haze_prod_pCH4)
      if (is_master) write(*,*)" call_haze_prod_pCH4 = ",call_haze_prod_pCH4
- 
+
      if (is_master) write(*,*) "Pressure level of aerosols production (Pa)?"
      haze_p_prod=1.0e-2 ! default value
      call getin_p("haze_p_prod",haze_p_prod)
      if (is_master) write(*,*)" haze_p_prod = ",haze_p_prod
-     
+
      if (is_master) write(*,*) "Aerosol production rate (kg.m-2.s-1)?"
      haze_tx_prod=9.8e-14 ! default value
      call getin_p("haze_tx_prod",haze_tx_prod)
      if (is_master) write(*,*)" haze_tx_prod = ",haze_tx_prod
- 
+
      if (is_master) write(*,*) "Equivalent radius production (m)?"
      haze_rc_prod=1.0e-9 ! default value
      call getin_p("haze_rc_prod",haze_rc_prod)
      if (is_master) write(*,*)" haze_rc_prod = ",haze_rc_prod
- 
+
      if (is_master) write(*,*) "Monomer radius (m)?"
      haze_rm=1.0e-8 ! default value
      call getin_p("haze_rm",haze_rm)
      if (is_master) write(*,*)" haze_rm = ",haze_rm
- 
+
      if (is_master) write(*,*) "Aerosol's fractal dimension?"
      haze_df=2.0 ! default value
      call getin_p("haze_df",haze_df)
      if (is_master) write(*,*)" haze_df = ",haze_df
- 
+
      if (is_master) write(*,*) "Aerosol density (kg.m-3)?"
      haze_rho=800.0 ! default value
      call getin_p("haze_rho",haze_rho)
      if (is_master) write(*,*)" haze_rho = ",haze_rho
- 
+
      if (is_master) write(*,*) "Radius of air molecule (m)?"
      air_rad=1.75e-10 ! default value
      call getin_p("air_rad",air_rad)
      if (is_master) write(*,*)" air_rad = ",air_rad
-     
+
      ! Pluto haze model
      ! ~~~~~~~~~~~~~~~~
@@ -794 +797 @@
      if (is_master)write(*,*)trim(rname)//&
      "optichaze = ",optichaze
+
+     aerohaze=.false. ! default value
+     call getin_p("aerohaze",aerohaze)
+     if (aerohaze) then
+      if (is_master) write(*,*)trim(rname)//": aerohaze is deprecated.",&
+      "it is now called optichaze=.true."
+      call abort_physic(rname,"aerohaze is deprecated. It is now called optichaze",1)
+     endif
 
      if (is_master)write(*,*)trim(rname)//&

trunk/LMDZ.PLUTO/libf/phypluto/interp_line.F ¶

@@ -9 +9 @@
 !  extrapolation, y2() is set to the value y1() corresponding to
 !  the nearby x1(:) point
-!  
+!
 c-----------------------------------------------------------------------
 !  arguments
@@ -25 +25 @@
 ! local variables:
       integer i,j
-      
+
 
       do i=1,len2