Skip to content
This repository was archived by the owner on Oct 23, 2020. It is now read-only.

Atmosphere/physics makefile updates #1238

Merged
merged 4 commits into from
Feb 15, 2017
Merged

Atmosphere/physics makefile updates #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f82892
* In ./src/core_atmosphere/physics modules where we had the two use s…
ldfowler58 Jan 27, 2017
00829fc
* In ./src/core_atmosphere/physics/Makefile:
ldfowler58 Feb 10, 2017
31d0136
* In ./src/core_atmosphere/physics/physics_wrf/Makefile, corrected th…
ldfowler58 Feb 14, 2017
8737b09
* In ./src/core_atmosphere/physics/physics_wrf:
ldfowler58 Feb 14, 2017
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
85 changes: 24 additions & 61 deletions src/core_atmosphere/physics/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ ifeq ($(CORE),atmosphere)
COREDEF = -Dmpas
endif

all: lookup_tables core_physics_init core_physics_wrf core_physics

dummy:
echo "****** make non-hydrostatic core ******"
echo "****** compiling physics ******"

OBJS_init = \
mpas_atmphys_constants.o \
mpas_atmphys_date_time.o \
mpas_atmphys_functions.o \
mpas_atmphys_utilities.o \
mpas_atmphys_o3climatology.o
mpas_atmphys_utilities.o

OBJS = \
mpas_atmphys_camrad_init.o \
Expand All @@ -23,17 +24,19 @@ OBJS = \
mpas_atmphys_driver_gwdo.o \
mpas_atmphys_driver_lsm.o \
mpas_atmphys_driver_microphysics.o \
mpas_atmphys_driver_oml.o \
mpas_atmphys_driver_pbl.o \
mpas_atmphys_driver_radiation_lw.o \
mpas_atmphys_driver_radiation_sw.o \
mpas_atmphys_driver_sfclayer.o \
mpas_atmphys_finalize.o \
mpas_atmphys_init.o \
mpas_atmphys_init_microphysics.o \
mpas_atmphys_interface.o \
mpas_atmphys_landuse.o \
mpas_atmphys_lsm_noahinit.o \
mpas_atmphys_manager.o \
mpas_atmphys_driver_oml.o \
mpas_atmphys_o3climatology.o \
mpas_atmphys_packages.o \
mpas_atmphys_rrtmg_lwinit.o \
mpas_atmphys_rrtmg_swinit.o \
Expand All @@ -42,19 +45,12 @@ OBJS = \
mpas_atmphys_update.o \
mpas_atmphys_vars.o

OBJS_dyn = mpas_atmphys_interface.o

all: lookup_tables core_physics_init core_physics_wrf core_dyn core_physics

lookup_tables:
./checkout_data_files.sh

core_physics_wrf:
(cd physics_wrf; make all COREDEF="$(COREDEF)")

core_dyn: $(OBJS_dyn)
ar -ru libphys.a $(OBJS_dyn)

core_physics_init: $(OBJS_init)
ar -ru libphys.a $(OBJS_init)

Expand All @@ -64,8 +60,7 @@ core_physics: $(OBJS)
# DEPENDENCIES:
mpas_atmphys_camrad_init.o: \
mpas_atmphys_constants.o \
mpas_atmphys_utilities.o \
./physics_wrf/module_ra_cam_support.o
mpas_atmphys_utilities.o

mpas_atmphys_control.o: \
mpas_atmphys_utilities.o \
Expand All @@ -88,79 +83,54 @@ mpas_atmphys_driver.o: \

mpas_atmphys_driver_cloudiness.o: \
mpas_atmphys_constants.o \
mpas_atmphys_vars.o \
./physics_wrf/module_mp_thompson_cldfra3.o
mpas_atmphys_vars.o

mpas_atmphys_driver_convection.o: \
mpas_atmphys_constants.o \
mpas_atmphys_utilities.o \
mpas_atmphys_vars.o \
./physics_wrf/module_cu_gf.mpas.o \
./physics_wrf/module_cu_kfeta.o \
./physics_wrf/module_cu_tiedtke.o \
./physics_wrf/module_cu_ntiedtke.o

