Skip to content

Commit

Permalink
Merge branch 'release-v7.0'
Browse files Browse the repository at this point in the history
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
  ...
  • Loading branch information
mgduda committed Jun 8, 2019
2 parents 3a7b219 + ec0ca4a commit 51d5624
Show file tree
Hide file tree
Showing 85 changed files with 19,332 additions and 6,735 deletions.
200 changes: 143 additions & 57 deletions Makefile

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MPAS-v6.3
MPAS-v7.0
====

The Model for Prediction Across Scales (MPAS) is a collaborative project for
Expand Down
90 changes: 0 additions & 90 deletions src/Makefile.in.CESM

This file was deleted.

18 changes: 8 additions & 10 deletions src/Makefile.in.ACME → src/Makefile.in.E3SM
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Duplicate logic from Tools/Makefile to set compile_threaded
compile_threaded = false
compile_threaded = FALSE
ifeq ($(strip $(SMP)),TRUE)
compile_threaded = true
compile_threaded = TRUE
THREADDIR = threads
else
ifeq ($(strip $(BUILD_THREADED)),TRUE)
compile_threaded = true
compile_threaded = TRUE
THREADDIR = threads
else
THREADDIR = nothreads
Expand Down Expand Up @@ -53,20 +53,18 @@ override CPPINCLUDES += -I$(EXEROOT)/$(COMPONENT)/source/inc -I$(INSTALL_SHAREDP
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
LIBS += -L$(PIO) -L$(PNETCDF)/lib -L$(NETCDF)/lib -L$(LIBROOT) -L$(INSTALL_SHAREDPATH)/lib -lpio -lpnetcdf -lnetcdf

ifneq (,$(findstring FORTRANUNDERSCORE, $(CPPFLAGS)))
ifeq (,$(findstring DUNDERSCORE, $(CPPFLAGS)))
override CPPFLAGS += -DUNDERSCORE
endif
endif

ifeq ($(DEBUG), TRUE)
override CPPFLAGS += -DMPAS_DEBUG
endif

ifeq ($(compile_threaded), true)
ifeq ($(compile_threaded), TRUE)
override CPPFLAGS += -DMPAS_OPENMP
endif

ifeq "$(GEN_F90)" "true"
override CPPFLAGS += -Uvector
endif

all:
@echo $(CPPINCLUDES)
@echo $(FCINCLUDES)
Expand Down
4 changes: 2 additions & 2 deletions src/core_atmosphere/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ clean:
.F.o:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) $< > $*.f90
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) -I./inc $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I./physics -I./dynamics -I./diagnostics -I./physics/physics_wrf -I../external/esmf_time_f90
else
$(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
$(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
endif
Loading

0 comments on commit 51d5624

Please sign in to comment.