Changeset 2397 for trunk

Timestamp:

Jul 3, 2020, 3:30:08 PM (4 years ago)

Author:

emillour

Message:

Mars GCM:
nirco2abs: handle the (rare) case when input O mixing ratio is negative to avoid
generating NaN heating rates.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/nirco2abs.F (modified) (4 diffs)

trunk/LMDZ.MARS/README

@@ -3114 +3114 @@
 CO2 microphysics: correction on improvedco2cloud.F90
                   sublimation of co2_ice if ccnco2 number < 1
+
+== 03/07/2020 == EM
+nirco2abs: handle the (rare) case when input O mixing ratio is negative to avoid
+generating NaN heating rates.

trunk/LMDZ.MARS/libf/phymars/nirco2abs.F

@@ -48 +48 @@
 c    ------------------
 c
-#include "callkeys.h"
-#include "nirdata.h"
+      include "callkeys.h"
+      include "nirdata.h"
 
 c-----------------------------------------------------------------------
@@ -147 +147 @@
                if(nircorr.eq.1) then
                   cor0=1./(1.+n_p0/pplay(ig,l))**n_b
-                  if(pq(ig,l,ico2).gt.1.e-6) then
+                  if(pq(ig,l,ico2).gt.1.e-6) then                    
                      oco2gcm=pq(ig,l,io)/pq(ig,l,ico2)
+                     ! handle the rare cases when pq(ig,l,io)<0
+                     if (pq(ig,l,io).lt.0) then
+                       write(*,*) "nirco2abs: warning ig=",ig," l=",l,
+     &                            " pq(ig,l,io)=",pq(ig,l,io)
+                       oco2gcm=1.e6
+                     endif
                   else
                      oco2gcm=1.e6
@@ -229 +235 @@
       END IF
 
-      return
       end 
 
@@ -258 +263 @@
          endif
       enddo
-      return
       end