mpas_atmphys_finalize.o: \
./physics_wrf/module_mp_thompson.o

mpas_atmphys_finalize.o: \
./physics_wrf/module_mp_thompson.o
mpas_atmphys_vars.o

mpas_atmphys_driver_gwdo.o: \
mpas_atmphys_vars.o \
./physics_wrf/module_bl_gwdo.o
mpas_atmphys_vars.o

mpas_atmphys_driver_lsm.o: \
mpas_atmphys_constants.o \
mpas_atmphys_landuse.o \
mpas_atmphys_lsm_noahinit.o \
mpas_atmphys_vars.o \
./physics_wrf/module_sf_noahdrv.o
mpas_atmphys_vars.o

mpas_atmphys_driver_microphysics.o: \
mpas_atmphys_constants.o \
mpas_atmphys_init_microphysics.o \
mpas_atmphys_interface.o \
mpas_atmphys_vars.o \
./physics_wrf/module_mp_kessler.o \
./physics_wrf/module_mp_thompson.o \
./physics_wrf/module_mp_wsm6.o
mpas_atmphys_vars.o

mpas_atmphys_driver_oml.o: \
mpas_atmphys_constants.o \
mpas_atmphys_vars.o \
./physics_wrf/module_sf_oml.o
mpas_atmphys_vars.o

mpas_atmphys_driver_pbl.o: \
mpas_atmphys_constants.o \
mpas_atmphys_vars.o \
./physics_wrf/module_bl_mynn.o \
./physics_wrf/module_bl_ysu.o
mpas_atmphys_vars.o

mpas_atmphys_driver_radiation_lw.o: \
mpas_atmphys_camrad_init.o \
mpas_atmphys_constants.o \
mpas_atmphys_driver_radiation_sw.o \
mpas_atmphys_manager.o \
mpas_atmphys_rrtmg_lwinit.o \
mpas_atmphys_vars.o \
./physics_wrf/module_ra_cam.o \
./physics_wrf/module_ra_rrtmg_lw.o
mpas_atmphys_vars.o

mpas_atmphys_driver_radiation_sw.o: \
mpas_atmphys_camrad_init.o \
mpas_atmphys_constants.o \
mpas_atmphys_manager.o \
mpas_atmphys_rrtmg_swinit.o \
mpas_atmphys_vars.o \
./physics_wrf/module_ra_cam.o \
./physics_wrf/module_ra_rrtmg_sw.o
mpas_atmphys_vars.o

mpas_atmphys_driver_sfclayer.o: \
mpas_atmphys_constants.o \
mpas_atmphys_vars.o \
./physics_wrf/module_sf_mynn.o \
./physics_wrf/module_sf_sfclay.o
mpas_atmphys_vars.o

mpas_atmphys_init.o: \
mpas_atmphys_driver_convection.o \
Expand All @@ -172,9 +142,6 @@ mpas_atmphys_init.o: \
mpas_atmphys_landuse.o \
mpas_atmphys_o3climatology.o

mpas_atmphys_init_microphysics.o: \
./physics_wrf/module_mp_thompson.o

mpas_atmphys_interface.o: \
mpas_atmphys_constants.o \
mpas_atmphys_vars.o
Expand All @@ -185,8 +152,7 @@ mpas_atmphys_landuse.o: \

mpas_atmphys_lsm_noahinit.o: \
mpas_atmphys_constants.o \
mpas_atmphys_utilities.o \
./physics_wrf/module_sf_noahlsm.o
mpas_atmphys_utilities.o

mpas_atmphys_manager.o: \
mpas_atmphys_constants.o \
Expand All @@ -198,18 +164,15 @@ mpas_atmphys_manager.o: \
mpas_atmphys_o3climatology.o: \
mpas_atmphys_date_time.o \
mpas_atmphys_constants.o \
mpas_atmphys_utilities.o \
./physics_wrf/module_ra_cam_support.o
mpas_atmphys_utilities.o

