Changeset 2257 for trunk

Timestamp:

Mar 12, 2020, 9:00:47 AM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Transparent adaptations to be able to compile using the PGI compiler:

• look for NaN using logical test a/=a instead of isnan() which is not standard
• use erf() function as it handles single/double precision (derf is obsolete)

EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/co2cloud.F (modified) (1 diff)
• libf/phymars/improvedco2clouds_mod.F (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -2878 +2878 @@
 == 10/03/2020 == AB
 Bug fix in topmons_mod : the array rhobarz(ig,l) (density at interlayer levels) had only nlayer allocated instead of nlayer+1 (caused issues in calculating the topdust detrainment at the top of the model)
+
+== 12/03/2020 == EM
+Transparent adaptations to be able to compile using the PGI compiler:
+- look for NaN using logical test a/=a instead of isnan() which is not standard
+- use erf() function as it handles single/double precision (derf is obsolete)
+ 

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

@@ -840 +840 @@
                 No=Nccnco2*tauscaling(ig)
                 Rn=-dlog(riceco2(ig,l))
-                n_derf = derf( (rb_cldco2(1)+Rn) *dev2)
+                n_derf = erf( (rb_cldco2(1)+Rn) *dev2)
                 Qext1bins2(ig,l)=0.
                 do i = 1, nbinco2_cld 
                  n_aer(i) = -0.5 * No * n_derf !! this ith previously computed
-                 n_derf = derf((rb_cldco2(i+1)+Rn) *dev2)
+                 n_derf = erf((rb_cldco2(i+1)+Rn) *dev2)
                  n_aer(i) = n_aer(i) + 0.5 * No * n_derf
                  Qext1bins2(ig,l)=Qext1bins2(ig,l)+Qext1bins(i)*n_aer(i)

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

@@ -552 +552 @@
 c Ic_rice Mass transfer rate (kg/s) for a rice particle >0 si croissance ! 
              
-              if (isnan(Ic_rice) .or. Ic_rice .eq. 0.) then 
+              if ( (Ic_rice.ne.Ic_rice) ! will be true if it is Nan 
+     &               .or. Ic_rice .eq. 0.) then 
                  Ic_rice=0.
                  subpdtcloudco2(ig,l)=-sum_subpdt(ig,l)