Changeset 612 for codes/icosagcm/devel/src/dynamics
- Timestamp:
- 11/22/17 00:06:57 (7 years ago)
- Location:
- codes/icosagcm/devel/src/dynamics
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.F90
r603 r612 48 48 49 49 IF(dysl_geopot) THEN 50 #include "../kernels /compute_geopot.k90"50 #include "../kernels_hex/compute_geopot.k90" 51 51 ELSE 52 52 ! Pressure is computed first top-down (temporarily stored in pk) … … 310 310 IF(dysl) THEN 311 311 !$OMP BARRIER 312 #include "../kernels /caldyn_vert_NH.k90"312 #include "../kernels_hex/caldyn_vert_NH.k90" 313 313 !$OMP BARRIER 314 314 ELSE -
codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90
r603 r612 62 62 !!! Compute shallow-water potential vorticity 63 63 IF(dysl_pvort_only) THEN 64 #include "../kernels /pvort_only.k90"64 #include "../kernels_hex/pvort_only.k90" 65 65 ELSE 66 66 … … 126 126 IF(dysl) THEN 127 127 #define PHI_BOT(ij) phis(ij) 128 #include "../kernels /compute_NH_geopot.k90"128 #include "../kernels_hex/compute_NH_geopot.k90" 129 129 #undef PHI_BOT 130 130 ELSE … … 294 294 #define PHI_BOT(ij) phis(ij) 295 295 #define PHI_BOT_VAR phis 296 #include "../kernels /caldyn_solver.k90"296 #include "../kernels_hex/caldyn_solver.k90" 297 297 #undef PHI_BOT_VAR 298 298 #undef PHI_BOT … … 409 409 410 410 IF(dysl_caldyn_fast) THEN 411 #include "../kernels /caldyn_fast.k90"411 #include "../kernels_hex/caldyn_fast.k90" 412 412 ELSE 413 413 … … 531 531 IF(dysl_caldyn_coriolis) THEN 532 532 533 #include "../kernels /coriolis.k90"533 #include "../kernels_hex/coriolis.k90" 534 534 535 535 ELSE … … 693 693 694 694 #define BERNI(ij,l) berni(ij,l) 695 #include "../kernels /caldyn_slow_hydro.k90"695 #include "../kernels_hex/caldyn_slow_hydro.k90" 696 696 #undef BERNI 697 697 … … 785 785 786 786 !$OMP BARRIER 787 #include "../kernels /caldyn_slow_NH.k90"787 #include "../kernels_hex/caldyn_slow_NH.k90" 788 788 !$OMP BARRIER 789 789
Note: See TracChangeset
for help on using the changeset viewer.