Changeset 2381 for LMDZ5/branches/LMDZ6_rc0/libf/phylmd
- Timestamp:
- Oct 30, 2015, 2:50:54 PM (9 years ago)
- Location:
- LMDZ5/branches/LMDZ6_rc0/libf
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/branches/LMDZ6_rc0/libf
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/LMDZ4/branches/LMDZ4V5.0-dev/libf merged eligible /LMDZ5/branches/LMDZ5V1.0-dev/libf merged eligible /LMDZ5/branches/LMDZ5V2.0-dev/libf merged eligible /LMDZ5/trunk/libf merged eligible /LMDZ4/branches/LMDZ4-dev/libf 1074-1276,1281-1284
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
LMDZ5/branches/LMDZ6_rc0/libf/phylmd/phys_output_write_mod.F90
r2283 r2381 230 230 USE ocean_slab_mod, only: tslab, slab_bils 231 231 USE indice_sol_mod, only: nbsrf 232 USE infotrac, only: nqtot, nqo 232 USE infotrac, only: nqtot, nqo, type_trac 233 233 USE comgeomphy, only: airephy 234 234 USE surface_data, only: type_ocean, ok_veget, ok_snow … … 1427 1427 IF (nqtot.GE.nqo+1) THEN 1428 1428 DO iq=nqo+1,nqtot 1429 IF (type_trac == 'lmdz' .OR. type_trac == 'repr') THEN 1429 1430 1430 1431 CALL histwrite_phy(o_trac(iq-nqo), qx(:,:,iq)) … … 1449 1450 ENDIF 1450 1451 CALL histwrite_phy(o_trac_cum(iq-nqo), zx_tmp_fi2d) 1452 endif 1451 1453 ENDDO 1452 1454 ENDIF -
LMDZ5/branches/LMDZ6_rc0/libf/phylmd/physiq.F90
r2283 r2381 1307 1307 annee_ref, & 1308 1308 day_ref, & 1309 itau_phy) 1309 day_ini, & 1310 start_time, & 1311 itau_phy, & 1312 io_lon, & 1313 io_lat) 1310 1314 1311 1315 CALL VTe(VTinca) … … 2989 2993 calday = REAL(days_elapsed + 1) + jH_cur 2990 2994 2991 call chemtime(itap+itau_phy-1, date0, dtime )2995 call chemtime(itap+itau_phy-1, date0, dtime, itap) 2992 2996 IF (config_inca == 'aero' .OR. config_inca == 'aeNP') THEN 2993 2997 CALL AEROSOL_METEO_CALC( & -
LMDZ5/branches/LMDZ6_rc0/libf/phylmd/phytrac_mod.F90
r2160 r2381 308 308 !$OMP THREADPRIVATE(lessivage) 309 309 310 CHARACTER(len=8),DIMENSION(nbtr) :: solsym311 310 !RomP >>> 312 311 INTEGER,SAVE :: iflag_lscav_omp,iflag_lscav … … 557 556 cdragh, coefh, yu1, yv1, ftsol, pctsrf, xlat, xlon,iflag_vdf_trac>=0,sh, & 558 557 rh, pphi, ustar, wstar, ale_bl, ale_wake, u10m, v10m, & 559 tr_seri, source, solsym,d_tr_cl,d_tr_dec, zmasse) !RomP558 tr_seri, source, d_tr_cl,d_tr_dec, zmasse) !RomP 560 559 561 560 CASE('inca') … … 572 571 tau_aero, piz_aero, cg_aero, ccm, & 573 572 rfname, & 574 tr_seri, source , solsym)573 tr_seri, source) 575 574 576 575 CASE('repr') … … 580 579 presnivs, xlat, xlon, pphis, pphi, & 581 580 t_seri, pplay, paprs, sh , & 582 tr_seri , solsym)581 tr_seri) 583 582 584 583 END SELECT -
LMDZ5/branches/LMDZ6_rc0/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90
r2160 r2381 84 84 REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer 85 85 REAL, DIMENSION(klon,klev,naero_tot) :: m_allaer_pi !RAF 86 ! REAL, DIMENSION(klon,naero_tot) :: fractnat_allaer !RAF delete?? 87 character(len=8), dimension(nbtr) :: tracname 86 88 87 integer :: id_ASBCM, id_ASPOMM, id_ASSO4M, id_ASMSAM, id_CSSO4M, id_CSMSAM, id_SSSSM 89 88 integer :: id_CSSSM, id_ASSSM, id_CIDUSTM, id_AIBCM, id_AIPOMM, id_ASNO3M, id_CSNO3M, id_CINO3M … … 104 103 !--convert to ug m-3 unit for consistency with offline fields 105 104 ! 106 #ifdef INCA107 call tracinca_name(tracname)108 #endif109 110 105 do i=1,nbtr 111 select case(trim( tracname(i)))106 select case(trim(solsym(i))) 112 107 case ("ASBCM") 113 108 id_ASBCM = i -
LMDZ5/branches/LMDZ6_rc0/libf/phylmd/tracinca_mod.F90
r2160 r2381 35 35 tau_aero, piz_aero, cg_aero, ccm, & 36 36 rfname, & 37 tr_seri, source , solsym)37 tr_seri, source) 38 38 39 39 !======================================================== … … 113 113 ! Output arguments 114 114 REAL,DIMENSION(klon,nbtr), INTENT(OUT) :: source ! a voir lorsque le flux de surface est prescrit 115 CHARACTER(len=8),DIMENSION(nbtr), INTENT(OUT) :: solsym116 115 117 116 !======================================================================================= … … 134 133 pdel(:,k) = paprs(:,k) - paprs (:,k+1) 135 134 END DO 136 137 zpmfu(:,:)=pmfu(:,:) 135 136 #ifdef INCA 137 IF (config_inca == 'aero') THEN 138 zpmfu(:,:)=pmfu(:,:) 139 ELSE IF (config_inca == 'aeNP') THEN 140 zpmfu(:,:)=upwd(:,:) 141 ENDIF 138 142 139 IF (config_inca == 'aero') THEN 140 #ifdef INCA 141 CALL aerosolmain( & 142 aerosol_couple,tr_seri,pdtphys, & 143 pplay,pdel,prfl,pmflxr,psfl, & 144 pmflxs,zpmfu,itop_con,ibas_con, & 145 pphi,airephy,nstep,rneb,t_seri, & 146 rh,tau_aero,piz_aero,cg_aero, & 147 rfname,ccm,lafin) 143 CALL aerosolmain( & 144 aerosol_couple,tr_seri,pdtphys, & 145 pplay,pdel,prfl,pmflxr,psfl, & 146 pmflxs,zpmfu,itop_con,ibas_con, & 147 pphi,airephy,nstep,rneb,t_seri, & 148 rh,tau_aero,piz_aero,cg_aero, & 149 rfname,ccm,lafin, config_inca) 148 150 #endif 149 END IF150 151 IF (config_inca == 'aeNP') THEN152 #ifdef INCA153 zpmfu(:,:)=upwd(:,:)154 CALL aerosolmainNP( &155 aerosol_couple,tr_seri,pdtphys, &156 pplay,pdel,prfl,pmflxr,psfl, &157 pmflxs,zpmfu,itop_con,ibas_con, &158 pphi,airephy,nstep,rneb,t_seri, &159 rh,lafin)160 #endif161 END IF162 151 163 152 … … 196 185 iip1, & !nx 197 186 jjp1, & !ny 198 source, & 199 solsym) 187 source ) 200 188 #endif 201 189 -
LMDZ5/branches/LMDZ6_rc0/libf/phylmd/traclmdz_mod.F90
r1910 r2381 338 338 cdragh, coefh, yu1, yv1, ftsol, pctsrf, xlat, xlon, couchelimite, sh, & 339 339 rh, pphi, ustar, wstar, ale_bl, ale_wake, zu10m, zv10m, & 340 !! tr_seri, source, solsym, d_tr_cl, zmasse) !RomP 341 tr_seri, source, solsym, d_tr_cl,d_tr_dec, zmasse) !RomP 340 tr_seri, source, d_tr_cl,d_tr_dec, zmasse) !RomP 342 341 343 342 USE dimphy … … 397 396 398 397 ! Output argument 399 CHARACTER(len=8),DIMENSION(nbtr), INTENT(OUT) :: solsym400 398 REAL,DIMENSION(klon,nbtr), INTENT(OUT) :: source ! a voir lorsque le flux de surface est prescrit 401 399 REAL,DIMENSION(klon,klev,nbtr), INTENT(OUT) :: d_tr_cl ! Td couche limite/traceur -
LMDZ5/branches/LMDZ6_rc0/libf/phylmd/tracreprobus_mod.F90
r1910 r2381 9 9 presnivs, xlat, xlon, pphis, pphi, & 10 10 t_seri, pplay, paprs, sh , & 11 tr_seri , solsym)11 tr_seri) 12 12 13 13 USE dimphy … … 42 42 !---------------- 43 43 REAL,DIMENSION(klon,klev,nbtr),INTENT(INOUT) :: tr_seri ! Concentration Traceur [U/KgA] 44 CHARACTER(len=8),DIMENSION(nbtr), INTENT(OUT) :: solsym45 44 46 45
Note: See TracChangeset
for help on using the changeset viewer.