mpas_atmphys_rrtmg_lwinit.o: \
mpas_atmphys_constants.o \
mpas_atmphys_utilities.o \
./physics_wrf/module_ra_rrtmg_lw.o
mpas_atmphys_utilities.o

mpas_atmphys_rrtmg_swinit.o: \
mpas_atmphys_constants.o \
mpas_atmphys_utilities.o \
./physics_wrf/module_ra_rrtmg_sw.o
mpas_atmphys_utilities.o

mpas_atmphys_todynamics.o: \
mpas_atmphys_constants.o \
Expand All @@ -236,7 +199,7 @@ clean:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(COREDEF) $(HYDROSTATIC) $(CPPINCLUDES) $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I.. -I../../framework -I../../operators -I./physics_wrf -I../../external/esmf_time_f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_wrf -I.. -I../../framework -I../../external/esmf_time_f90
else
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I.. -I../../framework -I../../operators -I./physics_wrf -I../../external/esmf_time_f90
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I./physics_wrf -I.. -I../../framework -I../../external/esmf_time_f90
endif
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_camrad_init.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
module mpas_atmphys_camrad_init
use mpas_dmpar
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants,only: cp,degrad,ep_2,gravity,R_d,R_v,stbolt
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_control.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
module mpas_atmphys_control
use mpas_dmpar
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_utilities
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_driver_cloudiness
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_cloudiness
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants, only: ep_2
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_convection.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_convection
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_gwdo.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_gwdo
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_lsm.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_lsm
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_microphysics.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_microphysics
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_oml.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_oml
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_pbl
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
4 changes: 3 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_radiation_lw.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
module mpas_atmphys_driver_radiation_lw
use mpas_kind_types
use mpas_pool_routines
!use mpas_derived_types

use mpas_atmphys_driver_radiation_sw, only: radconst
use mpas_atmphys_constants
Expand Down Expand Up @@ -82,6 +81,9 @@ module mpas_atmphys_driver_radiation_lw
! * in the call to rrtmg_lwrad, substituted the variables qv_p, qc_p, qi_p, and qs_p with qvrad_p, qcrad_p,
! qirad_p, and qsrad_p initialized in subroutine cloudiness_from_MPAS.
! Laura D. Fowler ([email protected]) / 2016-07-09.
! * substituted "use mpas_atmphys_o3climatology" with "use module_ra_rrtmg_vinterp" since we moved subroutine
! vinterp_ozn to is own module in physics_wrf.
! laura D. Fowler ([email protected]) / 2017-01-27.


contains
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_radiation_sw.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_radiation_sw
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_driver_sfclayer.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_driver_sfclayer
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_finalize.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
!
!=================================================================================================================
module mpas_atmphys_finalize
use mpas_derived_types
use mpas_pool_routines

use module_mp_thompson
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_init.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_init
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines
use mpas_timekeeping

Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_init_microphysics.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
module mpas_atmphys_init_microphysics
use mpas_dmpar
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_utilities
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_initialize_real.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
module mpas_atmphys_initialize_real
use mpas_kind_types
use mpas_dmpar
use mpas_derived_types
use mpas_pool_routines
use mpas_init_atm_surface

Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_interface.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_interface
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_landuse.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
module mpas_atmphys_landuse
use mpas_dmpar
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_utilities
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_lsm_noahinit.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
module mpas_atmphys_lsm_noahinit
use mpas_dmpar
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines

use mpas_atmphys_constants
Expand Down
1 change: 0 additions & 1 deletion src/core_atmosphere/physics/mpas_atmphys_manager.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!=================================================================================================================
module mpas_atmphys_manager
use mpas_kind_types
use mpas_derived_types
use mpas_pool_routines
use mpas_timekeeping
use mpas_stream_manager
Expand Down
Loading