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

UFS-dev PR#153 #1062

Merged
merged 25 commits into from
Mar 14, 2024
Merged

UFS-dev PR#153 #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c31f920
Reorganization
dustinswales Sep 1, 2023
f45f8ad
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Sep 1, 2023
53eda4d
Address comments from review.
dustinswales Sep 5, 2023
daf1799
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Oct 18, 2023
5592fc4
Metafile cleanup
dustinswales Oct 19, 2023
e627b18
Move rte-rrtmgp submodule
dustinswales Oct 19, 2023
f7edbc1
More cleanup
dustinswales Oct 26, 2023
45bf6a4
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Oct 26, 2023
d4835d1
Address reviewers comments.
dustinswales Oct 30, 2023
1d31182
More metatdata changes
dustinswales Oct 31, 2023
73d8f0c
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Nov 17, 2023
1fb6b84
Bug fix in metadata
dustinswales Nov 28, 2023
a49352a
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Nov 28, 2023
87721c6
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Dec 6, 2023
8180a05
Omission from previous merge
dustinswales Dec 7, 2023
3c1e819
More metadata fixes
dustinswales Dec 7, 2023
a7b8325
Bug in CMake file
dustinswales Dec 14, 2023
df9e1ad
Merge pull request #135 from haiqinli/ufs/dev-smoke-dust
dustinswales Dec 27, 2023
26ca617
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jan 2, 2024
53062d6
Merge pull request #99 from dustinswales/feature_reorg_physics
dustinswales Jan 3, 2024
18616d4
established a branch for q MERRA2 bug fixed from RRFS
AnningCheng-NOAA Jan 8, 2024
82d3295
Merge branch 'mr2_peq' into ufs-dev-PR153
grantfirl Feb 6, 2024
41b3877
Merge branch 'ufs-dev-PR120' into ufs-dev-PR153
grantfirl Feb 9, 2024
d8cb45c
move/edit CCPP-SCM suite simulator files after CCPP Physics Repo reorg
grantfirl Feb 9, 2024
48221d2
Merge branch 'main' into ufs-dev-PR153
grantfirl Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
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
View file
Open in desktop
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
Open in desktop
File renamed without changes.
0 physics/cu_c3_driver.F90 → physics/CONV/C3/cu_c3_driver.F90
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion physics/cu_c3_driver.meta → physics/CONV/C3/cu_c3_driver.meta
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
File renamed without changes.
0 physics/cs_conv.F90 → physics/CONV/Chikira_Sugiyama/cs_conv.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cs_conv.meta → physics/CONV/Chikira_Sugiyama/cs_conv.meta
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
0 physics/cu_gf_deep.F90 → physics/CONV/Grell_Freitas/cu_gf_deep.F90
View file
Open in desktop
File renamed without changes.
0 physics/cu_gf_driver.F90 → physics/CONV/Grell_Freitas/cu_gf_driver.F90
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion physics/cu_gf_driver.meta → physics/CONV/Grell_Freitas/cu_gf_driver.meta
View file
Open in desktop
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
0 physics/cu_gf_driver_post.F90 → .../CONV/Grell_Freitas/cu_gf_driver_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cu_gf_driver_post.meta → ...CONV/Grell_Freitas/cu_gf_driver_post.meta
View file
Open in desktop
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
0 physics/cu_gf_driver_pre.F90 → ...s/CONV/Grell_Freitas/cu_gf_driver_pre.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cu_gf_driver_pre.meta → .../CONV/Grell_Freitas/cu_gf_driver_pre.meta
View file
Open in desktop
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
0 physics/cu_gf_sh.F90 → physics/CONV/Grell_Freitas/cu_gf_sh.F90
View file
Open in desktop
File renamed without changes.
0 physics/rascnv.F90 → physics/CONV/RAS/rascnv.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/rascnv.meta → physics/CONV/RAS/rascnv.meta
View file
Open in desktop
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
0 physics/samfaerosols.F → physics/CONV/SAMF/samfaerosols.F
View file
Open in desktop
File renamed without changes.
0 physics/samfdeepcnv.f → physics/CONV/SAMF/samfdeepcnv.f
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/samfdeepcnv.meta → physics/CONV/SAMF/samfdeepcnv.meta
View file
Open in desktop
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
0 physics/samfshalcnv.f → physics/CONV/SAMF/samfshalcnv.f
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/samfshalcnv.meta → physics/CONV/SAMF/samfshalcnv.meta
View file
Open in desktop
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
0 physics/sascnvn.F → physics/CONV/SAS/sascnvn.F
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/sascnvn.meta → physics/CONV/SAS/sascnvn.meta
View file
Open in desktop
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
0 physics/shalcnv.F → physics/CONV/SAS/shalcnv.F
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/shalcnv.meta → physics/CONV/SAS/shalcnv.meta
View file
Open in desktop
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
0 physics/cu_ntiedtke.F90 → physics/CONV/nTiedtke/cu_ntiedtke.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cu_ntiedtke.meta → physics/CONV/nTiedtke/cu_ntiedtke.meta
View file
Open in desktop
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
0 physics/cu_ntiedtke_post.F90 → physics/CONV/nTiedtke/cu_ntiedtke_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cu_ntiedtke_post.meta → physics/CONV/nTiedtke/cu_ntiedtke_post.meta
View file
Open in desktop
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
0 physics/cu_ntiedtke_pre.F90 → physics/CONV/nTiedtke/cu_ntiedtke_pre.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cu_ntiedtke_pre.meta → physics/CONV/nTiedtke/cu_ntiedtke_pre.meta
View file
Open in desktop
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
0 physics/progsigma_calc.f90 → physics/CONV/progsigma_calc.f90
View file
Open in desktop
File renamed without changes.
0 physics/cires_orowam2017.f → physics/GWD/cires_orowam2017.f
View file
Open in desktop
File renamed without changes.
0 physics/cires_tauamf_data.F90 → physics/GWD/cires_tauamf_data.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwp.F90 → physics/GWD/cires_ugwp.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cires_ugwp.meta → physics/GWD/cires_ugwp.meta
View file
Open in desktop
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
0 physics/cires_ugwp_initialize.F90 → physics/GWD/cires_ugwp_initialize.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwp_module.F90 → physics/GWD/cires_ugwp_module.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwp_post.F90 → physics/GWD/cires_ugwp_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/cires_ugwp_post.meta → physics/GWD/cires_ugwp_post.meta
View file
Open in desktop
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
0 physics/cires_ugwp_triggers.F90 → physics/GWD/cires_ugwp_triggers.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwpv1_initialize.F90 → physics/GWD/cires_ugwpv1_initialize.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwpv1_module.F90 → physics/GWD/cires_ugwpv1_module.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwpv1_oro.F90 → physics/GWD/cires_ugwpv1_oro.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwpv1_solv2.F90 → physics/GWD/cires_ugwpv1_solv2.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwpv1_sporo.F90 → physics/GWD/cires_ugwpv1_sporo.F90
View file
Open in desktop
File renamed without changes.
0 physics/cires_ugwpv1_triggers.F90 → physics/GWD/cires_ugwpv1_triggers.F90
View file
Open in desktop
File renamed without changes.
0 physics/drag_suite.F90 → physics/GWD/drag_suite.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/drag_suite.meta → physics/GWD/drag_suite.meta
View file
Open in desktop
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
0 physics/gwdc.f → physics/GWD/gwdc.f
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/gwdc.meta → physics/GWD/gwdc.meta
View file
Open in desktop
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
0 physics/gwdc_post.f → physics/GWD/gwdc_post.f
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/gwdc_post.meta → physics/GWD/gwdc_post.meta
View file
Open in desktop
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
0 physics/gwdc_pre.f → physics/GWD/gwdc_pre.f
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/gwdc_pre.meta → physics/GWD/gwdc_pre.meta
View file
Open in desktop
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
0 physics/gwdps.f → physics/GWD/gwdps.f
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/gwdps.meta → physics/GWD/gwdps.meta
View file
Open in desktop
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
0 physics/rayleigh_damp.f → physics/GWD/rayleigh_damp.f
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/rayleigh_damp.meta → physics/GWD/rayleigh_damp.meta
View file
Open in desktop
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
0 physics/ugwp_driver_v0.F → physics/GWD/ugwp_driver_v0.F
View file
Open in desktop
File renamed without changes.
0 physics/ugwpv1_gsldrag.F90 → physics/GWD/ugwpv1_gsldrag.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/ugwpv1_gsldrag.meta → physics/GWD/ugwpv1_gsldrag.meta
View file
Open in desktop
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
0 physics/ugwpv1_gsldrag_post.F90 → physics/GWD/ugwpv1_gsldrag_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/ugwpv1_gsldrag_post.meta → physics/GWD/ugwpv1_gsldrag_post.meta
View file
Open in desktop
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
0 physics/unified_ugwp.F90 → physics/GWD/unified_ugwp.F90
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions physics/unified_ugwp.meta → physics/GWD/unified_ugwp.meta
View file
Open in desktop
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
0 physics/unified_ugwp_post.F90 → physics/GWD/unified_ugwp_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/unified_ugwp_post.meta → physics/GWD/unified_ugwp_post.meta
View file
Open in desktop
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
0 physics/GFS_DCNV_generic_post.F90 → ...UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/GFS_DCNV_generic_post.meta → ...FS_SCM_NEPTUNE/GFS_DCNV_generic_post.meta
View file
Open in desktop
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
0 physics/GFS_DCNV_generic_pre.F90 → .../UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/GFS_DCNV_generic_pre.meta → ...UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.meta
View file
Open in desktop
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
0 physics/GFS_GWD_generic_post.F90 → .../UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/GFS_GWD_generic_post.meta → ...UFS_SCM_NEPTUNE/GFS_GWD_generic_post.meta
View file
Open in desktop
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
0 physics/GFS_GWD_generic_pre.F90 → ...s/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/GFS_GWD_generic_pre.meta → .../UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.meta
View file
Open in desktop
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
0 physics/GFS_MP_generic_post.F90 → ...s/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion physics/GFS_MP_generic_post.meta → .../UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta
View file
Open in desktop
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
0 physics/GFS_MP_generic_pre.F90 → ...ls/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90
View file
Open in desktop
File renamed without changes.
Loading
Loading