Merge branch 'r3_test_pub'

Author: rurata

.gitignore

@@ -0,0 +1,2 @@
+# Specify filepatterns you want git to ignore.
+.DS_Store

atmos_param_mars/Rad/ames_rt_interface.F90

@@ -17,13 +17,13 @@ subroutine ames_rt(is,js,id,jd,kd,ntrace,p_half,p_full,             &
                t,tsurf,r,trans,flx_sfc,                             &
                albedo,sfc_emiss,coszro,                             &
                dustref,dustref_bin,dustref_fix,                     &
-               cldref,cldco2ref,cldicebin,                          &
+               cldref,cldicebin,                          &
                dosw, dolw,                                          &
                rorbit,                                              &
                heatra,hsw,out_solar_flx,                            &
                rsolar,                                              &
                irupflx,irdnflx,swupflx,swdnflx,swnetflx,irnetflx,   &
-               taudust,taucloud,tauco2cloud,taudust_mom,            &
+               taudust,taucloud,taudust_mom,            &
                lw_heating_band,lw_15umHR,diag,tstrat_in,            &
                tstrat_dt,                                           &
                taudust_reff,taudust_fix,                            &
@@ -41,7 +41,7 @@ subroutine ames_rt(is,js,id,jd,kd,ntrace,p_half,p_full,             &
 real,intent(in),    dimension(id,jd,kd)   :: dustref_fix   ! input fixed dust opacity
 real,intent(in),    dimension(id,jd,kd)   :: dustref_bin   ! input bin dust opacity
 real,intent(inout), dimension(id,jd,kd,2)   :: cldref        ! output cloud opacity from RT
-real,intent(inout), dimension(id,jd,kd)   :: cldco2ref     ! output co2 cloud opacity from RT
+!real,intent(inout), dimension(id,jd,kd)   :: cldco2ref     ! output co2 cloud opacity from RT
 real, intent(in),   dimension(id,jd,kd)   :: cldicebin     ! input bin cloud opacity
 real,intent(in),    dimension(id,jd)      :: albedo, &     ! surface albedo
                                             sfc_emiss, &   ! surface emissivity
@@ -69,7 +69,7 @@ subroutine ames_rt(is,js,id,jd,kd,ntrace,p_half,p_full,             &
 
 !   Opacities TB18c
 real,intent(inout), dimension(size(t,1),size(t,2),2) :: taudust, &      ! total column dust opacity
-                                                    tauco2cloud, &     ! total column co2 cloud opacity
+!                                                    tauco2cloud, &     ! total column co2 cloud opacity
                                                     taudust_mom, &     ! moment dust column dust opacity
                                                     taudust_fix     ! fixed dust column dust opacity
 real,intent(inout), dimension(size(t,1),size(t,2),4) :: taucloud     ! total column h2o cloud opacity
@@ -133,7 +133,7 @@ subroutine ames_rt(is,js,id,jd,kd,ntrace,p_half,p_full,             &
 flx_sfc = 0.
 taudust = 0.
 taucloud = 0.
-tauco2cloud = 0.
+!tauco2cloud = 0.
 taudust_reff = 0.
 mwratio = mwco2/mwh2o
 taudust_fix = 0.
@@ -225,7 +225,6 @@ subroutine ames_rt(is,js,id,jd,kd,ntrace,p_half,p_full,             &
                    qtrace=r(i,j,:,:),cldice_bin= cldicecol,             &
                    taudust_diagARG=taudust(i,j,:),                  &
                    taucloud_diagARG=taucloud(i,j,:),                &
-                   tauco2cloud_diagARG=tauco2cloud(i,j,:),                &
                    fmnetvARG=fmnetv,fluxdniARG=fluxdni,             &
                    outsolARG=out_solar_flx(i,j),                    &
                    swtotARG=sfmars,fluxupvARG=swupflx(i,j,:),       &
@@ -234,12 +233,9 @@ subroutine ames_rt(is,js,id,jd,kd,ntrace,p_half,p_full,             &
                    lw_heating_spec=lw_heating_spec,htrt2=htrt2,     &
                    diag=diag,taurefd_out=dustref(i,j,:),            &
                    taurefc_out=cldref(i,j,:,:),                       &
-                   taurefco2c_out=cldco2ref(i,j,:),                 &
                    taudust_momARG=taudust_mom(i,j,:),               &
                    taudust_fixARG=taudust_fix(i,j,:),               &
                    tstrat_dt=tstrat_dt(i,j),                        &
-                   nco2=nco2,                                       &
-                   nice_blk=nice_blk,                               &
                    taudust_reffARG=taudust_tmp(:,:),                &
                    tbands= tbands(i,j,:)                )
 

atmos_param_mars/Rad/radiation_driver.F90

@@ -50,7 +50,6 @@ module radiation_driver_mod
 integer :: rad_calc_intv = 1848                 ! radiative time step
 
 logical :: do_diurnal_avg_rad = .false.         ! do average insolation
-logical :: do_rad_diagnostic_calc = .false.     ! do diagnostic calculation with specified temperature and dust
 
 logical :: use_ames_lw_rad = .true.            ! use ames IR radiation
 logical :: use_ames_sw_rad = .true.            ! use ames visible radiation
@@ -112,9 +111,8 @@ module radiation_driver_mod
 integer :: id_swnetflx, id_irnetflx
 integer :: id_taudust_VIS,id_taudust_IR
 integer :: id_taucloud_VIS,id_taucloud_IR, id_taucloud_12um, id_taucloud_UV
-integer :: id_tauco2cloud_VIS,id_tauco2cloud_IR
 integer :: id_trad7, id_trad23, id_trad32
-integer :: id_dustref, id_cldref, id_cldco2ref, id_dso, id_cldref_uv
+integer :: id_dustref, id_cldref, id_dso, id_cldref_uv
 integer, dimension(:), allocatable :: id_taudust_reff_VIS, id_taudust_reff_IR
 
 
@@ -134,7 +132,7 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
                                p_half, p_full, z_half, tsfc, albedo,      &
                                sfc_emiss, t, r, tdt, rdt,                 &
                                swfsfc, lwfsfc, cosz, tdtlw,tdt_rad,       &
-                               taudust, taucloud, tauco2cloud, taudust_mom, & 
+                               taudust, taucloud, taudust_mom,            & 
                                taudust_fix, pref)
 !=======================================================
 !  main radiation driver
@@ -157,7 +155,7 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
 real, intent(out),   dimension(:,:)     :: swfsfc, lwfsfc
 real, intent(out),   dimension(:,:)     :: cosz
 real, intent(out),    dimension(:,:,:)   :: tdt_rad
-real, intent(out),    dimension(:,:,:)   :: taudust, taucloud, tauco2cloud
+real, intent(out),    dimension(:,:,:)   :: taudust, taucloud
 real, intent(out),    dimension(:,:,:)   :: taudust_mom, taudust_fix
 real, intent(in)                        :: pref
 
@@ -171,8 +169,6 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
 real, dimension(size(t,1),size(t,2),size(t,3)) :: hsw, heatra, fluxout
 real, dimension(size(t,1),size(t,2),size(t,3),8) :: lw_heating_band
 real, dimension(size(t,1),size(t,2),size(t,3)) :: lw_15umHR
-real, dimension(size(t,1),size(t,2),size(t,3)+1) :: irupflx_d,irdnflx_d,swupflx_d,swdnflx_d
-real, dimension(size(t,1),size(t,2),size(t,3)+1) :: swnetflx_d,irnetflx_d
 real, dimension(size(t,1),size(t,2),size(t,3)+1) :: irupflx,irdnflx,swupflx,swdnflx
 real, dimension(size(t,1),size(t,2),size(t,3)+1) :: swnetflx,irnetflx
 
@@ -198,7 +194,7 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
 real, dimension(size(t,1),size(t,2),size(t,3))   :: pf_mb
 real, dimension(size(t,1),size(t,2),size(t,3)+1) :: ph_mb
 
-real, dimension(size(t,1),size(t,2),size(t,3))   :: dustref, cldco2ref
+real, dimension(size(t,1),size(t,2),size(t,3))   :: dustref
 real, dimension(size(t,1),size(t,2),size(t,3),2)   :: cldref
 real, dimension(size(t,1),size(t,2),size(t,3))   :: dustref_bin, dustref_fix, cldice
 real, dimension(size(t,1),size(t,2),size(t,3))   :: dustref_mom
@@ -302,7 +298,6 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
                            dustref_fix)
     dustref(:,:,:) = 0.
     cldref(:,:,:,:) = 0.
-    cldco2ref(:,:,:) = 0.
     nice= ice_bin_indx(1)
     cldice(:,:,:)= r(:,:,:,nice)
 
@@ -318,15 +313,15 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
                    tnew,tsfc,rnew,trans,flx_sfc,        &
                    albedo, sfc_emiss, cosz,             &
                    dustref, dustref_bin, dustref_fix,   &
-                   cldref, cldco2ref, cldice,           &
+                   cldref, cldice,           &
                    use_ames_sw_rad, use_ames_lw_rad,    &
                    r_orbit,                             &
                    heatra,hsw,outflx,                   &
                    rsolar,                              &
                    irupflx,irdnflx,swupflx,swdnflx,     &
                    swnetflx,irnetflx,                   &
                    taudust,taucloud,                    &
-                   tauco2cloud, taudust_mom,            &
+                   taudust_mom,            &
                    lw_heating_band,lw_15umHR,.false.,   &
                    tstrat(is:ie,js:je),                 &
                    tstrat_dt,                           &
@@ -398,10 +393,6 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
     opac(:,:,:)= cldref(:,:,:,2) ! / delp(:,:,:)
     if (id_cldref_uv > 0) used = send_data ( id_cldref_uv, opac,  time, is, js )
 
-    ! write out co2 cloud field
-    opac(:,:,:)= cldco2ref(:,:,:) ! / delp(:,:,:)
-    if (id_cldco2ref > 0) used = send_data ( id_cldco2ref, opac,  time, is, js )
-
 
     !            Combine lwave and shortwave fluxes
     if (id_swheat > 0)  used = send_data ( id_swheat, hsw,    Time, is, js)
@@ -412,8 +403,6 @@ subroutine radiation_driver ( is, js, lon, lat, dt, Time,                 &
     if (id_taucloud_IR > 0)  used = send_data ( id_taucloud_IR,taucloud(:,:,2),   Time, is, js)
     if (id_taucloud_12um > 0)  used = send_data ( id_taucloud_12um,taucloud(:,:,3),   Time, is, js)
     if (id_taucloud_UV > 0)  used = send_data ( id_taucloud_UV,taucloud(:,:,4),   Time, is, js)
-    if (id_tauco2cloud_VIS > 0)  used = send_data ( id_tauco2cloud_VIS,tauco2cloud(:,:,1),   Time, is, js)
-    if (id_tauco2cloud_IR > 0)  used = send_data ( id_tauco2cloud_IR,tauco2cloud(:,:,2),   Time, is, js)
     !           write out moment column dust field by effective radius
     do nt=1,ndust_mass
         ndx= dust_mass_indx(nt)
@@ -638,10 +627,6 @@ subroutine radiation_driver_init ( nlon, mlat, nlevels, lonb, latb, lon, lat, ax
                                        Time, 'Areocentric Longitude', 'deg', &
                                       missing_value=missing_value )
 
-!id_insol = register_diag_field ( model, 'insol', axes(1:2),          &
-!                                       Time, 'Solar insolation', 'W/m2', &
-!                                      missing_value=missing_value )
-
 id_ir_flx = register_diag_field ( model, 'sfcirflx', axes(1:2),      &
                                  Time, 'surface net downward IR flux', 'W/m2', &
                                        missing_value=missing_value )
@@ -694,10 +679,6 @@ subroutine radiation_driver_init ( nlon, mlat, nlevels, lonb, latb, lon, lat, ax
                                        Time, 'NLTE 15um heating', 'K/s', &
                                       missing_value=missing_value )
 
-!id_lwdust = register_diag_field ( model, 'lwdust', axes(1:3),       &
-!                                  Time, 'IR dust heating', 'K/s', &
-!                                      missing_value=missing_value )
-
 id_opac = register_diag_field ( model, 'opac', axes(1:3),            &
                                Time, 'visible dust opacity', 'op/Pa', &
                                       missing_value=missing_value )
@@ -722,10 +703,6 @@ subroutine radiation_driver_init ( nlon, mlat, nlevels, lonb, latb, lon, lat, ax
                                Time, 'UV water ice cloud opacity', 'op/level', &
                                       missing_value=missing_value )
 
-id_cldco2ref = register_diag_field ( model, 'cldco2ref', axes(1:3),      &
-                               Time, 'visible co2 ice cloud opacity', 'op/level', &
-                                      missing_value=missing_value )
-
 id_dso = register_diag_field ( model, 'dso', axes(1:3),      &
                                Time, 'visible density scaled dust opacity', 'm2/kg', &
                                       missing_value=missing_value )
@@ -818,14 +795,6 @@ subroutine radiation_driver_init ( nlon, mlat, nlevels, lonb, latb, lon, lat, ax
                               Time, 'Column cloud opacity UV', 'op', &
                               missing_value=missing_value )
 
-id_tauco2cloud_VIS = register_diag_field ( model, 'tauco2cloud_VIS', axes(1:2),&
-                              Time, 'Column CO2 cloud opacity VIS', 'op', &
-                              missing_value=missing_value )
-
-id_tauco2cloud_IR = register_diag_field ( model, 'tauco2cloud_IR', axes(1:2),&
-                              Time, 'Column CO2 cloud opacity IR', 'op', &
-                              missing_value=missing_value )
-
 id_trad7 = register_diag_field ( model, 'trad7', axes(1:2),          &
                                Time, '7um brightness temp', 'K',   &
                                       missing_value=missing_value )