Skip to content

Commit eb62cd1

Browse files
mgdudamgduda
committed
Merge branch 'master' into develop
This merge introduces fixes from the release-v8.2.0 branch, and it connects the v8.2.0 tag to future commits on 'develop'. * master: Fix instances of incorrect quotes in init_atmosphere and atmosphere registries Add 'mp_thompson_aerosols' to list of possible_values for config_microp_scheme Add 'sf_noahmp' to list of possible_values for config_lsm_scheme Don't include FCINCLUDES in build options checked for build compatibility Ignore the entire physics_mmm subdirectory of src/core_atmosphere/physics Split physics source compilation from library updates for parallel builds Add missing dependency among physics in MPAS-A main physics Makefile Add 'sf_noahmp_in' package to Noah-MP static fields in atmosphere core registry Add module search paths to support compilation of Noah-MP code with nvfortran Update version number to 8.2.0 Improve check on deallocation of hash table in mpas_geotile_mgr_finalize Add ONLY clause to USE statements for the 'mpi_f08' module Add "-check all" to LDFLAGS_DEBUG for 'intel' build target
2 parents 7070294 + 942d402 commit eb62cd1

23 files changed

Lines changed: 72 additions & 35 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ intel: # BUILDTARGET Intel oneAPI Fortran, C, and C++ compiler suite
670670
"FFLAGS_DEBUG = -g -convert big_endian -free -check all -fpe0 -traceback" \
671671
"CFLAGS_DEBUG = -g -traceback" \
672672
"CXXFLAGS_DEBUG = -g -traceback" \
673-
"LDFLAGS_DEBUG = -g -fpe0 -traceback" \
673+
"LDFLAGS_DEBUG = -g -check all -fpe0 -traceback" \
674674
"FFLAGS_OMP = -qopenmp" \
675675
"CFLAGS_OMP = -qopenmp" \
676676
"PICFLAG = -fpic" \
@@ -1042,7 +1042,6 @@ rebuild_check:
10421042
CPPFLAGS=$(CPPFLAGS)\n$\
10431043
LIBS=$(LIBS)\n$\
10441044
CPPINCLUDES=$(CPPINCLUDES)\n$\
1045-
FCINCLUDES=$(FCINCLUDES)\n$\
10461045
OPENMP=$(OPENMP)\n$\
10471046
OPENMP_OFFLOAD=$(OPENMP_OFFLOAD)\n$\
10481047
OPENACC=$(OPENACC)\n$\

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MPAS-v8.1.0
1+
MPAS-v8.2.0
22
====
33

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

‎src/core_atmosphere/Externals.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
local_path = ./physics_mmm
33
protocol = git
44
repo_url = https://github.com/NCAR/MMM-physics.git
5-
tag = 20240525-MPASv8.2
5+
tag = 20240626-MPASv8.2
66

77
required = True
88

‎src/core_atmosphere/Registry.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<registry model="mpas" core="atmosphere" core_abbrev="atm" version="8.1.0">
2+
<registry model="mpas" core="atmosphere" core_abbrev="atm" version="8.2.0">
33

44
<!-- **************************************************************************************** -->
55
<!-- ************************************** Dimensions ************************************** -->
@@ -2161,7 +2161,7 @@
21612161
<nml_option name="config_microp_scheme" type="character" default_value="suite" in_defaults="false"
21622162
units="-"
21632163
description="configuration for cloud microphysics schemes"
2164-
possible_values="`suite',`mp_wsm6',`mp_thompson',`mp_kessler',`off'"/>
2164+
possible_values="`suite',`mp_wsm6',`mp_thompson',`mp_thompson_aerosols', `mp_kessler',`off'"/>
21652165

21662166
<nml_option name="config_convection_scheme" type="character" default_value="suite" in_defaults="false"
21672167
units="-"
@@ -2171,7 +2171,7 @@
21712171
<nml_option name="config_lsm_scheme" type="character" default_value="suite" in_defaults="false"
21722172
units="-"
21732173
description="configuration for land-surface schemes"
2174-
possible_values="`suite',`noah',`off'"/>
2174+
possible_values="`suite',`sf_noah',`sf_noahmp`, `off'"/>
21752175

21762176
<nml_option name="config_pbl_scheme" type="character" default_value="suite" in_defaults="false"
21772177
units="-"
@@ -3284,11 +3284,11 @@
32843284
packages="mp_thompson_aers_in"/>
32853285

32863286
<var name="rnifampten" type="real" dimensions="nVertLevels nCells Time" units="nb kg^{-1} s^{-1}"
3287-
description="tendency of "ice-friendly" aerosol number concentration due to microphysics"
3287+
description="tendency of ice-friendly aerosol number concentration due to microphysics"
32883288
packages="mp_thompson_aers_in"/>
32893289

32903290
<var name="rnwfampten" type="real" dimensions="nVertLevels nCells Time" units="nb kg^{-1} s^{-1}"
3291-
description="tendency of "water-friendly" aerosol number concentration due to microphysics"
3291+
description="tendency of water-friendly aerosol number concentration due to microphysics"
32923292
packages="mp_thompson_aers_in"/>
32933293

32943294
<!-- ================================================================================================== -->
@@ -3573,7 +3573,7 @@
35733573
description="Ice mixing ratio increment"/>
35743574

35753575
<var name="qs_amb" name_in_code="qs" array_group="moist" packages="mp_thompson_in;mp_thompson_aers_in;mp_wsm6_in"
3576-
" units="kg kg^{-1}"
3576+
units="kg kg^{-1}"
35773577
description="Snow mixing ratio increment"/>
35783578

