Changeset 3353 for trunk/LMDZ.PLUTO.old

Timestamp:

May 31, 2024, 10:03:40 PM (6 months ago)

Author:

afalco

Message:

Pluto PCM:
Added zrecast & old sedim ;
Choose haze file ;
AF

Location:

trunk/LMDZ.PLUTO.old/libf/phypluto

Files:

• aeroptproperties.F90 (modified) (14 diffs)
• aerosol_mod.F90 (modified) (3 diffs)
• datafile_mod.F90 (modified) (1 diff)
• radii_mod.F90 (modified) (2 diffs)

trunk/LMDZ.PLUTO.old/libf/phypluto/aeroptproperties.F90

@@ -32 +32 @@
 !     ==============================================================
 
-!     Local variables 
+!     Local variables
 !     ---------------
 
@@ -247 +247 @@
         if(nuefftabsize.eq.1)then ! addded by RDW
            !print*,'Warning: no variance range in aeroptproperties'
-           nuefftab(1)=nueffrad(1,1,1)   ! 
+           nuefftab(1)=nueffrad(1,1,1)   !
         else
            do i = 0, nuefftabsize-1
@@ -253 +253 @@
            enddo
         endif
-      
+
       ! check that radiustab (table.dat) cover the reffrad used for haze : iaer=1
         minrad=min(MINVAL(radiustab(1,1,1:nsize(1,1))),MINVAL(radiustab(1,2,1:nsize(1,2))))
         maxrad=min(MAXVAL(radiustab(1,1,1:nsize(1,1))),MAXVAL(radiustab(1,2,1:nsize(1,2))))
-        IF ((MINVAL(reffrad).LE.minrad).OR.(MAXVAL(reffrad).GE.maxrad)) then
+        IF ((MINVAL(reffrad).LT.minrad).OR.(MAXVAL(reffrad).GT.maxrad)) then
            WRITE(*,*) 'Warning: particle size in grid box #'
-           WRITE(*,*) ig,' is too large to be used by the '
-           WRITE(*,*) 'radiative transfer; please extend the '
-           WRITE(*,*) 'interpolation grid to larger grain sizes.'
+           WRITE(*,*) ig,' is larger than optical properties. '
+           WRITE(*,*) 'reffrad=',MINVAL(reffrad),'-',MAXVAL(reffrad)
            WRITE(*,*) 'radiustab=',minrad,'-',maxrad
-           WRITE(*,*) 'reffrad=',MINVAL(reffrad),'-',MAXVAL(reffrad)
-           stop
+
+           ! ensure reffrad is within bounds of radiustab
+          !  WHERE(reffrad.LT.minrad)
+          !     reffrad=minrad
+          !  ENDWHERE
+          !  WHERE(reffrad.GT.maxrad)
+          !     reffrad=maxrad
+          !  ENDWHERE
+          !  WRITE(*,*) 'Truncated reffrad within radiustab bounds:'
+          !  WRITE(*,*) 'New reffrad=',MINVAL(reffrad),'-',MAXVAL(reffrad)
         ENDIF
 
@@ -283 +290 @@
         DO gausind=1,ngau
           drad=radiusr*radgaus(gausind)
-          radGAUSa(gausind,iaer,idomain)=radiusm-drad 
+          radGAUSa(gausind,iaer,idomain)=radiusm-drad
 
           ! formule 2.33 dans these JB
@@ -370 +377 @@
             qsqrefVISb(m,gausind,iaer)=                         &
                     (1-kint)*QVISsQREF(m,iaer,radius_id) +      &
-                    kint*QVISsQREF(m,iaer,radius_id+1)    
+                    kint*QVISsQREF(m,iaer,radius_id+1)
             omegVISb(m,gausind,iaer)=                           &
                     (1-kint)*omegaVIS(m,iaer,radius_id) +       &
@@ -420 +427 @@
           grid_i=floor(var_tmp)
 !         grid_i: get index of reffrad in refftab
-          
+
           IF (grid_i.GE.refftabsize) THEN
            WRITE(*,*) 'Warning: particle size in grid box #'
@@ -428 +435 @@
            grid_i=refftabsize-1
            kx = 1.
-           stop  
+           stop
           ELSEIF (grid_i.LE.1) THEN
            WRITE(*,*) 'Warning: particle size in grid box #'
