Resolves more merge conflicts with dmUpdate and 2022.01-beta1 #77

	<<<<<<< HEAD
	name: Pull Request CI libFMS with intel18 and intel21
Check failure on line 2 in .github/workflows/parallelWorks_intel_pr.yml View workflow run for this annotation GitHub Actions / .github/workflows/parallelWorks_intel_pr.yml Invalid workflow file `You have an error in your yaml syntax on line 2`
	=======
	name: Pull Request CI libFMS with intel21
	>>>>>>> resolveDMupdate

	on: [pull_request,workflow_dispatch]
	jobs:
	parallelWorks:
	runs-on: [self-hosted, pw-platform]
	strategy:
	fail-fast: false
	max-parallel: 2
	matrix:
	include:
	# Runs on FMS_CONTAINER_CI cluster with intel 2021
	- runname: FMS with intel 2021 container
	runscript: python3 /home/Thomas.Robinson/pw/storage/pw_api_python/PRFMSintel21StartClusters.py $GITHUB_REF
	steps:
	- name: FMS make check on paralellWorks
	env:
	RUNNAME: ${{ matrix.runname }}
	RUNSCRIPT: ${{ matrix.runscript }}
	run: $RUNSCRIPT
	ShutDownCluster:
	runs-on: [self-hosted, pw-platform]
	if: always()
	needs: [parallelWorks]
	strategy:
	matrix:
	include:
	- cluster: FMS_CONTAINER_CI
	# - cluster: fms_intel18_ci
	steps:
	- name: Turn off cluster
	env:
	CLUSTER: ${{ matrix.cluster }}
	run: python3 /home/Thomas.Robinson/pw/storage/pw_api_python/stopClusters.py $CLUSTER

Provide feedback