Skip to content

Commit a53e98c

Browse files
grantfirlgrantfirl
authored
Merge pull request #121 from grantfirl/ufs-dev-PR153
UFS-dev PR#153
2 parents 3eb15bd + a2310da commit a53e98c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+330
-188
lines changed

‎.github/workflows/GCC.yml

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# This is a CI workflow for the fv3atm project.
2+
#
3+
# This workflow builds and tests the fv3atm library using GCC, and it tests
4+
# different CMake build options.
5+
#
6+
# Alex Richert, 6 Dec 2023
7+
8+
name: GCC
9+
on:
10+
push:
11+
branches:
12+
- develop
13+
pull_request:
14+
branches:
15+
- develop
16+
17+
jobs:
18+
GCC:
19+
runs-on: ubuntu-latest
20+
21+
strategy:
22+
matrix:
23+
cmake_opts: ["-D32BIT=ON", "-D32BIT=OFF"]
24+
gcc_ver: ["11"]
25+
mpi: ["mpich"]
26+
27+
steps:
28+
29+
- name: checkout-fv3atm
30+
uses: actions/checkout@v3
31+
with:
32+
path: ${{ github.workspace }}/fv3atm
33+
submodules: recursive
34+
35+
- name: cache-spack
36+
id: cache-spack
37+
uses: actions/cache@v3
38+
with:
39+
path: ${{ github.workspace }}/spack-develop
40+
key: spack-${{ hashFiles('fv3atm/ci/spack.yaml') }}-gcc${{ matrix.gcc_ver }}-2
41+
42+
# Building dependencies takes 40+ min
43+
- name: spack-install
44+
if: steps.cache-spack.outputs.cache-hit != 'true'
45+
run: |
46+
wget --no-verbose https://github.com/spack/spack/archive/refs/heads/develop.zip
47+
unzip develop.zip -d ${GITHUB_WORKSPACE}/ &> unzip.out
48+
. ${GITHUB_WORKSPACE}/spack-develop/share/spack/setup-env.sh
49+
spack env create gcc${{ matrix.gcc_ver }} ${GITHUB_WORKSPACE}/fv3atm/ci/spack.yaml
50+
spack env activate gcc${{ matrix.gcc_ver }}
51+
spack compiler find | grep gcc@${{ matrix.gcc_ver }}
52+
spack external find gmake cmake git git-lfs perl python ${{ matrix.mpi }}
53+
spack config add "packages:all:require:['%gcc@${{ matrix.gcc_ver }}']"
54+
spack config add "packages:mpi:require:'${{ matrix.mpi }}'"
55+
spack concretize |& tee ${SPACK_ENV}/log.concretize
56+
spack install -j2 --fail-fast
57+
58+
- name: cache-save
59+
uses: actions/cache/save@v3
60+
if: ${{ always() }}
61+
with:
62+
path: ${{ github.workspace }}/spack-develop
63+
key: spack-${{ hashFiles('fv3atm/ci/spack.yaml') }}-gcc${{ matrix.gcc_ver }}-2
64+
65+
- name: build-fv3atm
66+
run: |
67+
. ${GITHUB_WORKSPACE}/spack-develop/share/spack/setup-env.sh
68+
spack env activate gcc${{ matrix.gcc_ver }}
69+
spack load $(spack find --format "{name}")
70+
cd ${GITHUB_WORKSPACE}/fv3atm
71+
git clone https://github.com/NOAA-EMC/CMakeModules
72+
git clone --recurse-submodules https://github.com/NOAA-PSL/stochastic_physics stochastic_physics_repo
73+
mkdir ${GITHUB_WORKSPACE}/build
74+
cd ${GITHUB_WORKSPACE}/build
75+
cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_TESTING=ON ${{ matrix.cmake_opts }}
76+
make -j2
77+
78+
- name: debug-artifacts
79+
uses: actions/upload-artifact@v3
80+
if: ${{ failure() }}
81+
with:
82+
name: ccpp_prebuild_logs
83+
path: ${{ github.workspace }}/build/ccpp/ccpp_prebuild.*

‎CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Enable CI build & unit testing:
2+
if(BUILD_TESTING)
3+
cmake_minimum_required(VERSION 3.19)
4+
project(fv3atm VERSION 1.0 LANGUAGES C CXX Fortran)
5+
include(ci/CMakeLists.txt)
6+
endif()
17

