Skip to content

Commit

Permalink
Merge pull request #1062 from grantfirl/ufs-dev-PR153
Browse files Browse the repository at this point in the history
UFS-dev PR#153
  • Loading branch information
grantfirl authored Mar 14, 2024
2 parents ba7ed8f + 48221d2 commit 7b36320
Show file tree
Hide file tree
Showing 379 changed files with 260 additions and 480 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "physics/rte-rrtmgp"]
path = physics/rte-rrtmgp
[submodule "physics/Radiation/RRTMGP/rte-rrtmgp"]
path = physics/Radiation/RRTMGP/rte-rrtmgp
url = https://github.com/earth-system-radiation/rte-rrtmgp
branch = main
54 changes: 27 additions & 27 deletions CMakeLists.txt
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
File renamed without changes.
File renamed without changes.
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
File renamed without changes.
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
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
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
File renamed without changes.
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
File renamed without changes.
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
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[ccpp-table-properties]
name = cu_gf_driver
type = scheme
dependencies = cu_gf_deep.F90,cu_gf_sh.F90,machine.F,physcons.F90
dependencies = ../../hooks/machine.F
dependencies = cu_gf_deep.F90,cu_gf_sh.F90

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cu_gf_driver_post
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cu_gf_driver_pre
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

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

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = samfdeepcnv
type = scheme
dependencies = funcphys.f90,machine.F,samfaerosols.F,progsigma_calc.f90
dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,samfaerosols.F,../progsigma_calc.f90

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = samfshalcnv
type = scheme
dependencies = funcphys.f90,machine.F,samfaerosols.F,progsigma_calc.f90
dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,samfaerosols.F,../progsigma_calc.f90

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

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

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cu_ntiedtke
type = scheme
dependencies = machine.F,physcons.F90
dependencies = ../../hooks/machine.F,../../hooks/physcons.F90

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cu_ntiedtke_post
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cu_ntiedtke_pre
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cires_ugwp.meta → physics/GWD/cires_ugwp.meta
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
type = scheme
# DH* 20200804 - this is a result of the nasty hack to call gwdps from within ugwp-v0!
dependencies=cires_ugwp_triggers.F90,cires_ugwp_initialize.F90
dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,machine.F,ugwp_driver_v0.F
dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,../hooks/machine.F,ugwp_driver_v0.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = cires_ugwp_post
type = scheme
dependencies = machine.F
dependencies = ../hooks/machine.F

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

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

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

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

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

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = rayleigh_damp
type = scheme
dependencies =
dependencies = ../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = ugwpv1_gsldrag
type = scheme
dependencies = machine.F,drag_suite.F90
dependencies = ../hooks/machine.F,drag_suite.F90
dependencies = cires_ugwpv1_module.F90,cires_ugwpv1_triggers.F90,cires_ugwpv1_initialize.F90,cires_ugwpv1_solv2.F90
dependencies = cires_ugwpv1_sporo.F90,cires_ugwpv1_oro.F90
########################################################################
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = ugwpv1_gsldrag_post
type = scheme
dependencies = machine.F
dependencies = ../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions physics/unified_ugwp.meta → physics/GWD/unified_ugwp.meta
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[ccpp-table-properties]
name = unified_ugwp
type = scheme

dependencies=cires_ugwp_triggers.F90,cires_ugwp_initialize.F90
dependencies=cires_orowam2017.f, cires_ugwp_module.F90,gwdps.f,machine.F,ugwp_driver_v0.F
dependencies=drag_suite.F90
dependencies = ../hooks/machine.F
dependencies = cires_ugwp_triggers.F90,cires_ugwp_initialize.F90
dependencies = cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,ugwp_driver_v0.F
dependencies = drag_suite.F90

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = unified_ugwp_post
type = scheme
dependencies = machine.F
dependencies = ../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[ccpp-table-properties]
name = GFS_DCNV_generic_post
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = GFS_DCNV_generic_pre
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[ccpp-table-properties]
name = GFS_GWD_generic_post
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ccpp-table-properties]
name = GFS_GWD_generic_pre
type = scheme
dependencies = machine.F
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[ccpp-table-properties]
name = GFS_MP_generic_post
type = scheme
dependencies = calpreciptype.f90,machine.F
dependencies = ../../MP/calpreciptype.f90,../../hooks/machine.F

########################################################################
[ccpp-arg-table]
Expand Down
File renamed without changes.
Loading

0 comments on commit 7b36320

Please sign in to comment.