Skip to content

Commit

Permalink
Update NUOPC cap exchange fields
Browse files Browse the repository at this point in the history
* Move fields utilities to WRFHydro_NUOPC_Fields.F90
* Add 3 dimensional soil fields smc, slc, stc
* Remove fields that aren't connected
* Update LSM forcings check
* Update NUOPC cap fill values
* Add options for memory copy or pointer
* Add options to initialize with prescribed values
* Add options to check for missing values
* Add options to fill missing values with prescribed values
* Cleanup field creation and fill
* Cleanup ESMF extension utilities
* Update error flags
* Set field timestamp to invalid for coldstarts
* Add WRFHYDRO model state debugging
* Fix WRFHYDRO NUOPC cap installation dependencies
  • Loading branch information
danrosen25 committed Feb 9, 2022
1 parent 459c86e commit cead267
Show file tree
Hide file tree
Showing 8 changed files with 2,269 additions and 2,555 deletions.
2 changes: 2 additions & 0 deletions trunk/NDHMS/CPL/NUOPC_cpl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ endif (NOT TARGET esmf)
list(APPEND wrfhydro_nuopc_files
WRFHydro_NUOPC_Cap.F90
WRFHydro_NUOPC_Gluecode.F90
WRFHydro_NUOPC_Fields.F90
WRFHydro_NUOPC_Flags.F90
WRFHydro_ESMF_Extensions.F90
)

Expand Down
15 changes: 13 additions & 2 deletions trunk/NDHMS/CPL/NUOPC_cpl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,14 @@ CAP_MK := wrfhydro.mk

CAP_OBJS := WRFHydro_NUOPC_Cap.o
CAP_OBJS += WRFHydro_NUOPC_Gluecode.o
CAP_OBJS += WRFHydro_NUOPC_Fields.o
CAP_OBJS += WRFHydro_NUOPC_Flags.o
CAP_OBJS += WRFHydro_ESMF_Extensions.o

CAP_MODS := wrfhydro_nuopc.mod
CAP_MODS += wrfhydro_nuopc_gluecode.mod
CAP_MODS += wrfhydro_nuopc_fields.mod
CAP_MODS += wrfhydro_nuopc_flags.mod
CAP_MODS += wrfhydro_esmf_extensions.mod

CAP_FILES := $(CAP_OBJS) $(CAP_MODS) $(CAP_LIB) $(CAP_VERS) $(CAP_MK)
Expand Down Expand Up @@ -143,12 +147,19 @@ nuopcinstall: $(CAP_LIB) $(CAP_MODS) $(CAP_VERS) \
# ############

WRFHydro_NUOPC_Cap.o: WRFHydro_NUOPC_Macros.h \
WRFHydro_NUOPC_Gluecode.o WRFHydro_ESMF_Extensions.o
WRFHydro_NUOPC_Gluecode.o WRFHydro_NUOPC_Fields.o \
WRFHydro_NUOPC_Flags.o WRFHydro_ESMF_Extensions.o
WRFHydro_NUOPC_Gluecode.o: WRFHydro_NUOPC_Macros.h \
WRFHydro_NUOPC_Fields.o WRFHydro_NUOPC_Flags.o \
WRFHydro_ESMF_Extensions.o $(MODEL_MODS)
WRFHydro_NUOPC_Fields.o: WRFHydro_NUOPC_Macros.h \
WRFHydro_NUOPC_Flags.o WRFHydro_ESMF_Extensions.o \
$(MODEL_MODS)

wrfhydro_nuopc.mod: WRFHydro_NUOPC_Cap.o
wrfhydro_nuopc_gluecode.mod: WRFHydro_NUOPC_Gluecode.o
wrfhydro_nuopc_fields.mod: WRFHydro_NUOPC_Fields.o
wrfhydro_nuopc_flags.mod: WRFHydro_NUOPC_Flags.o
wrfhydro_esmf_extensions.mod: WRFHydro_ESMF_Extensions.o

# ###############
Expand Down Expand Up @@ -253,7 +264,7 @@ $(CAP_MK):
# Install Library, Modules, and Makefile Fragment
# -----------------------------------------------------------------------------

$(INSTPATH)/%:
$(INSTPATH)/%: %
@echo $(HR)
@echo "Installing $(notdir $@)"
@echo
Expand Down
1,803 changes: 0 additions & 1,803 deletions trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_ESMF_Extensions.F90

Large diffs are not rendered by default.

Loading

0 comments on commit cead267

Please sign in to comment.