Skip to content

Commit 829459d

Browse files
Merge branch 'develop' into feature/dev-wcoss2
* develop: change gdasechgres dependency to just gdasefcs01 instead of gdasefmn (#933) Remove obsolete platforms (WCOSS1, Dell, Cray, Theia) references. (#922) Optimize DA clone, build, and link (#931)
2 parents 1a1a1e3 + f04f3ba commit 829459d

File tree

276 files changed

+618
-14522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+618
-14522
lines changed

docs/doxygen/compile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
#!/bin/ksh -x
1+
#!/bin/bash
22

3-
machine=${1:-${machine:-"WCOSS_C"}}
3+
set -ex
4+
5+
machine=${1:-${machine:-"HERA"}}
46
machine=$(echo $machine | tr '[a-z]' '[A-Z]')
57

68
if [ $machine = "HERA" ]; then
79
doxygen=/usr/bin/doxygen
8-
elif [ $machine = "WCOSS_C" ]; then
9-
doxygen=/gpfs/hps3/emc/hwrf/noscrub/soft/doxygen-1.8.10/bin/doxygen
10-
elif [ $machine = "WCOSS" ]; then
11-
doxygen=/hwrf/noscrub/soft/doxygen-1.8.10/bin/doxygen
10+
elif [ $machine = "ORION" ]; then
11+
doxygen=/bin/doxygen
1212
elif [ $machine = "JET" ]; then
1313
doxygen=/contrib/doxygen/1.8.10/bin/doxygen
1414
else
15-
echo "machine $machine is unrecognized, ABORT!"
16-
echo "try system doxygen"
15+
echo "machine $machine is unrecognized!"
16+
echo "trying system doxygen"
1717
doxygen=$(which doxygen)
18+
rc=$?
19+
[[ $rc -ne 0 ]] && (echo "doxygen not found, ABORT!"; exit 1)
1820
fi
1921

2022
$doxygen

docs/doxygen/mainpage.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This is a very much a work in progress and any issues should be reported back an
2121
To setup an experiment, a python script <b>\c setup_expt.py</b> (located in <b>\c fv3gfs/ush</b>) can be used:
2222
2323
$> setup_expt.py -h
24-
usage: setup_expt.py [-h] [--machine {HERA,WCOSS_C}] --pslot PSLOT
24+
usage: setup_expt.py [-h] --pslot PSLOT
2525
[--configdir CONFIGDIR] [--idate IDATE] [--icsdir ICSDIR]
2626
[--resdet RESDET] [--resens RESENS] [--comrot COMROT]
2727
[--expdir EXPDIR] [--nens NENS] [--cdump CDUMP]
@@ -32,8 +32,6 @@ To setup an experiment, a python script <b>\c setup_expt.py</b> (located in <b>\
3232
3333
optional arguments:
3434
-h, --help show this help message and exit
35-
--machine machine name
36-
(default: WCOSS_C)
3735
--pslot parallel experiment name [REQUIRED]
3836
(default: None)
3937
--configdir full path to directory containing the config files
@@ -58,8 +56,8 @@ To setup an experiment, a python script <b>\c setup_expt.py</b> (located in <b>\
5856
The above script creates directories <b>\c EXPDIR</b> and <b>\c COMROT</b>. It will make links for initial conditions from a location provided via the <b>\c --icsdir</b> argument for a chosen resolution for the control <b>\c --resdet</b> and the ensemble <b>\c --resens</b>. Experiment name is controlled by the input argument <b>\c --pslot</b>. The script will ask user input in case any of the directories already exist. It will copy experiment configuration files into the <b>\c EXPDIR</b> from <b>\c CONFIGDIR</b>.
5957
6058
Sample initial conditions for a few resolutions are available at:<br>
61-
<b>Theia:</b> /scratch4/NCEPDEV/da/noscrub/Rahul.Mahajan/ICS<br>
62-
<b>WCOSS Cray:</b> /gpfs/hps/emc/da/noscrub/Rahul.Mahajan/ICS
59+
<b>Hera:</b> TODO: /path/here/for/initial/conditions<br>
60+
<b>Orion:</b> TODO: /path/here/for/initial/conditions<br>
6361
6462
Next step is for the user to go through the individual config files (atleast <b>\c config.base</b>) and customize the experiment configuration based on user needs. A stock configuration will be provided at a later stage, but it is imperative that the user understand the steps involved in the system.
6563

docs/note_fixfield.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
For EMC, the fix fields for running the model are not included in git repository.
33
They are saved locally on all platforms
44

5-
Venus/Mars: /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/fv3gfs/fix
6-
Surge/Luna: /gpfs/hps3/emc/global/noscrub/emc.glopara/git/fv3gfs/fix
7-
Hera: /scratch1/NCEPDEV/global/glopara/fix
5+
Hera: /scratch1/NCEPDEV/global/glopara/fix
6+
Orion: /work/noaa/global/glopara/fix
87

98
------------------------------------------------------------------------------
109
09/28/2018

driver/gdas/para_config.gdas_analysis_high

Lines changed: 0 additions & 33 deletions
This file was deleted.

driver/gdas/para_config.gdas_enkf_fcst

Lines changed: 0 additions & 66 deletions
This file was deleted.

driver/gdas/para_config.gdas_enkf_inflate_recenter

Lines changed: 0 additions & 28 deletions
This file was deleted.

driver/gdas/para_config.gdas_enkf_innovate_obs

Lines changed: 0 additions & 100 deletions
This file was deleted.

driver/gdas/para_config.gdas_enkf_post

Lines changed: 0 additions & 29 deletions
This file was deleted.

driver/gdas/para_config.gdas_enkf_select_obs

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)