Merge branch 'master' into lake_precision

NCAR · Sep 21, 2022 · 6daac45 · 6daac45
2 parents 92081dc + 8adbcee
commit 6daac45
Show file tree

Hide file tree

Showing 64 changed files with 16,178 additions and 3,340 deletions.
diff --git a/.travis.yml.prev b/.travis.yml.prev
diff --git a/tests/local/requirements.txt b/tests/local/requirements.txt
@@ -16,7 +16,7 @@ jsonpickle==1.2
 locket==0.2.0
 more-itertools==7.2.0
 netCDF4==1.4.1
-numpy==1.17.1
+numpy==1.22.0
 pandas==0.23.4
 partd==1.0.0
 pathlib==1.0.1

diff --git a/tests/local/reservoir_testing_files/2019-08-18_00.60min.SNOA2.RFCTimeSeries.ncdf b/tests/local/reservoir_testing_files/2019-08-18_00.60min.SNOA2.RFCTimeSeries.ncdf
diff --git a/tests/local/reservoir_testing_files/reservoir_index_Long_Range_AnA.nc b/tests/local/reservoir_testing_files/reservoir_index_Long_Range_AnA.nc
diff --git a/tests/local/reservoir_testing_files/reservoir_index_Standard_AnA_APRFC_GDLs.nc b/tests/local/reservoir_testing_files/reservoir_index_Standard_AnA_APRFC_GDLs.nc
diff --git a/tests/local/utils/gdrive_download.py b/tests/local/utils/gdrive_download.py
@@ -9,7 +9,8 @@ def download_file_from_google_drive(id, destination):
 
     session = requests.Session()
 
-    response = session.get(URL, params={'id': id}, stream=True)
+    response = session.get(URL, params={'id': id, 'alt': 'media', 'confirm':'t'}
+                           , stream=True)
     token = get_confirm_token(response)
 
     if token:
@@ -54,4 +55,4 @@ def main():
     download_file_from_google_drive(file_id, dest_file)
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/trunk/NDHMS/CPL/NUOPC_cpl/CMakeLists.txt b/trunk/NDHMS/CPL/NUOPC_cpl/CMakeLists.txt
@@ -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
 )
 

diff --git a/trunk/NDHMS/CPL/NUOPC_cpl/Makefile b/trunk/NDHMS/CPL/NUOPC_cpl/Makefile
@@ -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)
@@ -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
 
 # ###############
@@ -253,7 +264,7 @@ $(CAP_MK):
 # Install Library, Modules, and Makefile Fragment
 # -----------------------------------------------------------------------------
 
-$(INSTPATH)/%:
+$(INSTPATH)/%: %
 	@echo $(HR)
 	@echo "Installing $(notdir $@)"
 	@echo