Skip to content

Add shared physics gwdo #1989

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

Merged
weiwangncar merged 7 commits into from
Feb 1, 2024
Merged

Add shared physics gwdo #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c56ae7
- copied module_bl_gwdo.F from MPAS v7.3 (Laura's branch). This routi…
weiwangncar Jan 20, 2024
08ea435
add error variables and dx2d in adjoint pbl driver
weiwangncar Jan 23, 2024
38c99b6
These three files are not required in physics_mmm directory:
weiwangncar Jan 31, 2024
626ab1d
- arch/postamble: add .F90.f90 rule
weiwangncar Jan 31, 2024
581c28c
Merge branch 'develop' into shared-physics-gwdo
weiwangncar Jan 31, 2024
7c2be7e
Update depend.common to conform to the format
weiwangncar Jan 31, 2024
1a8e367
Update depend.common to conform to the new format
weiwangncar Jan 31, 2024
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
14 changes: 14 additions & 0 deletions arch/postamble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,13 @@ wrfio_esmf :
fi
$(FC) -o $@ -c $(FCFLAGS) $(OMP) $(MODULE_DIRS) $(PROMOTION) $(FCSUFFIX) $*.f90

.F90.o:
$(RM) $@
sed -e "s/^\!.*'.*//" -e "s/^ *\!.*'.*//" $*.F90 > $*.G
$(CPP) -I$(WRF_SRC_ROOT_DIR)/inc $(CPPFLAGS) $(OMPCPP) $*.G > $*.bb
$(SED_FTN) $*.bb | $(CPP) $(TRADFLAG) > $*.f90
$(RM) $*.G $*.bb
$(FC) -o $@ -c $(FCFLAGS) $(OMP) $(MODULE_DIRS) $(PROMOTION) $(FCSUFFIX) $*.f90

.F.f90:
$(RM) $@
Expand All @@ -211,6 +218,13 @@ wrfio_esmf :
$(CPP) -I$(WRF_SRC_ROOT_DIR)/inc $(CPPFLAGS) $*.H > $@
$(RM) $*.G $*.H

.F90.f90:
$(RM) $@
sed -e "s/^\!.*'.*//" -e "s/^ *\!.*'.*//" $*.F90 > $*.G
$(SED_FTN) $*.G > $*.H
$(CPP) -I$(WRF_SRC_ROOT_DIR)/inc $(CPPFLAGS) $*.H > $@
$(RM) $*.G $*.H

.f90.o:
$(RM) $@
$(FC) -o $@ -c $(FCFLAGS) $(PROMOTION) $(FCSUFFIX) $*.f90
Expand Down
2 changes: 1 addition & 1 deletion arch/preamble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
SHELL = /bin/sh
DEVTOP = `pwd`
LIBINCLUDE = .
.SUFFIXES: .F .i .o .f90 .c
.SUFFIXES: .F .i .o .f90 .c .F90

#### Get core settings from environment (set in compile script)
#### Note to add a core, this has to be added to.
Expand Down
4 changes: 2 additions & 2 deletions clean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
set nonomatch


foreach dir ( frame chem share dyn_em phys cmaq main tools wrftladj )
foreach dir ( frame chem share dyn_em phys phys/physics_mmm cmaq main tools wrftladj )
if ( -d $dir ) then
if ( $dir == cmaq ) then
( cd $dir ; echo $dir ; /bin/rm -f *.o *.mod ) >& /dev/null
else
( cd $dir ; echo $dir ; /bin/rm -f core wrf *.f90 *.exe *.kmo *.mod *.o *.obj *.inc *.F90 *.a \
( cd $dir ; echo $dir ; /bin/rm -f core wrf *.f90 *.exe *.kmo *.mod *.o *.obj *.inc *.a \
db_* Warnings module_state_description.F module_dm.F gmeta \
wrfdata whatiread rsl.* show_domain* ) >& /dev/null
endif
Expand Down
11 changes: 10 additions & 1 deletion main/depend.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ module_bl_qnsepbl.o: \


module_progtm.o: \
module_gfs_machine.o
module_gfs_machine.o


module_bl_gfs.o: \
Expand All @@ -321,6 +321,10 @@ module_bl_mynn_wrapper.o: \
module_bl_mynn_common.o


module_bl_gwdo.o: \
physics_mmm/bl_gwdo.o


module_cam_upper_bc.o: \
module_cam_shr_kind_mod.o \
module_cam_support.o
Expand Down Expand Up @@ -1477,6 +1481,11 @@ module_mp_gsfcgce_4ice_nuwrf.o: \
module_checkerror.o \
module_mp_radar.o \


physics_mmm/bl_gwdo.o : \
ccpp_kind_types.o


# End of DEPENDENCIES for phys


Expand Down
10 changes: 7 additions & 3 deletions phys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,19 +233,23 @@ DIAGNOSTIC_MODULES_EM = \
module_diag_trad_fields.o \
module_diag_solar.o

PHYSMMM_MODULES = \
./physics_mmm/bl_gwdo.o

OBJS =

LIBTARGET = physics
TARGETDIR = ./

$(LIBTARGET) :
$(MAKE) $(J) non_nmm ; \
$(MAKE) $(J) non_nmm shared_phys ; \
$(AR) $(ARFLAGS) ../main/$(LIBWRFLIB) $(MODULES) $(OBJS) \
$(FIRE_MODULES) $(DIAGNOSTIC_MODULES_EM)
$(FIRE_MODULES) $(DIAGNOSTIC_MODULES_EM) $(PHYSMMM_MODULES)

include ../configure.wrf

non_nmm : $(MODULES) $(FIRE_MODULES) $(WIND_MODULES) $(OBJS) $(DIAGNOSTIC_MODULES_EM)
non_nmm : $(MODULES) $(FIRE_MODULES) $(OBJS) $(DIAGNOSTIC_MODULES_EM)
shared_phys : $(PHYSMMM_MODULES)

submodules :
@if [ \( ! -f module_sf_noahmpdrv.F \) -o \( ! -f module_sf_noahmp_glacier.F \) -o \
Expand Down
Loading