35793579
<var name="qg_amb" name_in_code="qg" array_group="moist" packages="mp_thompson_in;mp_thompson_aers_in;mp_wsm6_in"

‎src/core_atmosphere/build_options.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PWD=$(shell pwd)
22
EXE_NAME=atmosphere_model
33
NAMELIST_SUFFIX=atmosphere
44
override CPPFLAGS += -DCORE_ATMOSPHERE
5+
FCINCLUDES += -I$(PWD)/src/core_atmosphere/physics/physics_noahmp/drivers/mpas \
6+
-I$(PWD)/src/core_atmosphere/physics/physics_noahmp/utility \
7+
-I$(PWD)/src/core_atmosphere/physics/physics_noahmp/src
58

69
report_builds:
710
@echo "CORE=atmosphere"

‎src/core_atmosphere/physics/.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
*.f90
22
physics_wrf/*.f90
33
physics_wrf/files/
4-
physics_mmm/.gitignore
5-
physics_mmm/README.md
6-
physics_mmm/LICENSE
4+
physics_mmm

‎src/core_atmosphere/physics/Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,15 @@ core_physics_noahmp:
6868
(cd physics_noahmp/drivers/mpas; $(MAKE) all COREDEF="$(COREDEF)")
6969

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

73-
core_physics: core_physics_wrf
72+
core_physics: core_physics_wrf core_physics_noahmp
7473
($(MAKE) phys_interface COREDEF="$(COREDEF)")
75-
ar -ru libphys.a $(OBJS)
74+
ar -ru libphys.a $(OBJS_init) $(OBJS)
75+
($(MAKE) -C ./physics_mmm -f Makefile.mpas physics_mmm_lib)
76+
($(MAKE) -C ./physics_wrf physics_wrf_lib)
77+
($(MAKE) -C ./physics_noahmp/drivers/mpas driver_lib)
78+
($(MAKE) -C ./physics_noahmp/src src_lib)
79+
($(MAKE) -C ./physics_noahmp/utility utility_lib)
7680

7781
phys_interface: $(OBJS)
7882

‎src/core_atmosphere/physics/Registry_noahmp.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,24 @@
2525
<var_struct name="mesh" time_levs="1">
2626

2727
<var name="soilcomp" type="real" dimensions="nSoilComps nCells" units="unitless"
28-
description="soil composition needed as input in the NOAH-MP land surface model"/>
28+
description="soil composition needed as input in the NOAH-MP land surface model"
29+
packages="sf_noahmp_in"/>
2930

3031
<var name="soilcl1" type="real" dimensions="nCells" units="unitless"
31-
description="soil texture class level 1 needed as input for the NOAH-MP land surface model"/>
32+
description="soil texture class level 1 needed as input for the NOAH-MP land surface model"
33+
packages="sf_noahmp_in"/>
3234

3335
<var name="soilcl2" type="real" dimensions="nCells" units="unitless"
34-
description="soil texture class level 2 needed as input for the NOAH-MP land surface model"/>
36+
description="soil texture class level 2 needed as input for the NOAH-MP land surface model"
37+
packages="sf_noahmp_in"/>
3538

3639
<var name="soilcl3" type="real" dimensions="nCells" units="unitless"
37-
description="soil texture class level 3 needed as input for the NOAH-MP land surface model"/>
40+
description="soil texture class level 3 needed as input for the NOAH-MP land surface model"
41+
packages="sf_noahmp_in"/>
3842

3943
<var name="soilcl4" type="real" dimensions="nCells" units="unitless"
40-
description="soil texture class level 4 needed as input for the NOAH-MP land surface model"/>
44+
description="soil texture class level 4 needed as input for the NOAH-MP land surface model"
45+
packages="sf_noahmp_in"/>
4146

4247
</var_struct>
4348

‎src/core_atmosphere/physics/physics_noahmp/drivers/mpas/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.SUFFIXES: .o .F90
22

3+
.PHONY: driver driver_lib
4+
35
all: dummy driver
46

57
dummy:
@@ -26,6 +28,8 @@ OBJS = NoahmpSnowInitMod.o \
2628
PedoTransferSR2006Mod.o
2729

2830
driver: $(OBJS)
31+
32+
driver_lib:
2933
ar -ru ./../../../libphys.a $(OBJS)
3034

3135
# DEPENDENCIES:
@@ -66,5 +70,5 @@ clean:
6670
$(RM) *.i
6771

6872
.F90.o:
69-
$(FC) $(CPPFLAGS) $(COREDEF) $(FFLAGS) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I. -I../../utility -I../../src -I../../../../../framework
73+
$(FC) $(CPPFLAGS) $(COREDEF) $(FFLAGS) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I. -I../../utility -I../../src -I../../../../../framework -I../../../../../external/esmf_time_f90
7074

‎src/core_atmosphere/physics/physics_noahmp/src/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.SUFFIXES: .F90 .o
22

3+
.PHONY: src src_lib
4+
35
#
46
# The Noah-MP code fails to build with the GNU compilers with -std=f2008,
57
# so remove that flag here if it is present in FFLAGS
@@ -138,6 +140,8 @@ OBJS = ConstantDefineMod.o \
138140
WaterMainGlacierMod.o
139141

140142
src: $(OBJS)
143+
144+
src_lib:
141145
ar -ru ./../../libphys.a $(OBJS)
142146

143147
# DEPENDENCIES:

0 commit comments

Comments
 (0)