28
###############################################################################
39
### CCPP

‎ccpp/config/ccpp_prebuild_config.py

+132-136
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
VARIABLE_DEFINITION_FILES = [
1717
# actual variable definition files
1818
'framework/src/ccpp_types.F90',
19-
'physics/physics/machine.F',
20-
'physics/physics/radsw_param.f',
21-
'physics/physics/radlw_param.f',
22-
'physics/physics/h2o_def.f',
23-
'physics/physics/radiation_surface.f',
24-
'physics/physics/module_ozphys.F90',
19+
'physics/physics/hooks/machine.F',
20+
'physics/physics/Radiation/RRTMG/radsw_param.f',
21+
'physics/physics/Radiation/RRTMG/radlw_param.f',
22+
'physics/physics/photochem/h2o_def.f',
23+
'physics/physics/photochem/module_ozphys.F90',
2524
'data/CCPP_typedefs.F90',
2625
'data/GFS_typedefs.F90',
2726
'data/CCPP_data.F90',
@@ -74,138 +73,135 @@
7473
# Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ];
7574
# current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the
7675
# suite definition file have to belong to the same physics set
77-
'physics/physics/GFS_DCNV_generic_pre.F90',
78-
'physics/physics/GFS_DCNV_generic_post.F90',
79-
'physics/physics/GFS_GWD_generic_pre.F90',
80-
'physics/physics/GFS_GWD_generic_post.F90',
81-
'physics/physics/GFS_MP_generic_pre.F90',
82-
'physics/physics/GFS_MP_generic_post.F90',
83-
'physics/physics/GFS_PBL_generic_pre.F90',
84-
'physics/physics/GFS_PBL_generic_post.F90',
85-
'physics/physics/GFS_SCNV_generic_pre.F90',
86-
'physics/physics/GFS_SCNV_generic_post.F90',
87-
'physics/physics/GFS_debug.F90',
88-
'physics/physics/GFS_phys_time_vary.fv3.F90',
89-
'physics/physics/GFS_rad_time_vary.fv3.F90',
90-
'physics/physics/GFS_radiation_surface.F90',
91-
'physics/physics/GFS_rrtmg_post.F90',
92-
'physics/physics/GFS_rrtmg_pre.F90',
93-
'physics/physics/GFS_rrtmg_setup.F90',
94-
'physics/physics/GFS_stochastics.F90',
95-
'physics/physics/GFS_suite_interstitial_rad_reset.F90',
96-
'physics/physics/GFS_suite_interstitial_phys_reset.F90',
97-
'physics/physics/GFS_suite_interstitial_1.F90',
98-
'physics/physics/GFS_suite_interstitial_2.F90',
99-
'physics/physics/GFS_suite_stateout_reset.F90',
100-
'physics/physics/GFS_suite_stateout_update.F90',
101-
'physics/physics/GFS_suite_interstitial_3.F90',
102-
'physics/physics/GFS_suite_interstitial_4.F90',
103-
'physics/physics/GFS_suite_interstitial_5.F90',
104-
'physics/physics/GFS_surface_generic_pre.F90',
105-
'physics/physics/GFS_surface_generic_post.F90',
106-
'physics/physics/GFS_surface_composites_pre.F90',
107-
'physics/physics/GFS_surface_composites_inter.F90',
108-
'physics/physics/GFS_surface_composites_post.F90',
109-
'physics/physics/GFS_surface_loop_control_part1.F90',
110-
'physics/physics/GFS_surface_loop_control_part2.F90',
111-
'physics/physics/GFS_time_vary_pre.fv3.F90',
112-
'physics/physics/GFS_physics_post.F90',
113-
'physics/physics/cires_ugwp.F90',
114-
'physics/physics/cires_ugwp_post.F90',
115-
'physics/physics/unified_ugwp.F90',
116-
'physics/physics/unified_ugwp_post.F90',
117-
'physics/physics/ugwpv1_gsldrag.F90',
118-
'physics/physics/ugwpv1_gsldrag_post.F90',
119-
'physics/physics/cnvc90.f',
120-
'physics/physics/cs_conv_pre.F90',
121-
'physics/physics/cs_conv.F90',
122-
'physics/physics/cs_conv_post.F90',
123-
'physics/physics/cs_conv_aw_adj.F90',
124-
'physics/physics/cu_ntiedtke_pre.F90',
125-
'physics/physics/cu_ntiedtke.F90',
126-
'physics/physics/cu_ntiedtke_post.F90',
127-
'physics/physics/dcyc2t3.f',
128-
'physics/physics/drag_suite.F90',
129-
'physics/physics/shoc.F90',
130-
'physics/physics/get_prs_fv3.F90',
131-
'physics/physics/get_phi_fv3.F90',
132-
'physics/physics/gfdl_cloud_microphys.F90',
133-
'physics/physics/fv_sat_adj.F90',
134-
'physics/physics/gfdl_sfc_layer.F90',
135-
'physics/physics/zhaocarr_gscond.f',
136-
'physics/physics/gwdc_pre.f',
137-
'physics/physics/gwdc.f',
138-
'physics/physics/gwdc_post.f',
139-
'physics/physics/gwdps.f',
140-
'physics/physics/h2ophys.f',
141-
'physics/physics/samfdeepcnv.f',
142-
'physics/physics/samfshalcnv.f',
143-
'physics/physics/sascnvn.F',
144-
'physics/physics/shalcnv.F',
145-
'physics/physics/maximum_hourly_diagnostics.F90',
146-
'physics/physics/m_micro.F90',
147-
'physics/physics/m_micro_pre.F90',
148-
'physics/physics/m_micro_post.F90',
149-
'physics/physics/cu_gf_driver_pre.F90',
150-
'physics/physics/cu_gf_driver.F90',
151-
'physics/physics/cu_gf_driver_post.F90',
152-
'physics/physics/cu_c3_driver_pre.F90',
153-
'physics/physics/cu_c3_driver.F90',
154-
'physics/physics/cu_c3_driver_post.F90',
155-
'physics/physics/hedmf.f',
156-
'physics/physics/moninshoc.f',
157-
'physics/physics/satmedmfvdif.F',
158-
'physics/physics/satmedmfvdifq.F',
159-
'physics/physics/shinhongvdif.F90',
160-
'physics/physics/ysuvdif.F90',
161-
'physics/physics/mynnedmf_wrapper.F90',
162-
'physics/physics/mynnsfc_wrapper.F90',
163-
'physics/physics/sgscloud_radpre.F90',
164-
'physics/physics/sgscloud_radpost.F90',
165-
'physics/physics/myjsfc_wrapper.F90',
166-
'physics/physics/myjpbl_wrapper.F90',
167-
'physics/physics/mp_thompson_pre.F90',
168-
'physics/physics/mp_thompson.F90',
169-
'physics/physics/mp_thompson_post.F90',
170-
'physics/physics/mp_nssl.F90',
171-
'physics/physics/zhaocarr_precpd.f',
172-
'physics/physics/radlw_main.F90',
173-
'physics/physics/radsw_main.F90',
174-
'physics/physics/rascnv.F90',
175-
'physics/physics/rayleigh_damp.f',
176-
'physics/physics/rrtmg_lw_post.F90',
177-
'physics/physics/rrtmg_lw_pre.F90',
178-
'physics/physics/rrtmg_sw_post.F90',
179-
'physics/physics/rad_sw_pre.F90',
180-
'physics/physics/sfc_diag.f',
181-
'physics/physics/sfc_diag_post.F90',
182-
'physics/physics/lsm_ruc.F90',
183-
'physics/physics/sfc_cice.f',
184-
'physics/physics/sfc_diff.f',
185-
'physics/physics/lsm_noah.f',
186-
'physics/physics/noahmpdrv.F90',
187-
'physics/physics/flake_driver.F90',
188-
'physics/physics/clm_lake.f90',
189-
'physics/physics/sfc_nst_pre.f90',
190-
'physics/physics/sfc_nst.f90',
191-
'physics/physics/sfc_nst_post.f90',
192-
'physics/physics/sfc_ocean.F',
193-
'physics/physics/sfc_sice.f',
194-
# HAFS FER_HIRES
195-
'physics/physics/mp_fer_hires.F90',
196-
# SMOKE
76+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90',
77+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90',
78+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90',
79+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90',
80+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90',
81+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90',
82+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90',
83+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90',
84+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.F90',
85+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90',
86+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90',
87+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90',
88+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.F90',
89+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90',
90+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90',
91+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90',
92+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90',
93+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90',
94+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90',
95+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.F90',
96+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90',
97+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90',
98+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90',
99+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.F90',
100+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90',
101+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90',
102+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90',
103+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90',
104+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90',
105+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.F90',
106+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90',
107+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90',
108+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.F90',
109+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.F90',
110+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90',
111+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90',
112+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_inter.F90',
113+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90',
114+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90',
115+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90',
116+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.F90',
117+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.f',
118+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.f',
119+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.F90',
120+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.F90',
121+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90',
122+
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpost.F90',
123+
'physics/physics/CONV/Chikira_Sugiyama/cs_conv_pre.F90',
124+
'physics/physics/CONV/Chikira_Sugiyama/cs_conv.F90',
125+
'physics/physics/CONV/Chikira_Sugiyama/cs_conv_post.F90',
126+
'physics/physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.F90',
127+
'physics/physics/CONV/nTiedtke/cu_ntiedtke_pre.F90',
128+
'physics/physics/CONV/nTiedtke/cu_ntiedtke.F90',
129+
'physics/physics/CONV/nTiedtke/cu_ntiedtke_post.F90',
130+
'physics/physics/CONV/SAMF/samfdeepcnv.f',
131+
'physics/physics/CONV/SAMF/samfshalcnv.f',
132+
'physics/physics/CONV/SAS/sascnvn.F',
133+
'physics/physics/CONV/SAS/shalcnv.F',
134+
'physics/physics/CONV/Grell_Freitas/cu_gf_driver_pre.F90',
135+
'physics/physics/CONV/Grell_Freitas/cu_gf_driver.F90',
136+
'physics/physics/CONV/Grell_Freitas/cu_gf_driver_post.F90',
137+
'physics/physics/CONV/C3/cu_c3_driver_pre.F90',
138+
'physics/physics/CONV/C3/cu_c3_driver.F90',
139+
'physics/physics/CONV/C3/cu_c3_driver_post.F90',
140+
'physics/physics/CONV/RAS/rascnv.F90',
141+
'physics/physics/GWD/cires_ugwp.F90',
142+
'physics/physics/GWD/cires_ugwp_post.F90',
143+
'physics/physics/GWD/unified_ugwp.F90',
144+
'physics/physics/GWD/unified_ugwp_post.F90',
145+
'physics/physics/GWD/ugwpv1_gsldrag.F90',
146+
'physics/physics/GWD/ugwpv1_gsldrag_post.F90',
147+
'physics/physics/GWD/drag_suite.F90',
148+
'physics/physics/GWD/gwdc_pre.f',
149+
'physics/physics/GWD/gwdc.f',
150+
'physics/physics/GWD/gwdc_post.f',
151+
'physics/physics/GWD/gwdps.f',
152+
'physics/physics/GWD/rayleigh_damp.f',
153+
'physics/physics/photochem/h2ophys.f',
154+
'physics/physics/photochem/module_ozphys.F90',
155+
'physics/physics/MP/Ferrier_Aligo/mp_fer_hires.F90',
156+
'physics/physics/MP/GFDL/gfdl_cloud_microphys.F90',
157+
'physics/physics/MP/GFDL/fv_sat_adj.F90',
158+
'physics/physics/MP/Morrison_Gettelman/m_micro.F90',
159+
'physics/physics/MP/Morrison_Gettelman/m_micro_pre.F90',
160+
'physics/physics/MP/Morrison_Gettelman/m_micro_post.F90',
161+
'physics/physics/MP/NSSL/mp_nssl.F90',
162+
'physics/physics/MP/Thompson/mp_thompson_pre.F90',
163+
'physics/physics/MP/Thompson/mp_thompson.F90',
164+
'physics/physics/MP/Thompson/mp_thompson_post.F90',
165+
'physics/physics/MP/Zhao_Carr/zhaocarr_gscond.f',
166+
'physics/physics/MP/Zhao_Carr/zhaocarr_precpd.f',
167+
'physics/physics/PBL/HEDMF/hedmf.f',
168+
'physics/physics/PBL/SHOC/moninshoc.f',
169+
'physics/physics/PBL/SHOC/shoc.F90',
170+
'physics/physics/PBL/MYJ/myjpbl_wrapper.F90',
171+
'physics/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90',
172+
'physics/physics/PBL/SATMEDMF/satmedmfvdif.F',
173+
'physics/physics/PBL/SATMEDMF/satmedmfvdifq.F',
174+
'physics/physics/PBL/YSU/ysuvdif.F90',
175+
'physics/physics/PBL/saYSU/shinhongvdif.F90',
176+
'physics/physics/Radiation/RRTMG/radsw_main.F90',
177+
'physics/physics/Radiation/RRTMG/radlw_main.F90',
178+
'physics/physics/Radiation/RRTMG/rrtmg_lw_post.F90',
179+
'physics/physics/Radiation/RRTMG/rrtmg_sw_post.F90',
180+
'physics/physics/Radiation/RRTMG/rad_sw_pre.F90',
181+
'physics/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.F90',
182+
'physics/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90',
183+
'physics/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90',
184+
'physics/physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90',
185+
'physics/physics/SFC_Layer/MYNN/mynnsfc_wrapper.F90',
186+
'physics/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90',
187+
'physics/physics/SFC_Layer/UFS/sfc_diag.f',
188+
'physics/physics/SFC_Layer/UFS/sfc_diag_post.F90',
189+
'physics/physics/SFC_Layer/UFS/sfc_diff.f',
190+
'physics/physics/SFC_Layer/UFS/sfc_nst_pre.f90',
191+
'physics/physics/SFC_Layer/UFS/sfc_nst.f90',
192+
'physics/physics/SFC_Layer/UFS/sfc_nst_post.f90',
193+
'physics/physics/SFC_Models/Land/RUC/lsm_ruc.F90',
194+
'physics/physics/SFC_Models/SeaIce/CICE/sfc_cice.f',
195+
'physics/physics/SFC_Models/Land/Noah/lsm_noah.f',
196+
'physics/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90',
197+
'physics/physics/SFC_Models/Lake/Flake/flake_driver.F90',
198+
'physics/physics/SFC_Models/Lake/CLM/clm_lake.f90',
199+
'physics/physics/SFC_Models/Ocean/UFS/sfc_ocean.F',
200+
'physics/physics/SFC_Models/SeaIce/CICE/sfc_sice.f',
197201
'physics/physics/smoke_dust/rrfs_smoke_wrapper.F90',
198202
'physics/physics/smoke_dust/rrfs_smoke_postpbl.F90',
199-
# RRTMGP
200-
'physics/physics/rrtmgp_aerosol_optics.F90',
201-
'physics/physics/rrtmgp_lw_main.F90',
202-
'physics/physics/rrtmgp_sw_main.F90',
203-
'physics/physics/GFS_rrtmgp_setup.F90',
204-
'physics/physics/GFS_rrtmgp_pre.F90',
205-
'physics/physics/GFS_cloud_diagnostics.F90',
206-
'physics/physics/GFS_rrtmgp_cloud_mp.F90',
207-
'physics/physics/GFS_rrtmgp_cloud_overlap.F90',
208-
'physics/physics/GFS_rrtmgp_post.F90'
203+
'physics/physics/tools/get_prs_fv3.F90',
204+
'physics/physics/tools/get_phi_fv3.F90'
209205
]
210206

211207
# Default build dir, relative to current working directory,

‎ccpp/data/CCPP_typedefs.meta

+2-5
Original file line numberDiff line numberDiff line change
@@ -3193,11 +3193,8 @@
31933193
name = CCPP_typedefs
31943194
type = module
31953195
relative_path = ../physics/physics
3196-
dependencies = machine.F,radlw_param.f,radsw_param.f
3197-
dependencies = rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90,rte-rrtmgp/rte/mo_optical_props.F90
3198-
dependencies = rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90
3199-
dependencies = rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90,rte-rrtmgp/rte/mo_rte_config.F90
3200-
dependencies = rte-rrtmgp/rte/mo_source_functions.F90
3196+
dependencies = hooks/machine.F,photochem/module_ozphys.F90
3197+
dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
32013198

32023199
[ccpp-arg-table]
32033200
name = CCPP_typedefs

0 commit comments

Comments
 (0)