Use updated modulefile names only when building the

ufs-weather-model with prognostic aerosols. This
option is recognized by means of a hidden file
created in the model's repository when running
checkout.sh with option -a.

sorc/build_ufs_coupled.sh

@@ -16,13 +16,15 @@ if [ $target = stampede ]; then target=stampede.intel ; fi
 MOD_PATH=$cwd/ufs_coupled.fd/modulefiles
 
 module purge 
-module use $MOD_PATH 
-module load ufs_${target}
+
 cd ufs_coupled.fd/
 if [[ -d build ]]; then rm -Rf build; fi
-if [[ -d GOCART ]]; then
-  module load ufs_aerosols_${target}
+if [[ -e .build_aerosols ]] ; then
+  module use ${MOD_PATH}
+  module load ufs_${target} ufs_aerosols_${target}
   CMAKE_FLAGS="-DAPP=ATMAERO" CCPP_SUITES="FV3_GFS_v16" ./build.sh
 else
+  module use ${MOD_PATH}/${target}
+  module load fv3
   CMAKE_FLAGS="-DS2S=ON -DWW3=ON" CCPP_SUITES="FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled,FV3_GFS_v16" ./build.sh
 fi

sorc/checkout.sh

@@ -49,6 +49,7 @@ else
       git clone https://github.com/rmontuoro/ufs-weather-model.git ufs_coupled.fd >> ${topdir}/checkout-ufs_coupled.log 2>&1
       cd ufs_coupled.fd
       git checkout feature/gocart
+      echo > .build_aerosols
     else
       git clone https://github.com/ufs-community/ufs-weather-model ufs_coupled.fd >> ${topdir}/checkout-ufs_coupled.log 2>&1
       cd ufs_coupled.fd