Modify build_regional to point to new manage_externals repositories i…

…n /sorc and change setup.sh to point to new location for NEMSfv3gfs (#72)

* Changes to External.cfg to include new GitHub repo for UFS_UTILS

* Fix Theia vs Hera if statement

* 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

@@ -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,15 +39,15 @@ 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
 # LBC1_to_LBCN tasks) is located in the exec directory under the UFS_-
 # 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

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.