Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.0 branch, merge to master #69

Merged
merged 20 commits into from
Apr 9, 2018
Merged

Release v1.0 branch, merge to master #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c3969a9
initiate pdf work
mzhangw Mar 27, 2018
6c0fe4b
add image files in eps format for latex output.
mzhangw Mar 28, 2018
96100e3
add README.ccppdoc file.
mzhangw Mar 28, 2018
2569b83
ccpplatex_dox features are added.
mzhangw Mar 29, 2018
3a66f2a
delete D2O test files.
mzhangw Mar 30, 2018
875e8f7
change to html figure number
mzhangw Mar 30, 2018
4f0a09a
update SAMF_shal text.
mzhangw Mar 30, 2018
2b0a136
Merge pull request #63 from mzhangw/ccpp_pdf
mzhangw Mar 30, 2018
14be838
Remove -extend-source 132 from global Intel Fortran compiler flags
DomHeinzeller Mar 30, 2018
ae01885
Merge pull request #64 from climbfuji/fix-compiler-issues-theia-intel
climbfuji Mar 30, 2018
aa2f82e
display subroutines under aerosol models and change general/detailed …
mzhangw Apr 2, 2018
1010a0a
minor fix
mzhangw Apr 2, 2018
3481ed3
minor fix
mzhangw Apr 2, 2018
13dfc8b
Add missing initialization of CCPP error handling variables
DomHeinzeller Apr 3, 2018
56a171a
Merge pull request #66 from climbfuji/ccpp-physics-cleanup-20180402
climbfuji Apr 3, 2018
2d6b26d
Fix bug in CMakeLists.txt: add OpenMP flags to correct cmake variables
DomHeinzeller Apr 3, 2018
4173f42
some improvement of DO2.
mzhangw Apr 4, 2018
aae4490
Merge pull request #67 from climbfuji/ccpp-physics-developers-guide-u…
grantfirl Apr 4, 2018
fd63129
add DO2 improvement.
mzhangw Apr 5, 2018
5b567b5
Merge pull request #68 from mzhangw/ccpp_pdf
mzhangw Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ccpp-framework/cma
if (OPENMP)
include(detect_openmp)
detect_openmp()
set (CMAKE_Fortran_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set (CMAKE_Fortran_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${OpenMP_Fortran_FLAGS}")
message(STATUS "Enable OpenMP support for C/C++/Fortran compiler")
else(OPENMP)
Expand Down Expand Up @@ -244,7 +244,6 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
SET_SOURCE_FILES_PROPERTIES(./physics/module_nst_water_prop.f90 PROPERTIES COMPILE_FLAGS "-ffree-line-length-none -fdefault-real-8 -ffree-form")
SET_SOURCE_FILES_PROPERTIES(./physics/aer_cloud.F ./physics/wv_saturation.F ./physics/cldwat2m_micro.F PROPERTIES COMPILE_FLAGS "-DNEMS_GSM -fdefault-real-8 -fdefault-double-8")
elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
set(f_flags -extend-source 132)

SET_SOURCE_FILES_PROPERTIES(./physics/module_bfmicrophysics.f ./physics/rascnvv2.f ./physics/sflx.f ./physics/sfc_diff.f ./physics/sfc_diag.f PROPERTIES COMPILE_FLAGS -r8)
SET_SOURCE_FILES_PROPERTIES(./physics/module_nst_model.f90 ./physics/GFS_calpreciptype.f90 PROPERTIES COMPILE_FLAGS "-r8 -free")
Expand Down
370 changes: 0 additions & 370 deletions physics/docs/bootstrapped/customdoxygen.css
View file
Open in desktop

This file was deleted.

Loading