Changeset 2151 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Sep 5, 2019, 3:33:16 PM (6 years ago)

Author:

aslmd

Message:

changed old functions dexp dlog in generic exp and log

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• improvedclouds_mod.F (modified) (3 diffs)
• nlte_aux.F (modified) (5 diffs)
• nlte_calc.F (modified) (11 diffs)

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

@@ -157 +157 @@
 !        vrat_cld = log(rmax_cld/rmin_cld) / float(nbin_cld-1) *3.
 !        vrat_cld = exp(vrat_cld)
-        vrat_cld = dlog(rmax_cld/rmin_cld) / float(nbin_cld-1) *3.
-        vrat_cld = dexp(vrat_cld)
+        vrat_cld = log(rmax_cld/rmin_cld) / float(nbin_cld-1) *3.
+        vrat_cld = exp(vrat_cld)
         write(*,*) "vrat_cld", vrat_cld
 
@@ -192 +192 @@
         do i=1,nbin_cld+1
 !           rb_cld(i) = log(rb_cld(i))  
-            rb_cld(i) = dlog(rb_cld(i))  !! we save that so that it is not computed
+            rb_cld(i) = log(rb_cld(i))  !! we save that so that it is not computed
                                          !! at each timestep and gridpoint
         enddo
@@ -278 +278 @@
         No = zq(ig,l,igcm_dust_number)* tauscaling(ig) + 1.e-30
         Rn = rdust(ig,l)
-        Rn = -dlog(Rn) 
+        Rn = -log(Rn) 
         Rm = Rn - 3. * sigma_ice*sigma_ice  
         n_derf = derf( (rb_cld(1)+Rn) *dev2)

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

@@ -354 +354 @@
       factor =  (h-zy(k)) /  (zy(k+1)-zy(k))
       ap = dble( exp( log(py(k)) + log(py(k+1)/py(k)) * factor ) )
-      aco2 = dlog(con(k)) + dlog( con(k+1)/con(k) ) * dble(factor)
+      aco2 = log(con(k)) + log( con(k+1)/con(k) ) * dble(factor)
       aco2 = exp( aco2 )
       at = dble( ty(k) + (ty(k+1)-ty(k)) * factor )
@@ -392 +392 @@
       ap = dble( exp( log(py_cts(k)) +
      @     log(py_cts(k+1)/py_cts(k)) * factor ) )
-      aco2 = dlog(con(k)) + dlog( con(k+1)/con(k) ) * dble(factor)
+      aco2 = log(con(k)) + log( con(k+1)/con(k) ) * dble(factor)
       aco2 = exp( aco2 )
       at = dble( ty_cts(k) + (ty_cts(k+1)-ty_cts(k)) * factor )
@@ -1168 +1168 @@
             y3(i) = x3(j) + (x3(j+1)-x3(j)) * factor
          else
-            y1(i) = dexp( dlog(x1(j)) + dlog(x1(j+1)/x1(j)) * factor )
-            y2(i) = dexp( dlog(x2(j)) + dlog(x2(j+1)/x2(j)) * factor )
-            y3(i) = dexp( dlog(x3(j)) + dlog(x3(j+1)/x3(j)) * factor )
+            y1(i) = exp( log(x1(j)) + log(x1(j+1)/x1(j)) * factor )
+            y2(i) = exp( log(x2(j)) + log(x2(j+1)/x2(j)) * factor )
+            y3(i) = exp( log(x3(j)) + log(x3(j+1)/x3(j)) * factor )
          end if
 
@@ -1235 +1235 @@
             y4(i) = x4(j) + (x4(j+1)-x4(j)) * factor
          else
-            y1(i) = dexp( dlog(x1(j)) + dlog(x1(j+1)/x1(j)) * factor )
-            y2(i) = dexp( dlog(x2(j)) + dlog(x2(j+1)/x2(j)) * factor )
-            y3(i) = dexp( dlog(x3(j)) + dlog(x3(j+1)/x3(j)) * factor )
-            y4(i) = dexp( dlog(x4(j)) + dlog(x4(j+1)/x4(j)) * factor )
+            y1(i) = exp( log(x1(j)) + log(x1(j+1)/x1(j)) * factor )
+            y2(i) = exp( log(x2(j)) + log(x2(j+1)/x2(j)) * factor )
+            y3(i) = exp( log(x3(j)) + log(x3(j+1)/x3(j)) * factor )
+            y4(i) = exp( log(x4(j)) + log(x4(j+1)/x4(j)) * factor )
          end if
 
@@ -1300 +1300 @@
             y1(i) = x1(j) + (x1(j+1)-x1(j)) * factor 
          else
-            y1(i) = dexp( dlog(x1(j)) + dlog(x1(j+1)/x1(j)) * factor )
+            y1(i) = exp( log(x1(j)) + log(x1(j+1)/x1(j)) * factor )
          end if
 

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

@@ -80 +80 @@
          tyd(i) = dble(ty_cts(i))
          con(i) =  dble( co2y_cts(i) * imr(isot) )
-         correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tyd(i) )
+         correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tyd(i) )
          con(i) = con(i) * ( 1.d0 - correc )
          mr_cts(i) = dble(co2y_cts(i)/nty_cts(i))
@@ -201 +201 @@
 
          argumento = eqw / deltanudbl
-         tauinf(i) = dexp( - argumento )
+         tauinf(i) = exp( - argumento )
          if (i.eq.nl_cts_real) then
             taustar11_cts(i) = 0.0d0
@@ -282 +282 @@
       do i=1,nzy
          con(i) =  dble( co2y(i) * imr(isot) )
-         correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tvtbs(i) )
+         correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tvtbs(i) )
          con(i) = con(i) * ( 1.d0 - correc )
          mr(i) = dble(co2y(i)/nty(i))
@@ -424 +424 @@
 
          argumento = eqw / deltanudbl
-         tauinf(i) = dexp( - argumento )
+         tauinf(i) = exp( - argumento )
 
       end do
@@ -978 +978 @@
 
          argumento = eqw / deltanudbl
-         tauinf(i) = dexp( - argumento )
+         tauinf(i) = exp( - argumento )
 
 
@@ -1056 +1056 @@
 
             argumento = eqw / deltanudbl
-            tau(in,ir) = dexp( - argumento )
+            tau(in,ir) = exp( - argumento )
 
  2       continue
@@ -1127 +1127 @@
 
          argumento = eqw / deltanudbl
-         tau(in,ir) = dexp( - argumento )
+         tau(in,ir) = exp( - argumento )
 
  4    continue
@@ -1375 +1375 @@
       do i=1,nzy
          con(i) =  dble( co2y(i) * imr(isot) )
-         correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tvtbs(i) )
+         correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tvtbs(i) )
          con(i) = con(i) * ( 1.d0 - correc )
          mr(i) = dble(co2y(i)/nty(i))
@@ -1492 +1492 @@
             eqw = eqw + no(kr)*w
          end do
-         tauinf(i) = dexp( - eqw / deltanudbl )
+         tauinf(i) = exp( - eqw / deltanudbl )
          if (tauinf(i).lt.0.d0) tauinf(i) = 0.0d0
 
@@ -1645 +1645 @@
       do i=1,nzy
          con(i) =  dble( co2y(i) * imr(isot) )
-         correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tvtbs(i) )
+         correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tvtbs(i) )
          con(i) = con(i) * ( 1.d0 - correc )
          mr(i) = dble(co2y(i)/nty(i))
@@ -1759 +1759 @@
 
          argumento = eqw / deltanudbl
-         tau(in,ir) = dexp( - argumento )
+         tau(in,ir) = exp( - argumento )
 
  2    continue