Changeset 1238
- Timestamp:
- May 7, 2014, 12:35:26 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/libf/dyn3d/addfi.F
r1189 r1238 103 103 ENDDO 104 104 ENDDO 105 c 105 !*********************** 106 ! Correction on teta due to surface pressure changes 107 DO k = 1,llm 108 DO j = 1,ip1jmp1 109 pteta(j,k)= pteta(j,k)*(1+pdpfi(j)*pdt/pps(j))**kappa 110 ENDDO 111 ENDDO 112 !*********************** 106 113 107 114 DO k = 1,llm -
trunk/LMDZ.COMMON/libf/dyn3d/inidissip.F90
r1021 r1238 268 268 DO l=1,llm 269 269 zz = 1. - preff/presnivs(l) 270 zvert(l)= dissip_fac_mid -( dissip_fac_mid-1.)/( 1.+zz*zz ) 270 ! zvert(l)= dissip_fac_mid -( dissip_fac_mid-1.)/( 1.+zz*zz ) 271 zvert(l)= fac_mid -( fac_mid-1.)/( 1.+zz*zz ) 271 272 272 273 zvert(l)= zvert(l)*(1.0+((fac_up/fac_mid-1)* & … … 275 276 )) 276 277 ENDDO 277 278 write(lunout,*) "inidissip: vert_prof_disip=1, scaleheight=",scaleheight 279 write(lunout,*) " fac_mid=",fac_mid,", fac_up=",fac_up 280 278 281 else 279 282 write(lunout,*) 'wrong value for vert_prof_dissip:',vert_prof_dissip -
trunk/LMDZ.COMMON/libf/dyn3dpar/addfi_p.F
r1189 r1238 128 128 endif 129 129 c 130 !*********************** 131 ! Correction on teta due to surface pressure changes 132 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 133 DO k = 1,llm 134 DO j = ijb,ije 135 pteta(j,k)= pteta(j,k)*(1+pdpfi(j)*pdt/pps(j))**kappa 136 ENDDO 137 ENDDO 138 c$OMP END DO NOWAIT 139 !*********************** 130 140 131 141 ijb=ij_begin -
trunk/LMDZ.COMMON/libf/dyn3dpar/inidissip.F90
r1021 r1238 268 268 DO l=1,llm 269 269 zz = 1. - preff/presnivs(l) 270 zvert(l)= dissip_fac_mid -( dissip_fac_mid-1.)/( 1.+zz*zz ) 270 ! zvert(l)= dissip_fac_mid -( dissip_fac_mid-1.)/( 1.+zz*zz ) 271 zvert(l)= fac_mid -( fac_mid-1.)/( 1.+zz*zz ) 271 272 272 273 zvert(l)= zvert(l)*(1.0+((fac_up/fac_mid-1)* & … … 275 276 )) 276 277 ENDDO 277 278 write(lunout,*) "inidissip: vert_prof_disip=1, scaleheight=",scaleheight 279 write(lunout,*) " fac_mid=",fac_mid,", fac_up=",fac_up 280 278 281 else 279 282 write(lunout,*) 'wrong value for vert_prof_dissip:',vert_prof_dissip -
trunk/LMDZ.MARS/README
r1236 r1238 2072 2072 so we use the comm_wrf.F90 strategy instead for 2073 2073 several arrays (radiative transfer, clouds, etc...) 2074 2075 == 07/05/2014 == EM+FF 2076 Some fixes and updates: 2077 - addfi (dyn3d): Add correction on theta when surface pressure changes 2078 - vdif_cd (phymars): Correction for coefficients in stable nighttime case 2079 - jthermcalc (aeronomars): Fix for some pathological cases (further investigations 2080 on the origin of these is needed) 2081 2082 -
trunk/LMDZ.MARS/libf/aeronomars/jthermcalc.F
r1119 r1238 158 158 limup=1.e26 159 159 160 ! Ehouarn: sanity check 161 ! test that auxcolinp in monotonously increasing from 1 to nlayermx 162 do j=1,nlayermx-1 163 if (auxcolinp(j).gt.auxcolinp(j+1)) then 164 !there is a problem 165 write(*,*) "jthermcalc error: " 166 write(*,*) "auxcolinp() not increasing with altitude index!" 167 write(*,*) "j=",j," auxcolinp(j)=",auxcolinp(j) 168 write(*,*) " auxcolinp(j+1)=",auxcolinp(j+1) 169 ! Quick fix: 170 if (j==1) then 171 auxcolinp(j)=auxcolinp(j+1)/2. 172 else 173 ! compute it as a geometric mean from encompassing values 174 auxcolinp(j)=sqrt(auxcolinp(j-1)*auxcolinp(j+1)) 175 endif 176 write(*,*) " Quick fixed to auxcolinp(j)=",auxcolinp(j) 177 endif 178 enddo 160 179 161 180 c Interpolations -
trunk/LMDZ.MARS/libf/dyn3d/addfi.F
r38 r1238 104 104 ENDDO 105 105 ENDDO 106 c 106 !*********************** 107 ! Correction on teta due to surface pressure changes 108 DO k = 1,llm 109 DO j = 1,ip1jmp1 110 pteta(j,k)= pteta(j,k)*(1+pdpfi(j)*pdt/pps(j))**kappa 111 ENDDO 112 ENDDO 113 !*********************** 107 114 108 115 ! increment covariant zonal wind -
trunk/LMDZ.MARS/libf/phymars/vdif_cd.F
r1236 r1238 195 195 else 196 196 c For Ri>Ric, we consider Ri->Infinity => no turbulent mixing at surface 197 fm(ig)=0. 198 fh(ig)=0. 197 ! fm(ig)=0. 198 ! fh(ig)=0. 199 fm(ig)=1. 200 fh(ig)=1. 199 201 endif 200 202 c Unstable case :
Note: See TracChangeset
for help on using the changeset viewer.