Merge branch 'master' of http://nwpgit.inm.ras.ru/ParCS into C_grid_exchange
Conflicts: Makefile Makefile.opt
Showing
- Makefile 251 additions, 190 deletionsMakefile
- Makefile.opt 251 additions, 190 deletionsMakefile.opt
- src/container_abstract_mod.f90 14 additions, 0 deletionssrc/container_abstract_mod.f90
- src/global_diag_mod.f90 77 additions, 0 deletionssrc/global_diag_mod.f90
- src/models/iomega_model/operator_iomega_mod.f90 22 additions, 28 deletionssrc/models/iomega_model/operator_iomega_mod.f90
- src/models/iomega_model/parameters_iomega_mod.f90 24 additions, 0 deletionssrc/models/iomega_model/parameters_iomega_mod.f90
- src/models/linear_shallow_water/diag_swlin_mod.f90 155 additions, 0 deletionssrc/models/linear_shallow_water/diag_swlin_mod.f90
- src/models/linear_shallow_water/operator_swlin_mod.f90 40 additions, 37 deletionssrc/models/linear_shallow_water/operator_swlin_mod.f90
- src/models/linear_shallow_water/parameters_swlin_mod.f90 99 additions, 0 deletionssrc/models/linear_shallow_water/parameters_swlin_mod.f90
- src/models/linear_shallow_water/stvec_swlin_mod.f90 28 additions, 2 deletionssrc/models/linear_shallow_water/stvec_swlin_mod.f90
- src/models/linear_shallow_water/swlin_mod.f90 28 additions, 77 deletionssrc/models/linear_shallow_water/swlin_mod.f90
- src/models/linear_shallow_water/swlin_output_mod.f90 0 additions, 37 deletionssrc/models/linear_shallow_water/swlin_output_mod.f90
- src/operator_abstract_mod.f90 8 additions, 5 deletionssrc/operator_abstract_mod.f90
- src/state_abstract_mod.f90 0 additions, 7 deletionssrc/state_abstract_mod.f90
- src/stvec_abstract_mod.f90 2 additions, 2 deletionssrc/stvec_abstract_mod.f90
- src/test/test_global_diagnostics/atest_gldiag_pc.sh 6 additions, 0 deletionssrc/test/test_global_diagnostics/atest_gldiag_pc.sh
- src/test/test_global_diagnostics/test_gl_diag_mod.f90 172 additions, 0 deletionssrc/test/test_global_diagnostics/test_gl_diag_mod.f90
- src/test/test_global_diagnostics/test_global_diag_main.f90 13 additions, 0 deletionssrc/test/test_global_diagnostics/test_global_diag_main.f90
- src/test/test_halo/test_halo_mod.f90 15 additions, 1 deletionsrc/test/test_halo/test_halo_mod.f90
- src/test/test_time_steping/test_rk4.f90 11 additions, 8 deletionssrc/test/test_time_steping/test_rk4.f90
Please register or sign in to comment