From 8390530562342793c6914e5bf40c6004c7a77b67 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Thu, 22 Aug 2019 22:36:10 +0000 Subject: [PATCH 1/5] Changes to External.cfg to include new GitHub repo for UFS_UTILS --- Externals.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 29dfa37c0b..43057aace1 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,15 +1,15 @@ [ufs_utils_develop] -branch = feature/regional_grid +branch = develop protocol = git -repo_url = gerrit:UFS_UTILS +repo_url = https://github.com/NOAA-EMC/UFS_UTILS local_path = sorc/UFS_UTILS_develop required = True [ufs_utils_chgres_grib2] branch = feature/chgres_grib2 protocol = git -repo_url = gerrit:UFS_UTILS -local_path = sorc/UFS_UTILS_gridgen_sfc +repo_url = https://github.com/LarissaReames-NOAA/UFS_UTILS +local_path = sorc/UFS_UTILS_chgres_grib2 required = True [NEMSfv3gfs] From c83918781a2c5ca68607d78774f6c69894bdacbe Mon Sep 17 00:00:00 2001 From: jeff beck Date: Thu, 22 Aug 2019 23:06:20 +0000 Subject: [PATCH 2/5] Fix Theia vs Hera if statement --- regional/build_regional | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regional/build_regional b/regional/build_regional index a6ed71e173..2e98e815bc 100755 --- a/regional/build_regional +++ b/regional/build_regional @@ -63,11 +63,11 @@ cd ${RGNL_WFLOW_DIR} mkdir -p fix/fix_fv3 cd fix -if [ ${SITE} == "theia" || ${SITE} == "hera" ]; then +if [ ${SITE} == "theia" ] || [ ${SITE} == "hera" ]; then ln -sfn /scratch4/NCEPDEV/global/save/glopara/git/fv3gfs/fix/fix_am fix_am -elif [ ${SITE} == "wcoss" || ${SITE} == "dell" ]; then +elif [ ${SITE} == "wcoss" ] || [ ${SITE} == "dell" ]; then ln -sfn /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/fv3gfs/fix/fix_am fix_am From 1073c655a545f6c0616593bf9445b0cccf52b870 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Fri, 23 Aug 2019 19:50:08 +0000 Subject: [PATCH 3/5] Modify build_regional to point to new manage_externals repositories in /sorc and change setup.sh to point to new location for NEMSfv3gfs --- regional/build_regional | 6 +++--- ush/setup.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/regional/build_regional b/regional/build_regional index 2e98e815bc..cee4bdc9dc 100755 --- a/regional/build_regional +++ b/regional/build_regional @@ -30,7 +30,7 @@ cd ${RGNL_WFLOW_DIR}/sorc # Build sfc_climo_gen. # #cd ${RGNL_WFLOW_DIR}/../UFS_UTILS_gridgen_sfc/sorc -cd ${RGNL_WFLOW_DIR}/../UFS_UTILS_develop/sorc +cd ${RGNL_WFLOW_DIR}/sorc/UFS_UTILS_develop/sorc ./build_sfc_climo_gen.sh >& out.build_sfc_climo_gen cp ../exec/sfc_climo_gen ${RGNL_WFLOW_DIR}/exec # @@ -39,7 +39,7 @@ cp ../exec/sfc_climo_gen ${RGNL_WFLOW_DIR}/exec # The first case is using Larissa's make.sh script, the second case uses # the more formal way also used by the other codes in UFS_UTILS. if [ 0 = 1 ]; then - cd ${RGNL_WFLOW_DIR}/../UFS_UTILS_chgres_grib2/sorc/chgres_cube.fd + cd ${RGNL_WFLOW_DIR}/sorc/UFS_UTILS_chgres_grib2/sorc/chgres_cube.fd ./make.sh >& out.build_chgres_cube # Is the following needed? The version of the global_chgres.exe execu- # table used by the tasks that use chgres_cube (the ICs/surf/LBC0 and @@ -47,7 +47,7 @@ if [ 0 = 1 ]; then # UTILS_chgres_grib2 directory, not in ${RGNL_WFLOW_DIR}/exec. cp ../exec/global_chgres.exe ${RGNL_WFLOW_DIR}/exec else - cd ${RGNL_WFLOW_DIR}/../UFS_UTILS_chgres_grib2/sorc + cd ${RGNL_WFLOW_DIR}/sorc/UFS_UTILS_chgres_grib2/sorc ./build_chgres_cube.sh >& out.build_chgres_cube # Is the following needed? The version of the global_chgres.exe execu- # table used by the tasks that use chgres_cube (the ICs/surf/LBC0 and diff --git a/ush/setup.sh b/ush/setup.sh index fe9fb2b853..de5427e967 100755 --- a/ush/setup.sh +++ b/ush/setup.sh @@ -568,9 +568,9 @@ EXECDIR="$FV3SAR_DIR/exec" TEMPLATE_DIR="$USHDIR/templates" if [ "$CCPP" = "true" ]; then - NEMSfv3gfs_DIR="$BASEDIR/NEMSfv3gfs-CCPP" + NEMSfv3gfs_DIR="$BASEDIR/regional_workflow/sorc/NEMSfv3gfs" else - NEMSfv3gfs_DIR="$BASEDIR/NEMSfv3gfs" + NEMSfv3gfs_DIR="$BASEDIR/regional_workflow/sorc/NEMSfv3gfs" fi # # Make sure that the NEMSfv3gfs_DIR directory exists. From 0f47d0b7adfff6612680b6eb0feb8e8dd4f80e52 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Fri, 23 Aug 2019 20:14:21 +0000 Subject: [PATCH 4/5] Point Externals.cfg to NOAA-EMC upstream repo for chgres_grib2 --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 43057aace1..f7e0d9bde0 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -8,7 +8,7 @@ required = True [ufs_utils_chgres_grib2] branch = feature/chgres_grib2 protocol = git -repo_url = https://github.com/LarissaReames-NOAA/UFS_UTILS +repo_url = https://github.com/NOAA-EMC/UFS_UTILS local_path = sorc/UFS_UTILS_chgres_grib2 required = True From 1e4ccb968bdb3ead5a74b4f416928a28fb221393 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Fri, 23 Aug 2019 20:18:12 +0000 Subject: [PATCH 5/5] Testing to fix multiple copies of same commit --- new.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new.txt diff --git a/new.txt b/new.txt new file mode 100644 index 0000000000..0f2416ebfd --- /dev/null +++ b/new.txt @@ -0,0 +1 @@ +Something