@@ -461 +468 @@
                     EXP(-dista(j,1,iaer,idomain,gausind) *            &
                     dista(j,1,iaer,idomain,gausind) *                 &
-                    0.5e0/sizedistk2)/(radiusm-drad)                  
+                    0.5e0/sizedistk2)/(radiusm-drad)
                   dista(j,1,iaer,idomain,gausind) =                   &
                     dista(j,1,iaer,idomain,gausind) /                 &
@@ -502 +509 @@
 !                     Convolution:
                       qextVISgrid(j,1,m,iaer) =              &
-                        qextVISgrid(j,1,m,iaer) +            & 
+                        qextVISgrid(j,1,m,iaer) +            &
                         weightgaus(gausind) *                &
                         (                                    &
@@ -571 +578 @@
                       (                                      &
                       omegrefVISb(gausind,iaer) *            &
-                      qrefVISb(gausind,iaer) *               & 
+                      qrefVISb(gausind,iaer) *               &
                       pi*radGAUSb(gausind,iaer,idomain) *    &
                       radGAUSb(gausind,iaer,idomain) *       &
@@ -584 +591 @@
 
                   qrefVISgrid(j,1,iaer)=qrefVISgrid(j,1,iaer) /          &
-                                normd(j,1,iaer,idomain)       
+                                normd(j,1,iaer,idomain)
                   qscatrefVISgrid(j,1,iaer)=qscatrefVISgrid(j,1,iaer) /  &
                                 normd(j,1,iaer,idomain)
@@ -699 +706 @@
                       )
                   ENDDO
- 
+
                   qrefIRgrid(j,1,iaer)=qrefIRgrid(j,1,iaer) /          &
                                 normd(j,1,iaer,idomain)
@@ -752 +759 @@
             omegaIR3d(ig,lg,m,iaer) =                              &
                         k1*omegIRgrid(grid_i,1,m,iaer) +           &
-                        k2*omegIRgrid(grid_i+1,1,m,iaer) 
-            gIR3d(ig,lg,m,iaer) =                                  & 
+                        k2*omegIRgrid(grid_i+1,1,m,iaer)
+            gIR3d(ig,lg,m,iaer) =                                  &
                         k1*gIRgrid(grid_i,1,m,iaer) +              &
                         k2*gIRgrid(grid_i+1,1,m,iaer)
@@ -782 +789 @@
 
 
-      
+

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

@@ -62 +62 @@
       IF (firstcall) then
         firstcall=.false.
-        file_path=trim(datadir)//'/haze_prop/hazemmr.txt'
+      !   file_path=trim(datadir)//'/haze_prop/hazemmr.txt'
+        file_path=trim(datadir)//'/haze_prop/dens_haze.txt'
         open(224,file=file_path,form='formatted')
         do ifine=1,Nfine
@@ -68 +69 @@
         enddo
         close(224)
-        print*, 'TB22 read Haze MMR profile'
+        print*, 'AF24 read Haze MMR profile ',file_path
       ENDIF
 
@@ -79 +80 @@
       !                                --> kg m-3 --> kg/kg
       do iaer=1,naerkind
-            if(iaer.eq.iaero_haze.and.1.eq.2) then !TB22 activate/deactivate mmr or part density   
+            if(iaer.eq.iaero_haze.and.1.eq.1) then !TB22 activate/deactivate mmr or part density   
               !print*, 'Haze profile is fixed'
               do ig=1,ngrid

trunk/LMDZ.PLUTO.old/libf/phypluto/datafile_mod.F90

@@ -14 +14 @@
       
       ! aerdir stores aerosol properties files (optprop_*dat files)
-      character(LEN=7),parameter :: aerdir="optprop" 
+      character(LEN=18),parameter :: aerdir="aerosol_properties" 
 
       ! Data haze properties

trunk/LMDZ.PLUTO.old/libf/phypluto/radii_mod.F90

@@ -91 +91 @@
       IF (firstcall) then
         firstcall=.false.
-        file_path=trim(datadir)//'/haze_prop/hazerad.txt'
+        file_path=trim(datadir)//'/haze_prop/rad_haze.txt'
+      !   file_path=trim(datadir)//'/haze_prop/hazerad.txt'
         open(223,file=file_path,form='formatted')
         do ifine=1,Nfine
@@ -97 +98 @@
         enddo
         close(223)
-        print*, 'TB22 READ HAZERAD'
+        print*, 'AF24 READ HAZERAD ', file_path
       ENDIF