航班CA1239,计划下午3:50到达阿克苏
#使用diff命令比较两个文件夹下文件的差异
diff -r -q dev/ ../code_updated/dev/
输出为哪些文件有差异:
Only in dev/: .DS_Store
Files dev/acc_pre.f90 and ../code_updated/dev/acc_pre.f90 differ
Files dev/acc_vsg.f90 and ../code_updated/dev/acc_vsg.f90 differ
Files dev/droplet_monitr.f90 and ../code_updated/dev/droplet_monitr.f90 differ
Files dev/droplet_wflow.f90 and ../code_updated/dev/droplet_wflow.f90 differ
Files dev/ice_acc.f90 and ../code_updated/dev/ice_acc.f90 differ
Files dev/ice_acc_2nd.f90 and ../code_updated/dev/ice_acc_2nd.f90 differ
Files dev/ice_acc_3rd.f90 and ../code_updated/dev/ice_acc_3rd.f90 differ
Files dev/ice_acc_3rd_3d.f90 and ../code_updated/dev/ice_acc_3rd_3d.f90 differ
Files dev/ice_lusgs.f90 and ../code_updated/dev/ice_lusgs.f90 differ
Files dev/ice_lusgs_non_conservation.f90 and ../code_updated/dev/ice_lusgs_non_conservation.f90 differ
Files dev/ice_output.f90 and ../code_updated/dev/ice_output.f90 differ
Files dev/ice_rk.f90 and ../code_updated/dev/ice_rk.f90 differ
Files dev/ice_rk_a.f95 and ../code_updated/dev/ice_rk_a.f95 differ
Files dev/ice_rk_t.f90 and ../code_updated/dev/ice_rk_t.f90 differ
Files dev/ice_split.f90 and ../code_updated/dev/ice_split.f90 differ
Files dev/para_wall_surf.f90 and ../code_updated/dev/para_wall_surf.f90 differ
Files dev/rhs_wflow.f90 and ../code_updated/dev/rhs_wflow.f90 differ
Only in dev/: tn_bc.f90
Only in dev/: tn_lusgs.f90
Only in dev/: tn_monitr.f90
Only in dev/: tn_wflow.f90
Only in dev/: tndqmom.f90
Files dev/usr_ice.f90 and ../code_updated/dev/usr_ice.f90 differ
继续对每个文件进行比较,输出对应文件差异所在:
diff dev/usr_ice.f90 ../code_updated/dev/usr_ice.f90 -y --suppress-common-lines -W 140
此时将以左右两列显示两个文件的差异。
##普通场景
###be prone to: 容易的,易于
Droplets featuring a large diameter are prone to deformation under the influence of aerodynamic shear forces, resulting in a decidedly nonspherical shape.
考虑如下代码:
integer,dimension(3,3,2) :: &
mat = reshape( &
(/1,2,3, &
4,5,6 &
7,8,9, &
-1,-2,-3, &
-4,-5,-6, &
-7,-8,-9/),(/3,3,2/))
write(*,*) mat(1,:,1)
write(*,*) mat(2,:,1)
write(*,*) mat(3,:,1)
write(*,*) mat(1,:,2)
write(*,*) mat(2,:,2)
write(*,*) mat(3,:,2)
输出结果为:
1 4 7
2 5 8
3 6 9
-1 -4 -7
-2 -5 -8
-3 -6 -9
若加上参数ORDER
:
integer,dimension(3,3,2) :: &
mat = reshape( &
(/1,2,3, &
4,5,6 &
7,8,9, &
-1,-2,-3, &
-4,-5,-6, &
-7,-8,-9/),(/3,3,2/),ORDER=(/3,2,1/))
write(*,*) mat(1,:,1)
write(*,*) mat(2,:,1)
write(*,*) mat(3,:,1)
write(*,*) mat(1,:,2)
write(*,*) mat(2,:,2)
write(*,*) mat(3,:,2)
输出结果为:
1 3 5
7 9 -2
-4 -6 -8
2 4 6
8 -1 -3
-5 -7 -9
如果关闭View
中的Show Domains
,输出的网格会出现问题,block的数量不一致等,打开该选项后输出正常。
2019年2月2号,周五,新年回到教研室的第一天,久违的雾霾迎接了我,起床就感觉喉咙不舒服,在四川和北京体验了20多天的无雾霾日后,一遇西安的雾霾居然有点不适应了。要提高效率,设定各个阶段的目标,早日离开西安,加油!