Skip to content

Commit 51d5624

Browse files
committed
Merge branch 'release-v7.0'
This merge introduces v7.0 of all MPAS models. For a summary of significant changes, please see the annotation of the v7.0 tag. * release-v7.0: (182 commits) Add log message for lbc updates Update the descriptions of several initialization options for init case 9 Change default value for config_blend_bdy_terrain to false Change default "lbc" stream's filename template to include minutes and seconds Communicate effective radii for cloud, ice, and snow between MPAS and WSM6 Return error from read_stream() when inexact stream time not found Avoid calling mpas_atm_update_bdy_tend whenever config_apply_lbcs = false Fix race condition in file tests when clobber_mode = 'append' or 'overwrite' Remove broken log write of cf1,cf2,cf3 from init_atm_case_gfs When using specified zeta levels, set 'zt' for correct coordinate surface smoothing Introduce early check on whether boundary terrain blending will succeed or not Check for a valid vertical grid in init_case 9 (LBC setup case) Update version number to 7.0 Migrate code for modifying relhum into its own function, convert_relhum_wrt_ice Recompute initial RH w.r.t. ice below freezing for consistency with model output Verify that config_apply_lbcs is consistent with values in bdyMaskCell field Verify that the input_interval for the 'lbc_in' stream is not 'none' Add stub routine, mpas_atm_bdy_checks, for checking of limited-area settings Halt if LBC data cannot be successfully read Fix decoding in script generated for regression suites ...
2 parents 3a7b219 + ec0ca4a commit 51d5624

File tree

85 files changed

+19332
-6735
lines changed

Some content is hidden

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

85 files changed

+19332
-6735
lines changed

Makefile

+143-57
Large diffs are not rendered by default.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MPAS-v6.3
1+
MPAS-v7.0
22
====
33

44
The Model for Prediction Across Scales (MPAS) is a collaborative project for

src/Makefile.in.CESM

-90
This file was deleted.

src/Makefile.in.ACME src/Makefile.in.E3SM

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Duplicate logic from Tools/Makefile to set compile_threaded
2-
compile_threaded = false
2+
compile_threaded = FALSE
33
ifeq ($(strip $(SMP)),TRUE)
4-
compile_threaded = true
4+
compile_threaded = TRUE
55
THREADDIR = threads
66
else
77
ifeq ($(strip $(BUILD_THREADED)),TRUE)
8-
compile_threaded = true
8+
compile_threaded = TRUE
99
THREADDIR = threads
1010
else
1111
THREADDIR = nothreads
@@ -53,20 +53,18 @@ override CPPINCLUDES += -I$(EXEROOT)/$(COMPONENT)/source/inc -I$(INSTALL_SHAREDP
5353
override FCINCLUDES += -I$(EXEROOT)/$(COMPONENT)/source/inc -I$(INSTALL_SHAREDPATH)/include -I$(INSTALL_SHAREDPATH)/$(COMP_INTERFACE)/$(ESMFDIR)/$(NINST_VALUE)/csm_share -I$(NETCDF)/include -I$(PIO) -I$(PNETCDF)/include
5454
LIBS += -L$(PIO) -L$(PNETCDF)/lib -L$(NETCDF)/lib -L$(LIBROOT) -L$(INSTALL_SHAREDPATH)/lib -lpio -lpnetcdf -lnetcdf
5555

56-
ifneq (,$(findstring FORTRANUNDERSCORE, $(CPPFLAGS)))
57-
ifeq (,$(findstring DUNDERSCORE, $(CPPFLAGS)))
58-
override CPPFLAGS += -DUNDERSCORE
59-
endif
60-
endif
61-
6256
ifeq ($(DEBUG), TRUE)
6357
override CPPFLAGS += -DMPAS_DEBUG
6458
endif
6559

66-
ifeq ($(compile_threaded), true)
60+
ifeq ($(compile_threaded), TRUE)
6761
override CPPFLAGS += -DMPAS_OPENMP
6862
endif
6963

64+
ifeq "$(GEN_F90)" "true"
65+
override CPPFLAGS += -Uvector
66+
endif
67+
7068
all:
7169
@echo $(CPPINCLUDES)
7270
@echo $(FCINCLUDES)

src/core_atmosphere/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ clean:
7070
.F.o:
7171
$(RM) $@ $*.mod
7272
ifeq "$(GEN_F90)" "true"
73-
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) $< > $*.f90
73+
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) -I./inc $< > $*.f90
7474
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I./physics -I./dynamics -I./diagnostics -I./physics/physics_wrf -I../external/esmf_time_f90
7575
else
76-
$(FC) $(CPPFLAGS) $(PHYSICS) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I../framework -I../operators -I./physics -I./dynamics -I./diagnostics -I./physics/physics_wrf -I../external/esmf_time_f90
76+
$(FC) $(CPPFLAGS) $(PHYSICS) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I./inc -I../framework -I../operators -I./physics -I./dynamics -I./diagnostics -I./physics/physics_wrf -I../external/esmf_time_f90
7777
endif

0 commit comments

Comments
 (0)