Merge branch 'main' into ufs-dev-PR119

NCAR · grantfirl · Mar 18, 2024 · Jan 30, 2024 · Feb 6, 2024 · Mar 15, 2024
commit c9844c39508979e93fc7b250b176cfa5bb063c59
diff --git a/FV3 b/FV3
diff --git a/tests/auto/jobs/rt.py b/tests/auto/jobs/rt.py
@@ -11,28 +11,6 @@ def run(job_obj):
  post_process(job_obj, pr_repo_loc, repo_dir_str, branch)
 
 
-def set_directories(job_obj):
- logger = logging.getLogger('RT/SET_DIRECTORIES')
- if job_obj.machine == 'hera':
- workdir = '/scratch1/NCEPDEV/nems/emc.nemspara/autort/pr'
- elif job_obj.machine == 'jet':
- workdir = '/lfs4/HFIP/h-nems/emc.nemspara/autort/pr'
- elif job_obj.machine == 'gaea':
- workdir = '/lustre/f2/pdata/ncep/emc.nemspara/autort/pr'
- elif job_obj.machine == 'orion':
- workdir = '/work/noaa/nems/emc.nemspara/autort/pr'
- elif job_obj.machine == 'derecho':
- workdir = '/glade/scratch/dtcufsrt/autort/tests/auto/pr'
- else:
- print(f'Machine {job_obj.machine} is not supported for this job')
- raise KeyError
-
- logger.info(f'machine: {job_obj.machine}')
- logger.info(f'workdir: {workdir}')
-
- return workdir
-
-
 def run_regression_test(job_obj, pr_repo_loc):
  logger = logging.getLogger('RT/RUN_REGRESSION_TEST')
 

