ufs-community · climbfuji · Mar 8, 2019 · Mar 22, 2019 · Mar 29, 2019 · Mar 29, 2019
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
 	path = FV3
-	url = https://github.com/NOAA-EMC/fv3atm
-	branch = develop
+        url = https://github.com/grantfirl/fv3atm
+        branch = hwrf_sfc_PR
+	#url = https://github.com/NCAR/fv3atm
+	#branch = dtc/hwrf-physics
 [submodule "NEMS"]
 	path = NEMS
 	url = https://github.com/NOAA-EMC/NEMS

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1,14 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in the repo.
+#*       @defunkt
+*       @climbfuji @llpcarson @grantfirl @mzhangw
+
+# Order is important. The last matching pattern has the most precedence.
+# So if a pull request only touches javascript files, only these owners
+# will be requested to review.
+#*.js    @octocat @github/js
+
+# You can also use email addresses if you prefer.
+#docs/*  docs@example.com
diff --git a/FV3 b/FV3
diff --git a/README_HWRF_PHYSICS.txt b/README_HWRF_PHYSICS.txt
@@ -0,0 +1,116 @@
+Introduction
+============
+
+The three branches dtc/hwrf-physics in ccpp-physics, fv3atm and ufs-weather-model
+were created from the hafs-community repository on April 3, 2020:
+
+git clone -b support/HAFS --recursive https://github.com/hafs-community/ufs-weather-model
+
+The original hashes were:
+
+ccpp-physics      31a294a610a538ade4670d9e32856c4a2b7e59ad
+fv3atm            23c49d0df3dee47bd7d13f0cbefc5de23c7b2663
+ufs-weather-model c2643caf49ff350b66f35fd72afbcdaa65f609bd
+
+
+PRs pulled into the dtc/hwrf-physics branches
+=============================================
+
+The following PRs were pulled into these branches on the given dates
+and with the given hashes (further down is later). Additional commits
+were made by @climbfuji as required for changing the target branch
+(from dtc/develop to dtc/hwrf-physics), pulling in updates from
+upstream (i.e. the hafs-community repositories), bug fixes, cleanup,
+and as a result of the code review processes.
+
+ccpp-physics
+------------
+
+04/06/2020 MONINEDMF https://github.com/NCAR/ccpp-physics/pull/395 -> https://github.com/NCAR/ccpp-physics/pull/428
+    git cherry-pick 942889ab0acace519254712cb4e14b6aaf3e0415
+    git cherry-pick 500d53a21027f362a9c12c10767f0b4f8cf3361c
+    git cherry-pick b0f04b210bd588673182023ea36b56ee94642c3e
+    git cherry-pick e895c62cf49b908927678d72c1ad21ad828e3587
+
+04/08/2020 RRTMG https://github.com/NCAR/ccpp-physics/pull/412 -> https://github.com/NCAR/ccpp-physics/pull/430
+    git cherry-pick 9e9222a470dd8a644ba4c3d010766c62dc71de59
+    git cherry-pick 4d9e68fc27bb3974f1a6c5733bf1b8127165581d
+    git cherry-pick 6f9fec9d183531c81475b3496504dc3225011472
+    git cherry-pick 57873f2045e1cd2d09c71481c0593f3d7eee24ef
+    git cherry-pick 7e492ca69cab20d2457af82c5d535d8b64e2ab1e
+    git cherry-pick 298d1aed7b2f29ccf624a71be7d9f804eaf9e8ab
+    git cherry-pick 5404462a72fe10477595c25baab0ae28fe667f0f
+
+04/13/2020 SAS https://github.com/NCAR/ccpp-physics/pull/423 -> https://github.com/NCAR/ccpp-physics/pull/433
+    (entire PR)
+    --> this PR and other SAS PRs below need to be merged separately
+    into the authoritative repositories, because the answer of some
+    of the IPD and CCPP prod tests change (kept PRs open)
+
+04/16/2020 FA MP updates https://github.com/NCAR/ccpp-physics/pull/405 -> https://github.com/NCAR/ccpp-physics/pull/435
+    (entire PR)
+
+05/04/2020 FA/HWRF RRTMG/HWRF SAS bugfixes https://github.com/NCAR/ccpp-physics/pull/447
+    (entire PR)
+
+05/20/2020 fix FA table initialization https://github.com/NCAR/ccpp-physics/pull/450 -> https://github.com/NCAR/ccpp-physics/pull/453
+    (entire PR)
+
+05/20/2020 update from HAFS community https://github.com/NCAR/ccpp-physics/pull/453
+    (entire PR)
+
+fv3atm
+------
+
+04/06/2020 MONINEDMF https://github.com/NCAR/fv3atm/pull/18 -> https://github.com/NCAR/fv3atm/pull/37
+    git cherry-pick 80ce8591b6af615c9f85a2b3becf8aadc836d734
+
+04/08/2020 RRTMG https://github.com/NCAR/fv3atm/pull/33 -> https://github.com/NCAR/fv3atm/pull/38
+    git cherry-pick 1bae50c9fd5a365226088d861b9d80af9b60de7d
+    git cherry-pick ed8347eb0f001de2f53989054c024ad24394a483
+    git cherry-pick f1cad8833735ce833bc2ed08a318b77c04e3f536
+    git cherry-pick d9841c8d353c262c5aa8e0394ab3ed02542ca8f6
+    git cherry-pick 3c64b5a3eaa7608edef1d7c91066d4265e442b27
+
+04/13/2020 SAS https://github.com/NOAA-EMC/fv3atm/pull/93 -> https://github.com/NCAR/fv3atm/pull/41
+    (entire PR)
+
+04/16/2020 FA MP updates https://github.com/NCAR/fv3atm/pull/28 -> https://github.com/NCAR/fv3atm/pull/43
+    (entire PR)
+
+05/04/2020 FA/HWRF RRTMG/HWRF SAS bugfixes https://github.com/NCAR/fv3atm/pull/47
+    (entire PR)
+
+05/14/2020 SDFs for HWRF physics test https://github.com/NCAR/fv3atm/pull/44 -> https://github.com/NCAR/fv3atm/pull/50
+    (entire PR)
+
+05/20/2020 update from HAFS community https://github.com/NCAR/fv3atm/pull/50
+    (entire PR)
+
+ufs-weather-model
+-----------------
+
+04/06/2020 MONINEDMF https://github.com/NCAR/ufs-weather-model/pull/15 -> https://github.com/NCAR/ufs-weather-model/pull/35
+    git cherry-pick e6fe22ffde6425800b7ed2e1cf3748b606806d28
+    git cherry-pick a99d5e73f94f5ffb3bd9bbb1a3dc04171026b6d7
+    git cherry-pick 5570528f22a9815437e0ef5b413435a8b9fd5881
+    git cherry-pick 2bb15be8cc15c69c178b6e443c0ab8c0d75ef318
+
+04/08/2020 RRTMG https://github.com/NCAR/ufs-weather-model/pull/30 -> https://github.com/NCAR/ufs-weather-model/pull/36
+    git cherry-pick 5ab446fe423d9a7ba0172ec782e6346c47c98116
+    git cherry-pick 1cbc515c6dff00e729523ff6f922e046179d7dcf
+    git cherry-pick c6f51f5090411c737a8d79a27bbf08b8d9b00c28
+    git cherry-pick 2a43ab170916fbe60c3d918ff16a510928964e51
+    git cherry-pick 73f5dcbc93ae297a6a9880988a8f7a7109f99c2e
+
+04/13/2020 SAS https://github.com/ufs-community/ufs-weather-model/pull/94 -> https://github.com/NCAR/ufs-weather-model/pull/39
+    (entire PR)
+
+04/16/2020 FA MP updates https://github.com/NCAR/ufs-weather-model/pull/41 (replaced https://github.com/NCAR/ufs-weather-model/pull/25)
+    (entire PR)
+
+05/04/2020 FA/HWRF RRTMG/HWRF SAS bugfixes https://github.com/NCAR/ufs-weather-model/pull/45
+    (entire PR)
+
+05/20/2020 update from HAFS community https://github.com/NCAR/ufs-weather-model/pull/48
+    (entire PR)
diff --git a/modulefiles/hera b/modulefiles/hera
@@ -0,0 +1 @@
+hera.intel
diff --git a/modulefiles/jet b/modulefiles/jet
@@ -0,0 +1 @@
+jet.intel
diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3
@@ -35,6 +35,7 @@ module load esmf/8.0.0
 ##
 ## load cmake
 ##
+module load cmake/3.16.1
 setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort

diff --git a/modulefiles/orion b/modulefiles/orion
@@ -0,0 +1 @@
+orion.intel
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -24,7 +24,6 @@ module load cray-hdf5/1.8.14
 module load xt-lsfhpc/9.1.3
 module load craype-haswell
 module load python/2.7.14
-module load cmake/3.16.2
 #
 ## WCOSS cray for WW3
 module load gcc/4.9.2
@@ -65,6 +64,8 @@ module swap pmi pmi/5.0.11
 ##
 ## load cmake
 ##
+module use -a /usrx/local/dev/modulefiles
+module load cmake/3.6.2
 setenv CMAKE_C_COMPILER cc
 setenv CMAKE_CXX_COMPILER CC
 setenv CMAKE_Fortran_COMPILER ftn