Ignore:
Timestamp:
Feb 10, 2020, 11:04:40 AM (4 years ago)
Author:
Laurent Fairhead
Message:

Parameter new_aod is not needed anymore as it is assumed to be true
all the time. This means that we cannot replay AR4 simulations with new
LMDZ sources (we probably couldn't anyway)
LF, OB

File:
1 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

    r3623 r3630  
    1717  SUBROUTINE phys_output_write(itap, pdtphys, paprs, pphis, &
    1818       pplay, lmax_th, aerosol_couple,         &
    19        ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, new_aod, ok_sync, &
     19       ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ok_sync, &
    2020       ptconv, read_climoz, clevSTD, ptconvth, &
    2121       d_u, d_t, qx, d_qx, zmasse, flag_aerosol, flag_aerosol_strat, ok_cdnc)
    … …  
    400400    INTEGER, DIMENSION(klon) :: lmax_th
    401401    LOGICAL :: aerosol_couple, ok_sync
    402     LOGICAL :: ok_ade, ok_aie, ok_volcan, new_aod
     402    LOGICAL :: ok_ade, ok_aie, ok_volcan
    403403    LOGICAL, DIMENSION(klon, klev) :: ptconv, ptconvth
    404404    REAL :: pdtphys
    … …  
    13931393!--OLIVIER
    13941394!This is warranted by treating INCA aerosols as offline aerosols
    1395 !       IF (new_aod .and. (.not. aerosol_couple)) THEN
    1396        IF (new_aod) THEN
    1397           IF (flag_aerosol.GT.0) THEN
    1398              CALL histwrite_phy(o_od443aer, od443aer)
    1399              CALL histwrite_phy(o_od550aer, od550aer)
    1400              CALL histwrite_phy(o_od865aer, od865aer)
    1401              CALL histwrite_phy(o_abs550aer, abs550aer)
    1402              CALL histwrite_phy(o_od550lt1aer, od550lt1aer)
    1403              CALL histwrite_phy(o_sconcso4, sconcso4)
    1404              CALL histwrite_phy(o_sconcno3, sconcno3)
    1405              CALL histwrite_phy(o_sconcoa, sconcoa)
    1406              CALL histwrite_phy(o_sconcbc, sconcbc)
    1407              CALL histwrite_phy(o_sconcss, sconcss)
    1408              CALL histwrite_phy(o_sconcdust, sconcdust)
    1409              CALL histwrite_phy(o_concso4, concso4)
    1410              CALL histwrite_phy(o_concno3, concno3)
    1411              CALL histwrite_phy(o_concoa, concoa)
    1412              CALL histwrite_phy(o_concbc, concbc)
    1413              CALL histwrite_phy(o_concss, concss)
    1414              CALL histwrite_phy(o_concdust, concdust)
    1415              CALL histwrite_phy(o_loadso4, loadso4)
    1416              CALL histwrite_phy(o_loadoa, loadoa)
    1417              CALL histwrite_phy(o_loadbc, loadbc)
    1418              CALL histwrite_phy(o_loadss, loadss)
    1419              CALL histwrite_phy(o_loaddust, loaddust)
    1420              CALL histwrite_phy(o_loadno3, loadno3)
    1421              CALL histwrite_phy(o_dryod550aer, dryod550aer)
    1422              DO naero = 1, naero_tot-1
    1423                 CALL histwrite_phy(o_drytausumaero(naero),drytausum_aero(:,naero))
    1424              END DO
    1425           ENDIF
    1426           !--STRAT AER
    1427           IF (flag_aerosol.GT.0.OR.flag_aerosol_strat.GT.0) THEN
    1428              DO naero = 1, naero_tot
    1429                 CALL histwrite_phy(o_tausumaero(naero),tausum_aero(:,2,naero))
    1430              END DO
    1431           ENDIF
    1432           IF (flag_aerosol_strat.GT.0) THEN
    1433              CALL histwrite_phy(o_tausumaero_lw,tausum_aero(:,6,id_STRAT_phy))
    1434           ENDIF
     1395       IF (flag_aerosol.GT.0) THEN
     1396          CALL histwrite_phy(o_od443aer, od443aer)
     1397          CALL histwrite_phy(o_od550aer, od550aer)
     1398          CALL histwrite_phy(o_od865aer, od865aer)
     1399          CALL histwrite_phy(o_abs550aer, abs550aer)
     1400          CALL histwrite_phy(o_od550lt1aer, od550lt1aer)
     1401          CALL histwrite_phy(o_sconcso4, sconcso4)
     1402          CALL histwrite_phy(o_sconcno3, sconcno3)
     1403          CALL histwrite_phy(o_sconcoa, sconcoa)
     1404          CALL histwrite_phy(o_sconcbc, sconcbc)
     1405          CALL histwrite_phy(o_sconcss, sconcss)
     1406          CALL histwrite_phy(o_sconcdust, sconcdust)
     1407          CALL histwrite_phy(o_concso4, concso4)
     1408          CALL histwrite_phy(o_concno3, concno3)
     1409          CALL histwrite_phy(o_concoa, concoa)
     1410          CALL histwrite_phy(o_concbc, concbc)
     1411          CALL histwrite_phy(o_concss, concss)
     1412          CALL histwrite_phy(o_concdust, concdust)
     1413          CALL histwrite_phy(o_loadso4, loadso4)
     1414          CALL histwrite_phy(o_loadoa, loadoa)
     1415          CALL histwrite_phy(o_loadbc, loadbc)
     1416          CALL histwrite_phy(o_loadss, loadss)
     1417          CALL histwrite_phy(o_loaddust, loaddust)
     1418          CALL histwrite_phy(o_loadno3, loadno3)
     1419          CALL histwrite_phy(o_dryod550aer, dryod550aer)
     1420          DO naero = 1, naero_tot-1
     1421             CALL histwrite_phy(o_drytausumaero(naero),drytausum_aero(:,naero))
     1422          END DO
     1423       ENDIF
     1424       !--STRAT AER
     1425       IF (flag_aerosol.GT.0.OR.flag_aerosol_strat.GT.0) THEN
     1426          DO naero = 1, naero_tot
     1427             CALL histwrite_phy(o_tausumaero(naero),tausum_aero(:,2,naero))
     1428          END DO
     1429       ENDIF
     1430       IF (flag_aerosol_strat.GT.0) THEN
     1431          CALL histwrite_phy(o_tausumaero_lw,tausum_aero(:,6,id_STRAT_phy))
    14351432       ENDIF
    14361433
    … …  
    15221519          CALL histwrite_phy(o_sollwad0, sollwad0_aero)
    15231520          !====MS forcing diagnostics
    1524           IF (new_aod) THEN
    15251521          !ym warning : topsw_aero, solsw_aero, topsw0_aero, solsw0_aero are not defined by model
    15261522          !ym => init to 0 in radlwsw_m.F90 ztopsw_aero, zsolsw_aero, ztopsw0_aero, zsolsw0_aero
    15271523
    1528              IF (vars_defined) zx_tmp_fi2d(:)=topsw_aero(:,1)*swradcorr(:)
    1529              CALL histwrite_phy(o_swtoaas_nat,zx_tmp_fi2d)
    1530              IF (vars_defined) zx_tmp_fi2d(:)=solsw_aero(:,1)*swradcorr(:)
    1531              CALL histwrite_phy(o_swsrfas_nat,zx_tmp_fi2d)
    1532              IF (vars_defined) zx_tmp_fi2d(:)=topsw0_aero(:,1)*swradcorr(:)
    1533              CALL histwrite_phy(o_swtoacs_nat,zx_tmp_fi2d)
    1534              IF (vars_defined) zx_tmp_fi2d(:)=solsw0_aero(:,1)*swradcorr(:)
    1535              CALL histwrite_phy(o_swsrfcs_nat,zx_tmp_fi2d)
    1536              !ant
    1537              IF (vars_defined) zx_tmp_fi2d(:)=topsw_aero(:,2)*swradcorr(:)
    1538              CALL histwrite_phy(o_swtoaas_ant,zx_tmp_fi2d)
    1539              IF (vars_defined) zx_tmp_fi2d(:)=solsw_aero(:,2)*swradcorr(:)
    1540              CALL histwrite_phy(o_swsrfas_ant,zx_tmp_fi2d)
    1541              IF (vars_defined) zx_tmp_fi2d(:)=topsw0_aero(:,2)*swradcorr(:)
    1542              CALL histwrite_phy(o_swtoacs_ant,zx_tmp_fi2d)
    1543              IF (vars_defined) zx_tmp_fi2d(:)=solsw0_aero(:,2)*swradcorr(:)
    1544              CALL histwrite_phy(o_swsrfcs_ant,zx_tmp_fi2d)
    1545              !cf
    1546              IF (.not. aerosol_couple) THEN
    1547                 IF (vars_defined) zx_tmp_fi2d(:)=topswcf_aero(:,1)*swradcorr(:)
    1548                 CALL histwrite_phy(o_swtoacf_nat,zx_tmp_fi2d)
    1549                 IF (vars_defined) zx_tmp_fi2d(:)=solswcf_aero(:,1)*swradcorr(:)
    1550                 CALL histwrite_phy(o_swsrfcf_nat,zx_tmp_fi2d)
    1551                 IF (vars_defined) zx_tmp_fi2d(:)=topswcf_aero(:,2)*swradcorr(:)
    1552                 CALL histwrite_phy(o_swtoacf_ant,zx_tmp_fi2d)
    1553                 IF (vars_defined) zx_tmp_fi2d(:)=solswcf_aero(:,2)*swradcorr(:)
    1554                 CALL histwrite_phy(o_swsrfcf_ant,zx_tmp_fi2d)
    1555                 IF (vars_defined) zx_tmp_fi2d(:)=topswcf_aero(:,3)*swradcorr(:)
    1556                 CALL histwrite_phy(o_swtoacf_zero,zx_tmp_fi2d)
    1557                 IF (vars_defined) zx_tmp_fi2d(:)=solswcf_aero(:,3)*swradcorr(:)
    1558                 CALL histwrite_phy(o_swsrfcf_zero,zx_tmp_fi2d)
    1559              ENDIF
    1560           ENDIF ! new_aod
     1524          IF (vars_defined) zx_tmp_fi2d(:)=topsw_aero(:,1)*swradcorr(:)
     1525          CALL histwrite_phy(o_swtoaas_nat,zx_tmp_fi2d)
     1526          IF (vars_defined) zx_tmp_fi2d(:)=solsw_aero(:,1)*swradcorr(:)
     1527          CALL histwrite_phy(o_swsrfas_nat,zx_tmp_fi2d)
     1528          IF (vars_defined) zx_tmp_fi2d(:)=topsw0_aero(:,1)*swradcorr(:)
     1529          CALL histwrite_phy(o_swtoacs_nat,zx_tmp_fi2d)
     1530          IF (vars_defined) zx_tmp_fi2d(:)=solsw0_aero(:,1)*swradcorr(:)
     1531          CALL histwrite_phy(o_swsrfcs_nat,zx_tmp_fi2d)
     1532          !ant
     1533          IF (vars_defined) zx_tmp_fi2d(:)=topsw_aero(:,2)*swradcorr(:)
     1534          CALL histwrite_phy(o_swtoaas_ant,zx_tmp_fi2d)
     1535          IF (vars_defined) zx_tmp_fi2d(:)=solsw_aero(:,2)*swradcorr(:)
     1536          CALL histwrite_phy(o_swsrfas_ant,zx_tmp_fi2d)
     1537          IF (vars_defined) zx_tmp_fi2d(:)=topsw0_aero(:,2)*swradcorr(:)
     1538          CALL histwrite_phy(o_swtoacs_ant,zx_tmp_fi2d)
     1539          IF (vars_defined) zx_tmp_fi2d(:)=solsw0_aero(:,2)*swradcorr(:)
     1540          CALL histwrite_phy(o_swsrfcs_ant,zx_tmp_fi2d)
     1541          !cf
     1542          IF (.not. aerosol_couple) THEN
     1543             IF (vars_defined) zx_tmp_fi2d(:)=topswcf_aero(:,1)*swradcorr(:)
     1544             CALL histwrite_phy(o_swtoacf_nat,zx_tmp_fi2d)
     1545             IF (vars_defined) zx_tmp_fi2d(:)=solswcf_aero(:,1)*swradcorr(:)
     1546             CALL histwrite_phy(o_swsrfcf_nat,zx_tmp_fi2d)
     1547             IF (vars_defined) zx_tmp_fi2d(:)=topswcf_aero(:,2)*swradcorr(:)
     1548             CALL histwrite_phy(o_swtoacf_ant,zx_tmp_fi2d)
     1549             IF (vars_defined) zx_tmp_fi2d(:)=solswcf_aero(:,2)*swradcorr(:)
     1550             CALL histwrite_phy(o_swsrfcf_ant,zx_tmp_fi2d)
     1551             IF (vars_defined) zx_tmp_fi2d(:)=topswcf_aero(:,3)*swradcorr(:)
     1552             CALL histwrite_phy(o_swtoacf_zero,zx_tmp_fi2d)
     1553             IF (vars_defined) zx_tmp_fi2d(:)=solswcf_aero(:,3)*swradcorr(:)
     1554             CALL histwrite_phy(o_swsrfcf_zero,zx_tmp_fi2d)
     1555          ENDIF
    15611556          !====MS forcing diagnostics
    15621557       ENDIF
Note: See TracChangeset for help on using the changeset viewer.