ufs-community · tanyasmirnova · Oct 12, 2023 · Oct 13, 2023 · Oct 13, 2023 · Oct 18, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/tanyasmirnova/fv3atm
+  branch = ruclsm_lai
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/tests/comp.log b/tests/comp.log
diff --git a/tests/compile_time.log b/tests/compile_time.log
@@ -0,0 +1 @@
+Compile  elapsed time 680 seconds. -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_HRRR_c3,FV3_HRRR_gf -DMPI=ON -DCMAKE_BUILD_TYPE=Release
diff --git a/tests/intel_out b/tests/intel_out
diff --git a/tests/intel_rt.log b/tests/intel_rt.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/modules.fv3.lua b/tests/modules.fv3.lua
@@ -0,0 +1,27 @@
+help([[
+loads UFS Model prerequisites for Hera/Intel
+]])
+
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/ufs-pio-2.5.10/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
+load(pathJoin("stack-python", stack_python_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
+load("ufs_common")
+
+setenv("CC", "mpiicc")
+setenv("CXX", "mpiicpc")
+setenv("FC", "mpiifort")
+setenv("CMAKE_Platform", "hera.intel")
+
+whatis("Description: UFS build environment")
diff --git a/tests/rt.conf.small b/tests/rt.conf.small
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -352,8 +352,11 @@ elif [[ $MACHINE_ID = hera ]]; then
   PARTITION=
   dprefix=/scratch1/NCEPDEV
   DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT
-  STMP=$dprefix/stmp4
-  PTMP=$dprefix/stmp2
+  #STMP=$dprefix/stmp4
+  #PTMP=$dprefix/stmp2
+  STMP=/scratch1/BMC/gsd-fv3-dev/smirnova
+  PTMP=/scratch1/BMC/gsd-fv3-dev/smirnova
+
 
   SCHEDULER=slurm
+2 −2		.gitmodules
+17 −6		ccpp/data/GFS_typedefs.F90
+15 −1		ccpp/data/GFS_typedefs.meta
+22 −24		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
+1 −1		upp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Compile elapsed time 680 seconds. -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_HRRR_c3,FV3_HRRR_gf -DMPI=ON -DCMAKE_BUILD_TYPE=Release