Changeset 824 for codes

Timestamp:

04/30/19 16:59:07 (5 years ago)

Author:

dubos

Message:

devel : fix errors caught by F_Front

Location:

codes/icosagcm/devel/src

Files:

• dcmip/dcmip2016_kessler_physic.f90 (modified) (2 diffs)
• diagnostics/check_conserve.f90 (modified) (2 diffs)

codes/icosagcm/devel/src/dcmip/dcmip2016_kessler_physic.f90

@@ -158 +158 @@
 
       ! Autoconversion and accretion rates following KW eq. 2.13a,b
-      qrprod = qc(k) - (qc(k)-dt0*amax1(.001*(qc(k)-.001d0),0.))/(1.d0+dt0*2.2d0*qr(k)**.875)
-      qc(k) = amax1(qc(k)-qrprod,0.)
-      qr(k) = amax1(qr(k)+qrprod+sed(k),0.)
+      qrprod = qc(k) - (qc(k)-dt0*max(.001*(qc(k)-.001d0),0.))/(1.d0+dt0*2.2d0*qr(k)**.875)
+      qc(k) = max(qc(k)-qrprod,0.)
+      qr(k) = max(qr(k)+qrprod+sed(k),0.)
 
       ! Saturation vapor mixing ratio (gm/gm) following KW eq. 2.11
@@ -168 +168 @@
 
       ! Evaporation rate following KW eq. 2.14a,b
-      ern = amin1(dt0*(((1.6d0+124.9d0*(r(k)*qr(k))**.2046)  &
+      ern = min(dt0*(((1.6d0+124.9d0*(r(k)*qr(k))**.2046)  &
             *(r(k)*qr(k))**.525)/(2550000d0*pc(k)            &
             /(3.8d0 *qvs)+540000d0))*(dim(qvs,qv(k))         &
-            /(r(k)*qvs)),amax1(-prod-qc(k),0.),qr(k))
+            /(r(k)*qvs)),max(-prod-qc(k),0.),qr(k))
 
       ! Saturation adjustment following KW eq. 3.10
-      theta(k)= theta(k) + 2500000d0/(1003.d0*pk(k))*(amax1( prod,-qc(k))-ern)
-      qv(k) = amax1(qv(k)-max(prod,-qc(k))+ern,0.)
+      theta(k)= theta(k) + 2500000d0/(1003.d0*pk(k))*(max( prod,-qc(k))-ern)
+      qv(k) = max(qv(k)-max(prod,-qc(k))+ern,0.)
       qc(k) = qc(k)+max(prod,-qc(k))
       qr(k) = qr(k)-ern

codes/icosagcm/devel/src/diagnostics/check_conserve.f90

@@ -66 +66 @@
 
     REAL(rstd),POINTER :: p(:,:),rhodz(:,:) 
-    INTEGER :: ind,ierr
+    INTEGER :: ind
     REAL(rstd) :: mtot, angtot, rmsdpdt
     REAL(rstd) :: etot, stot, ang_mass, ang_vel, ang_velp, ang_velm, rmsvtot, ztot
@@ -171 +171 @@
 
     REAL(rstd),POINTER :: p(:,:),rhodz(:,:) 
-    INTEGER::ind,ierr
+    INTEGER::ind
     REAL(rstd) :: mtot, ztot, rmsdpdt, etot,stot,rmsv, ang_mass, ang_vel, ang_velp, ang_velm