Changeset 2151
- Timestamp:
- Sep 5, 2019, 3:33:16 PM (5 years ago)
- Location:
- trunk/LMDZ.MARS/libf
- Files:
-
- 4 edited
-
aeronomars/paramfoto_compact.F (modified) (16 diffs)
-
phymars/improvedclouds_mod.F (modified) (3 diffs)
-
phymars/nlte_aux.F (modified) (5 diffs)
-
phymars/nlte_calc.F (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.MARS/libf/aeronomars/paramfoto_compact.F
r2042 r2151 4707 4707 4708 4708 if (o1d_eq(i).eq.'Y') then 4709 log1 = dlog10(o1dxpares(1))4710 log2 = dlog10(o1dxpares(2))4711 log3 = dlog10(o1dxpares(3))4709 log1 = log10(o1dxpares(1)) 4710 log2 = log10(o1dxpares(2)) 4711 log3 = log10(o1dxpares(3)) 4712 4712 avg_pares = avg(log1,log2,log3) 4713 4713 dif_pares = dif(log1,log2,log3,avg_pares) 4714 log1 = dlog10(o1dximpar(1))4715 log2 = dlog10(o1dximpar(2))4716 log3 = dlog10(o1dximpar(3))4714 log1 = log10(o1dximpar(1)) 4715 log2 = log10(o1dximpar(2)) 4716 log3 = log10(o1dximpar(3)) 4717 4717 avg_impar = avg(log1,log2,log3) 4718 4718 dif_impar = dif(log1,log2,log3,avg_impar) … … 4726 4726 4727 4727 if (oh_eq(i).eq.'Y') then 4728 log1 = dlog10(ohxpares(1))4729 log2 = dlog10(ohxpares(2))4730 log3 = dlog10(ohxpares(3))4728 log1 = log10(ohxpares(1)) 4729 log2 = log10(ohxpares(2)) 4730 log3 = log10(ohxpares(3)) 4731 4731 avg_pares = avg(log1,log2,log3) 4732 4732 dif_pares = dif(log1,log2,log3,avg_pares) 4733 log1 = dlog10(ohximpar(1))4734 log2 = dlog10(ohximpar(2))4735 log3 = dlog10(ohximpar(3))4733 log1 = log10(ohximpar(1)) 4734 log2 = log10(ohximpar(2)) 4735 log3 = log10(ohximpar(3)) 4736 4736 avg_impar = avg(log1,log2,log3) 4737 4737 dif_impar = dif(log1,log2,log3,avg_impar) … … 4746 4746 4747 4747 if (ho2_eq(i).eq.'Y') then 4748 log1 = dlog10(ho2xpares(1))4749 log2 = dlog10(ho2xpares(2))4750 log3 = dlog10(ho2xpares(3))4748 log1 = log10(ho2xpares(1)) 4749 log2 = log10(ho2xpares(2)) 4750 log3 = log10(ho2xpares(3)) 4751 4751 avg_pares = avg(log1,log2,log3) 4752 4752 dif_pares = dif(log1,log2,log3,avg_pares) 4753 log1 = dlog10(ho2ximpar(1))4754 log2 = dlog10(ho2ximpar(2))4755 log3 = dlog10(ho2ximpar(3))4753 log1 = log10(ho2ximpar(1)) 4754 log2 = log10(ho2ximpar(2)) 4755 log3 = log10(ho2ximpar(3)) 4756 4756 avg_impar = avg(log1,log2,log3) 4757 4757 dif_impar = dif(log1,log2,log3,avg_impar) … … 4765 4765 4766 4766 if (h_eq(i).eq.'Y') then 4767 log1 = dlog10(hxpares(1))4768 log2 = dlog10(hxpares(2))4769 log3 = dlog10(hxpares(3))4767 log1 = log10(hxpares(1)) 4768 log2 = log10(hxpares(2)) 4769 log3 = log10(hxpares(3)) 4770 4770 avg_pares = avg(log1,log2,log3) 4771 4771 dif_pares = dif(log1,log2,log3,avg_pares) 4772 log1 = dlog10(hximpar(1))4773 log2 = dlog10(hximpar(2))4774 log3 = dlog10(hximpar(3))4772 log1 = log10(hximpar(1)) 4773 log2 = log10(hximpar(2)) 4774 log3 = log10(hximpar(3)) 4775 4775 avg_impar = avg(log1,log2,log3) 4776 4776 dif_impar = dif(log1,log2,log3,avg_impar) … … 4786 4786 if(chemthermod.ge.2) then 4787 4787 if (n2d_eq(i).eq.'Y') then 4788 log1 = dlog10(n2dxpares(1))4789 log2 = dlog10(n2dxpares(2))4790 log3 = dlog10(n2dxpares(3))4788 log1 = log10(n2dxpares(1)) 4789 log2 = log10(n2dxpares(2)) 4790 log3 = log10(n2dxpares(3)) 4791 4791 avg_pares = avg(log1,log2,log3) 4792 4792 dif_pares = dif(log1,log2,log3,avg_pares) 4793 log1 = dlog10(n2dximpar(1))4794 log2 = dlog10(n2dximpar(2))4795 log3 = dlog10(n2dximpar(3))4793 log1 = log10(n2dximpar(1)) 4794 log2 = log10(n2dximpar(2)) 4795 log3 = log10(n2dximpar(3)) 4796 4796 avg_impar = avg(log1,log2,log3) 4797 4797 dif_impar = dif(log1,log2,log3,avg_impar) … … 4805 4805 4806 4806 if (no2_eq(i).eq.'Y') then 4807 log1 = dlog10(no2xpares(1))4808 log2 = dlog10(no2xpares(2))4809 log3 = dlog10(no2xpares(3))4807 log1 = log10(no2xpares(1)) 4808 log2 = log10(no2xpares(2)) 4809 log3 = log10(no2xpares(3)) 4810 4810 avg_pares = avg(log1,log2,log3) 4811 4811 dif_pares = dif(log1,log2,log3,avg_pares) 4812 log1 = dlog10(no2ximpar(1))4813 log2 = dlog10(no2ximpar(2))4814 log3 = dlog10(no2ximpar(3))4812 log1 = log10(no2ximpar(1)) 4813 log2 = log10(no2ximpar(2)) 4814 log3 = log10(no2ximpar(3)) 4815 4815 avg_impar = avg(log1,log2,log3) 4816 4816 dif_impar = dif(log1,log2,log3,avg_impar) … … 4829 4829 if(chemthermod.eq.3) then 4830 4830 if (cplus_eq(i).eq.'Y') then 4831 log1 = dlog10(cplusxpares(1))4832 log2 = dlog10(cplusxpares(2))4833 log3 = dlog10(cplusxpares(3))4831 log1 = log10(cplusxpares(1)) 4832 log2 = log10(cplusxpares(2)) 4833 log3 = log10(cplusxpares(3)) 4834 4834 avg_pares = avg(log1,log2,log3) 4835 4835 dif_pares = dif(log1,log2,log3,avg_pares) 4836 log1 = dlog10(cplusximpar(1))4837 log2 = dlog10(cplusximpar(2))4838 log3 = dlog10(cplusximpar(3))4836 log1 = log10(cplusximpar(1)) 4837 log2 = log10(cplusximpar(2)) 4838 log3 = log10(cplusximpar(3)) 4839 4839 avg_impar = avg(log1,log2,log3) 4840 4840 dif_impar = dif(log1,log2,log3,avg_impar) … … 4848 4848 4849 4849 if (coplus_eq(i).eq.'Y') then 4850 log1 = dlog10(coplusxpares(1))4851 log2 = dlog10(coplusxpares(2))4852 log3 = dlog10(coplusxpares(3))4850 log1 = log10(coplusxpares(1)) 4851 log2 = log10(coplusxpares(2)) 4852 log3 = log10(coplusxpares(3)) 4853 4853 avg_pares = avg(log1,log2,log3) 4854 4854 dif_pares = dif(log1,log2,log3,avg_pares) 4855 log1 = dlog10(coplusximpar(1))4856 log2 = dlog10(coplusximpar(2))4857 log3 = dlog10(coplusximpar(3))4855 log1 = log10(coplusximpar(1)) 4856 log2 = log10(coplusximpar(2)) 4857 log3 = log10(coplusximpar(3)) 4858 4858 avg_impar = avg(log1,log2,log3) 4859 4859 dif_impar = dif(log1,log2,log3,avg_impar) … … 4867 4867 4868 4868 if (oplus_eq(i).eq.'Y') then 4869 log1 = dlog10(oplusxpares(1))4870 log2 = dlog10(oplusxpares(2))4871 log3 = dlog10(oplusxpares(3))4869 log1 = log10(oplusxpares(1)) 4870 log2 = log10(oplusxpares(2)) 4871 log3 = log10(oplusxpares(3)) 4872 4872 avg_pares = avg(log1,log2,log3) 4873 4873 dif_pares = dif(log1,log2,log3,avg_pares) 4874 log1 = dlog10(oplusximpar(1))4875 log2 = dlog10(oplusximpar(2))4876 log3 = dlog10(oplusximpar(3))4874 log1 = log10(oplusximpar(1)) 4875 log2 = log10(oplusximpar(2)) 4876 log3 = log10(oplusximpar(3)) 4877 4877 avg_impar = avg(log1,log2,log3) 4878 4878 dif_impar = dif(log1,log2,log3,avg_impar) … … 4886 4886 4887 4887 if (n2plus_eq(i).eq.'Y') then 4888 log1 = dlog10(n2plusxpares(1))4889 log2 = dlog10(n2plusxpares(2))4890 log3 = dlog10(n2plusxpares(3))4888 log1 = log10(n2plusxpares(1)) 4889 log2 = log10(n2plusxpares(2)) 4890 log3 = log10(n2plusxpares(3)) 4891 4891 avg_pares = avg(log1,log2,log3) 4892 4892 dif_pares = dif(log1,log2,log3,avg_pares) 4893 log1 = dlog10(n2plusximpar(1))4894 log2 = dlog10(n2plusximpar(2))4895 log3 = dlog10(n2plusximpar(3))4893 log1 = log10(n2plusximpar(1)) 4894 log2 = log10(n2plusximpar(2)) 4895 log3 = log10(n2plusximpar(3)) 4896 4896 avg_impar = avg(log1,log2,log3) 4897 4897 dif_impar = dif(log1,log2,log3,avg_impar) … … 4905 4905 4906 4906 if (hplus_eq(i).eq.'Y') then 4907 log1 = dlog10(hplusxpares(1))4908 log2 = dlog10(hplusxpares(2))4909 log3 = dlog10(hplusxpares(3))4907 log1 = log10(hplusxpares(1)) 4908 log2 = log10(hplusxpares(2)) 4909 log3 = log10(hplusxpares(3)) 4910 4910 avg_pares = avg(log1,log2,log3) 4911 4911 dif_pares = dif(log1,log2,log3,avg_pares) 4912 log1 = dlog10(hplusximpar(1))4913 log2 = dlog10(hplusximpar(2))4914 log3 = dlog10(hplusximpar(3))4912 log1 = log10(hplusximpar(1)) 4913 log2 = log10(hplusximpar(2)) 4914 log3 = log10(hplusximpar(3)) 4915 4915 avg_impar = avg(log1,log2,log3) 4916 4916 dif_impar = dif(log1,log2,log3,avg_impar) … … 4924 4924 4925 4925 if (co2plus_eq(i).eq.'Y') then 4926 log1 = dlog10(co2plusxpares(1))4927 log2 = dlog10(co2plusxpares(2))4928 log3 = dlog10(co2plusxpares(3))4926 log1 = log10(co2plusxpares(1)) 4927 log2 = log10(co2plusxpares(2)) 4928 log3 = log10(co2plusxpares(3)) 4929 4929 avg_pares = avg(log1,log2,log3) 4930 4930 dif_pares = dif(log1,log2,log3,avg_pares) 4931 log1 = dlog10(co2plusximpar(1))4932 log2 = dlog10(co2plusximpar(2))4933 log3 = dlog10(co2plusximpar(3))4931 log1 = log10(co2plusximpar(1)) 4932 log2 = log10(co2plusximpar(2)) 4933 log3 = log10(co2plusximpar(3)) 4934 4934 avg_impar = avg(log1,log2,log3) 4935 4935 dif_impar = dif(log1,log2,log3,avg_impar) … … 4943 4943 4944 4944 if (o2plus_eq(i).eq.'Y') then 4945 log1 = dlog10(o2plusxpares(1))4946 log2 = dlog10(o2plusxpares(2))4947 log3 = dlog10(o2plusxpares(3))4945 log1 = log10(o2plusxpares(1)) 4946 log2 = log10(o2plusxpares(2)) 4947 log3 = log10(o2plusxpares(3)) 4948 4948 avg_pares = avg(log1,log2,log3) 4949 4949 dif_pares = dif(log1,log2,log3,avg_pares) 4950 log1 = dlog10(o2plusximpar(1))4951 log2 = dlog10(o2plusximpar(2))4952 log3 = dlog10(o2plusximpar(3))4950 log1 = log10(o2plusximpar(1)) 4951 log2 = log10(o2plusximpar(2)) 4952 log3 = log10(o2plusximpar(3)) 4953 4953 avg_impar = avg(log1,log2,log3) 4954 4954 dif_impar = dif(log1,log2,log3,avg_impar) … … 4962 4962 4963 4963 if (noplus_eq(i).eq.'Y') then 4964 log1 = dlog10(noplusxpares(1))4965 log2 = dlog10(noplusxpares(2))4966 log3 = dlog10(noplusxpares(3))4964 log1 = log10(noplusxpares(1)) 4965 log2 = log10(noplusxpares(2)) 4966 log3 = log10(noplusxpares(3)) 4967 4967 avg_pares = avg(log1,log2,log3) 4968 4968 dif_pares = dif(log1,log2,log3,avg_pares) 4969 log1 = dlog10(noplusximpar(1))4970 log2 = dlog10(noplusximpar(2))4971 log3 = dlog10(noplusximpar(3))4969 log1 = log10(noplusximpar(1)) 4970 log2 = log10(noplusximpar(2)) 4971 log3 = log10(noplusximpar(3)) 4972 4972 avg_impar = avg(log1,log2,log3) 4973 4973 dif_impar = dif(log1,log2,log3,avg_impar) … … 4981 4981 4982 4982 if (nplus_eq(i).eq.'Y') then 4983 log1 = dlog10(nplusxpares(1))4984 log2 = dlog10(nplusxpares(2))4985 log3 = dlog10(nplusxpares(3))4983 log1 = log10(nplusxpares(1)) 4984 log2 = log10(nplusxpares(2)) 4985 log3 = log10(nplusxpares(3)) 4986 4986 avg_pares = avg(log1,log2,log3) 4987 4987 dif_pares = dif(log1,log2,log3,avg_pares) 4988 log1 = dlog10(nplusximpar(1))4989 log2 = dlog10(nplusximpar(2))4990 log3 = dlog10(nplusximpar(3))4988 log1 = log10(nplusximpar(1)) 4989 log2 = log10(nplusximpar(2)) 4990 log3 = log10(nplusximpar(3)) 4991 4991 avg_impar = avg(log1,log2,log3) 4992 4992 dif_impar = dif(log1,log2,log3,avg_impar) … … 5000 5000 5001 5001 if (hco2plus_eq(i).eq.'Y') then 5002 log1 = dlog10(hco2plusxpares(1))5003 log2 = dlog10(hco2plusxpares(2))5004 log3 = dlog10(hco2plusxpares(3))5002 log1 = log10(hco2plusxpares(1)) 5003 log2 = log10(hco2plusxpares(2)) 5004 log3 = log10(hco2plusxpares(3)) 5005 5005 avg_pares = avg(log1,log2,log3) 5006 5006 dif_pares = dif(log1,log2,log3,avg_pares) 5007 log1 = dlog10(hco2plusximpar(1))5008 log2 = dlog10(hco2plusximpar(2))5009 log3 = dlog10(hco2plusximpar(3))5007 log1 = log10(hco2plusximpar(1)) 5008 log2 = log10(hco2plusximpar(2)) 5009 log3 = log10(hco2plusximpar(3)) 5010 5010 avg_impar = avg(log1,log2,log3) 5011 5011 dif_impar = dif(log1,log2,log3,avg_impar) -
trunk/LMDZ.MARS/libf/phymars/improvedclouds_mod.F
r1996 r2151 157 157 ! vrat_cld = log(rmax_cld/rmin_cld) / float(nbin_cld-1) *3. 158 158 ! vrat_cld = exp(vrat_cld) 159 vrat_cld = dlog(rmax_cld/rmin_cld) / float(nbin_cld-1) *3.160 vrat_cld = dexp(vrat_cld)159 vrat_cld = log(rmax_cld/rmin_cld) / float(nbin_cld-1) *3. 160 vrat_cld = exp(vrat_cld) 161 161 write(*,*) "vrat_cld", vrat_cld 162 162 … … 192 192 do i=1,nbin_cld+1 193 193 ! rb_cld(i) = log(rb_cld(i)) 194 rb_cld(i) = dlog(rb_cld(i)) !! we save that so that it is not computed194 rb_cld(i) = log(rb_cld(i)) !! we save that so that it is not computed 195 195 !! at each timestep and gridpoint 196 196 enddo … … 278 278 No = zq(ig,l,igcm_dust_number)* tauscaling(ig) + 1.e-30 279 279 Rn = rdust(ig,l) 280 Rn = - dlog(Rn)280 Rn = -log(Rn) 281 281 Rm = Rn - 3. * sigma_ice*sigma_ice 282 282 n_derf = derf( (rb_cld(1)+Rn) *dev2) -
trunk/LMDZ.MARS/libf/phymars/nlte_aux.F
r1124 r2151 354 354 factor = (h-zy(k)) / (zy(k+1)-zy(k)) 355 355 ap = dble( exp( log(py(k)) + log(py(k+1)/py(k)) * factor ) ) 356 aco2 = dlog(con(k)) + dlog( con(k+1)/con(k) ) * dble(factor)356 aco2 = log(con(k)) + log( con(k+1)/con(k) ) * dble(factor) 357 357 aco2 = exp( aco2 ) 358 358 at = dble( ty(k) + (ty(k+1)-ty(k)) * factor ) … … 392 392 ap = dble( exp( log(py_cts(k)) + 393 393 @ log(py_cts(k+1)/py_cts(k)) * factor ) ) 394 aco2 = dlog(con(k)) + dlog( con(k+1)/con(k) ) * dble(factor)394 aco2 = log(con(k)) + log( con(k+1)/con(k) ) * dble(factor) 395 395 aco2 = exp( aco2 ) 396 396 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 1169 1169 else 1170 y1(i) = dexp( dlog(x1(j)) + dlog(x1(j+1)/x1(j)) * factor )1171 y2(i) = dexp( dlog(x2(j)) + dlog(x2(j+1)/x2(j)) * factor )1172 y3(i) = dexp( dlog(x3(j)) + dlog(x3(j+1)/x3(j)) * factor )1170 y1(i) = exp( log(x1(j)) + log(x1(j+1)/x1(j)) * factor ) 1171 y2(i) = exp( log(x2(j)) + log(x2(j+1)/x2(j)) * factor ) 1172 y3(i) = exp( log(x3(j)) + log(x3(j+1)/x3(j)) * factor ) 1173 1173 end if 1174 1174 … … 1235 1235 y4(i) = x4(j) + (x4(j+1)-x4(j)) * factor 1236 1236 else 1237 y1(i) = dexp( dlog(x1(j)) + dlog(x1(j+1)/x1(j)) * factor )1238 y2(i) = dexp( dlog(x2(j)) + dlog(x2(j+1)/x2(j)) * factor )1239 y3(i) = dexp( dlog(x3(j)) + dlog(x3(j+1)/x3(j)) * factor )1240 y4(i) = dexp( dlog(x4(j)) + dlog(x4(j+1)/x4(j)) * factor )1237 y1(i) = exp( log(x1(j)) + log(x1(j+1)/x1(j)) * factor ) 1238 y2(i) = exp( log(x2(j)) + log(x2(j+1)/x2(j)) * factor ) 1239 y3(i) = exp( log(x3(j)) + log(x3(j+1)/x3(j)) * factor ) 1240 y4(i) = exp( log(x4(j)) + log(x4(j+1)/x4(j)) * factor ) 1241 1241 end if 1242 1242 … … 1300 1300 y1(i) = x1(j) + (x1(j+1)-x1(j)) * factor 1301 1301 else 1302 y1(i) = dexp( dlog(x1(j)) + dlog(x1(j+1)/x1(j)) * factor )1302 y1(i) = exp( log(x1(j)) + log(x1(j+1)/x1(j)) * factor ) 1303 1303 end if 1304 1304 -
trunk/LMDZ.MARS/libf/phymars/nlte_calc.F
r1918 r2151 80 80 tyd(i) = dble(ty_cts(i)) 81 81 con(i) = dble( co2y_cts(i) * imr(isot) ) 82 correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tyd(i) )82 correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tyd(i) ) 83 83 con(i) = con(i) * ( 1.d0 - correc ) 84 84 mr_cts(i) = dble(co2y_cts(i)/nty_cts(i)) … … 201 201 202 202 argumento = eqw / deltanudbl 203 tauinf(i) = dexp( - argumento )203 tauinf(i) = exp( - argumento ) 204 204 if (i.eq.nl_cts_real) then 205 205 taustar11_cts(i) = 0.0d0 … … 282 282 do i=1,nzy 283 283 con(i) = dble( co2y(i) * imr(isot) ) 284 correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tvtbs(i) )284 correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tvtbs(i) ) 285 285 con(i) = con(i) * ( 1.d0 - correc ) 286 286 mr(i) = dble(co2y(i)/nty(i)) … … 424 424 425 425 argumento = eqw / deltanudbl 426 tauinf(i) = dexp( - argumento )426 tauinf(i) = exp( - argumento ) 427 427 428 428 end do … … 978 978 979 979 argumento = eqw / deltanudbl 980 tauinf(i) = dexp( - argumento )980 tauinf(i) = exp( - argumento ) 981 981 982 982 … … 1056 1056 1057 1057 argumento = eqw / deltanudbl 1058 tau(in,ir) = dexp( - argumento )1058 tau(in,ir) = exp( - argumento ) 1059 1059 1060 1060 2 continue … … 1127 1127 1128 1128 argumento = eqw / deltanudbl 1129 tau(in,ir) = dexp( - argumento )1129 tau(in,ir) = exp( - argumento ) 1130 1130 1131 1131 4 continue … … 1375 1375 do i=1,nzy 1376 1376 con(i) = dble( co2y(i) * imr(isot) ) 1377 correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tvtbs(i) )1377 correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tvtbs(i) ) 1378 1378 con(i) = con(i) * ( 1.d0 - correc ) 1379 1379 mr(i) = dble(co2y(i)/nty(i)) … … 1492 1492 eqw = eqw + no(kr)*w 1493 1493 end do 1494 tauinf(i) = dexp( - eqw / deltanudbl )1494 tauinf(i) = exp( - eqw / deltanudbl ) 1495 1495 if (tauinf(i).lt.0.d0) tauinf(i) = 0.0d0 1496 1496 … … 1645 1645 do i=1,nzy 1646 1646 con(i) = dble( co2y(i) * imr(isot) ) 1647 correc = 2.d0 * dexp( -ee*dble(elow(isot,2))/tvtbs(i) )1647 correc = 2.d0 * exp( -ee*dble(elow(isot,2))/tvtbs(i) ) 1648 1648 con(i) = con(i) * ( 1.d0 - correc ) 1649 1649 mr(i) = dble(co2y(i)/nty(i)) … … 1759 1759 1760 1760 argumento = eqw / deltanudbl 1761 tau(in,ir) = dexp( - argumento )1761 tau(in,ir) = exp( - argumento ) 1762 1762 1763 1763 2 continue
Note: See TracChangeset
for help on using the changeset viewer.