diff --git a/tests/auto/rt_auto.py b/tests/auto/rt_auto.py
@@ -264,27 +264,7 @@ def job_failed(self, logger, job_name, exception=None, STDOUT=False,
 # if exception is not None:
 # raise
 
-def setup_env():
- hostname = os.getenv('HOSTNAME')
- if bool(re.match(re.compile('hfe.+'), hostname)):
- machine = 'hera'
- elif bool(re.match(re.compile('hecflow.+'), hostname)):
- machine = 'hera'
- elif bool(re.match(re.compile('fe.+'), hostname)):
- machine = 'jet'
- os.environ['ACCNR'] = 'h-nems'
- elif bool(re.match(re.compile('gaea.+'), hostname)):
- machine = 'gaea'
- os.environ['ACCNR'] = 'nggps_emc'
- elif bool(re.match(re.compile('Orion-login.+'), hostname)):
- machine = 'orion'
- elif bool(re.match(re.compile('chadmin.+'), hostname)):
- machine = 'derecho'
- os.environ['ACCNR'] = 'P48503002'
- else:
- raise KeyError(f'Hostname: {hostname} does not match '\
- 'for a supported system. Exiting.')
-
+def setup_env(git_cfg):
  # Dictionary of GitHub repositories to check
 
  if not git_cfg.get('repo'):

diff --git a/tests/auto/start_rt_auto.sh b/tests/auto/start_rt_auto.sh
@@ -30,12 +30,8 @@ elif [[ $machine == jet ]]; then
 elif [[ $machine == gaea ]]; then
  export PATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/ufs-weather-model/bin:$PATH
  export PYTHONPATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/lib/python3.8/site-packages
-<<<<<<< HEAD
-elif [[ $machine == cheyenne ]]; then
-=======
 elif [[ $HOSTNAME == *chadmin* ]]; then
  export MACHINE_ID=derecho
->>>>>>> 991d6527da22d11016df035998ec1352d0449875
  export PATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin:/glade/p/ral/jntp/tools/miniconda3/4.8.3/bin:$PATH
  export PATH=/glade/work/epicufsrt/contrib/derecho/rocoto/bin:$PATH
  export PYTHONPATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/glade/p/ral/jntp/tools/miniconda3/4.8.3/lib/python3.8/site-packages

diff --git a/tests/bl_date.ncar.conf b/tests/bl_date.ncar.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20240131
+export BL_DATE=20240313
 
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/machine/cheyenne b/tests/machine/cheyenne
diff --git a/tests/machine/cheyenne.ncar b/tests/machine/cheyenne.ncar
@@ -1,6 +1,4 @@
  source bl_date.ncar.conf
- export PATH=/glade/work/jedipara/cheyenne/spack-stack/miniconda-3.9.12/bin:$PATH
- export PYTHONPATH=/glade/work/jedipara/cheyenne/spack-stack/miniconda-3.9.12/lib/python3.9/site-packages
 
  module use /gpfs/fs1/work/strahan/rocoto/modulefiles
  module load rocoto/1.3.3

diff --git a/tests/machine/derecho b/tests/machine/derecho
@@ -0,0 +1,21 @@
+ export PATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin:/glade/p/ral/jntp/tools/miniconda3/4.8.3/bin:$PATH
+ export PATH=/glade/work/epicufsrt/contrib/derecho/rocoto/bin:$PATH
+ export PYTHONPATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/glade/p/ral/jntp/tools/miniconda3/4.8.3/lib/python3.8/site-packages
+ ECFLOW_START=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh
+ ECF_PORT=$(( $(id -u) + 1500 ))
+
+ QUEUE=main
+ COMPILE_QUEUE=main
+ PARTITION=
+ dprefix=/glade/derecho/scratch
+ DISKNM=/glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/
+ STMP=$dprefix
+ PTMP=$dprefix
+ SCHEDULER=pbs
+ cp fv3_conf/fv3_qsub.IN_derecho fv3_conf/fv3_qsub.IN
+ cp fv3_conf/compile_qsub.IN_derecho fv3_conf/compile_qsub.IN
+
+ ROCOTORUN=$(which rocotorun)
+ ROCOTOSTAT=$(which rocotostat)
+ ROCOTOCOMPLETE=$(which rocotocomplete)
+ ROCOTO_SCHEDULER=pbspro
diff --git a/tests/machine/gaea b/tests/machine/gaea
diff --git a/tests/machine/gaea-c5 b/tests/machine/gaea-c5
@@ -0,0 +1,24 @@
+ module use /lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles
+ module load rocoto
+ ROCOTORUN=$(which rocotorun)
+ ROCOTOSTAT=$(which rocotostat)
+ ROCOTOCOMPLETE=$(which rocotocomplete)
+ ROCOTO_SCHEDULER=slurm
+
+ module load PrgEnv-intel/8.3.3
+ module load intel-classic/2023.1.0
+ module load cray-mpich/8.1.25
+ module load python/3.9.12
+ module use /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles
+ module load ecflow/5.8.4
+ ECFLOW_START=/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/ecflow-5.8.4/bin/ecflow_start.sh
+ ECF_PORT=$(( $(id -u) + 1500 ))
+
+ DISKNM=/lustre/f2/pdata/ncep/role.epic/C5/RT
+ QUEUE=normal
+ COMPILE_QUEUE=normal
+ PARTITION=c5
+ STMP=/lustre/f2/scratch
+ PTMP=/lustre/f2/scratch
+
+ SCHEDULER=slurm
diff --git a/tests/machine/hera b/tests/machine/hera
@@ -4,10 +4,6 @@
  ROCOTOCOMPLETE=$(which rocotocomplete)
  ROCOTO_SCHEDULER=slurm
 
- PYTHONHOME=/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/miniconda-3.9.12
- export PATH=$PYTHONHOME/bin:$PATH
- export PYTHONPATH=$PYTHONHOME/lib/python3.9/site-packages
-
  module load ecflow/5.5.3
  ECFLOW_START=ecflow_start.sh
 

diff --git a/tests/machine/hera.ncar b/tests/machine/hera.ncar
@@ -7,10 +7,6 @@
  ROCOTOCOMPLETE=$(which rocotocomplete)
  ROCOTO_SCHEDULER=slurm
 
- PYTHONHOME=/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/miniconda-3.9.12
- export PATH=$PYTHONHOME/bin:$PATH
- export PYTHONPATH=$PYTHONHOME/lib/python3.9/site-packages
-
  module load ecflow/5.5.3
  ECFLOW_START=ecflow_start.sh
 

diff --git a/tests/machine/jet b/tests/machine/jet
@@ -1,12 +1,10 @@
- module load rocoto/1.3.2
+ module load rocoto/1.3.6
  ROCOTORUN=$(which rocotorun)
  ROCOTOSTAT=$(which rocotostat)
  ROCOTOCOMPLETE=$(which rocotocomplete)
  ROCOTO_SCHEDULER=slurm
 
- export PATH=/lfs4/HFIP/hfv3gfs/spack-stack/apps/miniconda/py39_4.12.0/bin:$PATH
- export PYTHONPATH=/lfs4/HFIP/hfv3gfs/spack-stack/apps/miniconda/py39_4.12.0/lib/python3.9/site-packages
- module load ecflow
+ module load ecflow/5.5.3
  ECFLOW_START=/apps/ecflow/5.5.3/bin/ecflow_start.sh
 
  QUEUE=batch

diff --git a/tests/machine/orion b/tests/machine/orion
@@ -1,18 +1,15 @@
  module load git/2.28.0
-
- module load gcc/8.3.0
+ module load gcc/10.2.0
+ module load python/3.9.2
 
  module load contrib rocoto/1.3.1
  ROCOTORUN=$(which rocotorun)
  ROCOTOSTAT=$(which rocotostat)
  ROCOTOCOMPLETE=$(which rocotocomplete)
- export PATH=/work/noaa/da/role-da/spack-stack/miniconda-3.9.7/bin:$PATH
- export PYTHONPATH=/work/noaa/da/role-da/spack-stack/miniconda-3.9.7/lib/python3.9/site-packages
 
- module use /work/noaa/da/role-da/spack-stack/modulefiles
- module load miniconda/3.9.7
+ module use /work/noaa/epic/role-epic/spack-stack/orion/modulefiles
  module load ecflow/5.8.4
- ECFLOW_START=/work/noaa/da/role-da/spack-stack/ecflow-5.8.4/bin/ecflow_start.sh
+ ECFLOW_START=/work/noaa/epic/role-epic/spack-stack/orion/ecflow-5.8.4/bin/ecflow_start.sh
  ECF_PORT=$(( $(id -u) + 1500 ))
 
  QUEUE=batch

diff --git a/tests/machine/s4 b/tests/machine/s4
@@ -1,12 +1,12 @@
  module load rocoto/1.3.2
+ module load ecflow/5.6.0
+ module load miniconda/3.8-s4
  ROCOTORUN=$(which rocotorun)
  ROCOTOSTAT=$(which rocotostat)
  ROCOTOCOMPLETE=$(which rocotocomplete)
  ROCOTO_SCHEDULER=slurm
 
- module load git/2.30.0
  module use /data/prod/jedi/spack-stack/modulefiles
- module load miniconda/3.9.12
  module load ecflow/5.8.4
  ECFLOW_START=/data/prod/jedi/spack-stack/ecflow-5.8.4/bin/ecflow_start.sh
  ECF_PORT=$(( $(id -u) + 1500 ))

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -385,11 +385,11 @@ if [[ $ROCOTO == true ]]; then
  QUEUE=batch
  COMPILE_QUEUE=batch
  ROCOTO_SCHEDULER=slurm
- elif [[ $MACHINE_ID = cheyenne ]]; then
+ elif [[ $MACHINE_ID = derecho ]]; then
  QUEUE=regular
  COMPILE_QUEUE=regular
  ROCOTO_SCHEDULER=pbspro
- elif [[ $MACHINE_ID = gaea ]]; then
+ elif [[ $MACHINE_ID = gaea-c5 ]]; then
  QUEUE=normal
  COMPILE_QUEUE=normal
  ROCOTO_SCHEDULER=slurm
@@ -463,9 +463,9 @@ EOF
  QUEUE=batch
  elif [[ $MACHINE_ID = s4 ]]; then
  QUEUE=s4
- elif [[ $MACHINE_ID = gaea ]]; then
+ elif [[ $MACHINE_ID = gaea* ]]; then
  QUEUE=normal
- elif [[ $MACHINE_ID = cheyenne ]]; then
+ elif [[ $MACHINE_ID = derecho ]]; then
  QUEUE=regular
  else
  die "ecFlow is not supported on this machine $MACHINE_ID"