Changeset 2904 for trunk/LMDZ.MARS/util

Timestamp:

Feb 23, 2023, 6:32:38 PM (2 years ago)

Author:

abierjon

Message:

Mars GCM:
In aeroptical.F90, handle cases between :

• "all opacities in the column are missing values" (in which case we set column-integrated tau=missval)

and

• "at least one opacity is not a missing value but is 0" (in which case we set tau=0)

AB

File:

• trunk/LMDZ.MARS/util/aeroptical.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/util/aeroptical.F90 ¶

@@ -426 +426 @@
     ENDIF
 
-    do ilon=1,lonlen
-     do ilat=1,latlen
-      do it=1,timelen
+    do it=1,timelen
+     do ilon=1,lonlen
+      do ilat=1,latlen
+      
        do ialt=1,altlen
          IF (reffval_ok(iaer).ne.0) THEN ! if the user gave a variable's name and not a value
@@ -439 +440 @@
            ! out of the optpropfile boundaries
            opa_aer(ilon,ilat,ialt,it)=missval(iaer)
-           write(aeroptlogfileID,*) "(mmr = ",mmr(ilon,ilat,ialt,it),"kg/kg)"
+           write(aeroptlogfileID,*) "(mmr(", ilon, ",", ilat, ",", ialt, ",", it,") = ",mmr(ilon,ilat,ialt,it),"kg/kg)"
            write(aeroptlogfileID,*)""
            
@@ -470 +471 @@
          ! COMPUTATION OF THE COLUMN-INTEGRATED OPTICAL DEPTH [/]
          if (tau_aer(ilon,ilat,it).eq.0) then
-           tau_aer(ilon,ilat,it)= missval(iaer)
+           ! Handle cases between "all opacities are missing values" (in which case we set tau=missval)
+           ! and "at least one opacity is not a missing value but is 0" (in which case we set tau=0)
+           if (ANY(opa_aer(ilon,ilat,:,it).ne.missval(iaer))) then
+             ! if at least one opacity in the column is not a missing value, i.e at least one opacity equals 0
+             tau_aer(ilon,ilat,it)= 0
+           else
+             tau_aer(ilon,ilat,it)= missval(iaer)
+           endif
          endif
        endif ! trim(compute_col).eq."yes"
        
-      enddo ! it
-     enddo ! ilat
-    enddo ! ilon
+      enddo ! ilat
+     enddo ! ilon
+    enddo ! it
 
 !==========================================================================