Skip to content

Commit

Permalink
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physics…
Browse files Browse the repository at this point in the history 
… into thompson_refactor
  • Loading branch information
@AndersJensen-NOAA
AndersJensen-NOAA committed Jan 22, 2024
2 parents dd3040f + a492add commit dcf6422
Show file tree
Hide file tree
Showing 387 changed files with 2,362 additions and 1,542 deletions.
5 changes: 4 additions & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
[submodule "physics/rte-rrtmgp"]
path = physics/rte-rrtmgp
path = physics/Radiation/RRTMGP/rte-rrtmgp
url = https://github.com/earth-system-radiation/rte-rrtmgp
branch = main
[submodule "physics/Radiation/RRTMGP/rte-rrtmgp"]
path = physics/Radiation/RRTMGP/rte-rrtmgp
url = https://github.com/earth-system-radiation/rte-rrtmgp
54 changes: 27 additions & 27 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,37 +79,37 @@ get_filename_component(LOCAL_CURRENT_SOURCE_DIR ${FULL_PATH_TO_CMAKELISTS} DIREC
#------------------------------------------------------------------------------

# List of files that need to be compiled without OpenMP
set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_optics.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_fluxes_byband.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/solar_variability/mo_solar_variability.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_heating_rates.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_fluxes_bygpoint.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_compute_bc.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_config.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_source_functions.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_sw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_fluxes.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_lw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_util_array.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_kind.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_optical_props.F90)
set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_gas_optics.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_fluxes_byband.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/solar_variability/mo_solar_variability.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_heating_rates.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_fluxes_bygpoint.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_compute_bc.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_config.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_source_functions.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_sw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_fluxes.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_lw.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_util_array.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_kind.F90
${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_optical_props.F90)

# List of files that need to be compiled with different precision
set(SCHEMES_DYNAMICS)

if(${LOCAL_CURRENT_SOURCE_DIR}/physics/fv_sat_adj.F90 IN_LIST SCHEMES)
list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/fv_sat_adj.F90)
if(${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90 IN_LIST SCHEMES)
list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90)
endif()

# Remove files that need to be compiled with different precision
Expand Down
0 physics/cu_c3_deep.F90 → physics/CONV/C3/cu_c3_deep.F90
View file
File renamed without changes.
0 physics/cu_c3_driver.F90 → physics/CONV/C3/cu_c3_driver.F90
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion physics/cu_c3_driver.meta → physics/CONV/C3/cu_c3_driver.meta
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[ccpp-table-properties]
name = cu_c3_driver
type = scheme
dependencies = cu_c3_deep.F90,cu_c3_sh.F90,machine.F,physcons.F90,progsigma_calc.f90
dependencies = ../../hooks/machine.F
dependencies = cu_c3_deep.F90,cu_c3_sh.F90,../progsigma_calc.f90

########################################################################
[ccpp-arg-table]
Expand Down
0 physics/cu_c3_driver_post.F90 → physics/CONV/C3/cu_c3_driver_post.F90
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cu_c3_driver_post.meta → physics/CONV/C3/cu_c3_driver_post.meta
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cu_c3_driver_post
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
0 physics/cu_c3_driver_pre.F90 → physics/CONV/C3/cu_c3_driver_pre.F90
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cu_c3_driver_pre.meta → physics/CONV/C3/cu_c3_driver_pre.meta
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cu_c3_driver_pre
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
0 physics/cu_c3_sh.F90 → physics/CONV/C3/cu_c3_sh.F90
View file
File renamed without changes.
0 physics/cs_conv.F90 → physics/CONV/Chikira_Sugiyama/cs_conv.F90
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cs_conv.meta → physics/CONV/Chikira_Sugiyama/cs_conv.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[ccpp-table-properties]
name = cs_conv
type = scheme
dependencies = funcphys.f90,machine.F,physcons.F90
dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../../hooks/physcons.F90

########################################################################
[ccpp-arg-table]
Expand Down
0 physics/cs_conv_aw_adj.F90 → .../CONV/Chikira_Sugiyama/cs_conv_aw_adj.F90
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cs_conv_aw_adj.meta → ...CONV/Chikira_Sugiyama/cs_conv_aw_adj.meta
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cs_conv_aw_adj
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
0 physics/cs_conv_post.F90 → ...cs/CONV/Chikira_Sugiyama/cs_conv_post.F90
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cs_conv_post.meta → ...s/CONV/Chikira_Sugiyama/cs_conv_post.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[ccpp-table-properties]
name = cs_conv_post
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
0 physics/cs_conv_pre.F90 → ...ics/CONV/Chikira_Sugiyama/cs_conv_pre.F90
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cs_conv_pre.meta → ...cs/CONV/Chikira_Sugiyama/cs_conv_pre.meta
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cs_conv_pre
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
Loading

0 comments on commit dcf6422

Please sign in to comment.