Skip to content

Issue #1 - updates for modules and small fixes #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KateFriedman-NOAA merged 1 commit into from
Oct 2, 2020
Merged

Issue #1 - updates for modules and small fixes #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion env/WCOSS_DELL_P3.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then

nth_max=$(($npe_node_max / $npe_node_prep))

export POE="NO"
export POE=${POE:-"NO"}
export BACK=${BACK:-"YES"}
export sys_tp="Dell-p3"

Expand Down
1 change: 1 addition & 0 deletions jobs/JGFS_ATMOS_FSU_GENESIS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export FIXens_tracker=${FIXens_tracker:-$HOMEens_tracker/fix}
export USHens_tracker=${USHens_tracker:-$HOMEens_tracker/ush}
export SCRIPTens_tracker=${SCRIPTens_tracker:-$HOMEens_tracker/scripts}
export BINens_tracker=${BINens_tracker:-$HOMEens_tracker/ush/FSUgenesisPY/bin}
export PYTHONPATH=${USHens_tracker}/FSUgenesisPY:${PYTHONPATH}

##############################################
# Define COM and Data directories
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/gfs_bufr.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module load impi/18.0.1
module load nemsio/2.2.3
module load bacio/2.0.2
module load w3nco/2.0.6
module load bufr/11.2.0
module load bufr/11.3.0
module load sigio/2.1.0

module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
Expand Down
4 changes: 0 additions & 4 deletions modulefiles/module_base.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,5 @@ module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
module load crtm/2.3.0
module load g2tmpl/1.6.0

# Load FSU Genesis module
module use -a /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/tracker/ens_tracker.v1.1.15.3/ush/FSUgenesisPY/modulefiles
module load tclogg

# waveprep
module load cdo/1.9.8
2 changes: 1 addition & 1 deletion modulefiles/modulefile_gfswave_gempak.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module load prod_util/1.1.4
module load grib_util/1.1.0
module load prod_envir/1.0.3
module load util_shared/1.1.2
module load bufr/11.2.0
module load bufr/11.3.0
module load sigio/2.0.1
module load gempak/7.3.1
2 changes: 1 addition & 1 deletion modulefiles/modulefile_gfswave_prdgen.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module load prod_util/1.1.4
module load grib_util/1.1.0
module load prod_envir/1.0.3
module load util_shared/1.1.2
module load bufr/11.2.0
module load bufr/11.3.0
module load sigio/2.0.1
module load gempak/7.3.1
80 changes: 68 additions & 12 deletions sorc/syndat_qctropcy.fd/qctropcy.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11991,27 +11991,83 @@ SUBROUTINE OFILE0(IUNTOP,NFILMX,NFTOT,FILNAM)

IF(CACCES(NF) .NE. 'DIRECT') THEN
if(cpos(nf) .eq. ' ') then
OPEN(UNIT=IUNIT(NF),FORM=cform(nf),STATUS=cstat(nf),
1 ACCESS=cacces(nf),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS)
if (cstat(nf).eq.'OLD') then
OPEN(UNIT=IUNIT(NF),FORM=cform(nf),STATUS='OLD',
1 ACCESS=cacces(nf),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS)
elseif (cstat(nf).eq.'NEW') then
OPEN(UNIT=IUNIT(NF),FORM=cform(nf),STATUS='NEW',
1 ACCESS=cacces(nf),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS)
elseif (cstat(nf).eq.'UNKNOWN') then
OPEN(UNIT=IUNIT(NF),FORM=cform(nf),STATUS='UNKNOWN',
1 ACCESS=cacces(nf),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS)
else
OPEN(UNIT=IUNIT(NF),FORM=cform(nf),STATUS=cstat(nf),
1 ACCESS=cacces(nf),
2 ERR=95,IOSTAT=IOS)
endif
else
open(unit=iunit(nf),form=cform(nf),status=cstat(nf),
1 access=cacces(nf),position=cpos(nf),
2 file=filnam(nf)(1:length),err=95,iostat=ios)
if (cstat(nf).eq.'OLD') then
open(unit=iunit(nf),form=cform(nf),status='OLD',
1 access=cacces(nf),position=cpos(nf),
2 file=filnam(nf)(1:length),err=95,iostat=ios)
elseif (cstat(nf).eq.'NEW') then
open(unit=iunit(nf),form=cform(nf),status='NEW',
1 access=cacces(nf),position=cpos(nf),
2 file=filnam(nf)(1:length),err=95,iostat=ios)
elseif (cstat(nf).eq.'UNKNOWN') then
open(unit=iunit(nf),form=cform(nf),status='UNKNOWN',
1 access=cacces(nf),position=cpos(nf),
2 file=filnam(nf)(1:length),err=95,iostat=ios)
else
open(unit=iunit(nf),form=cform(nf),status=cstat(nf),
1 access=cacces(nf),position=cpos(nf),
2 err=95,iostat=ios)
endif
endif
ELSE
read(filnam(nf)(length+2:length+2+idgmax-1),37) lrec
37 format(i7)
write(6,39) lrec
39 format('...Direct access record length:',i7,'...')
if(cpos(nf) .eq. ' ') then
OPEN(UNIT=IUNIT(NF),FORM=CFORM(NF),STATUS=CSTAT(NF),
1 ACCESS=CACCES(NF),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS,RECL=lrec)
if (cstat(nf).eq.'OLD') then
OPEN(UNIT=IUNIT(NF),FORM=CFORM(NF),STATUS='OLD',
1 ACCESS=CACCES(NF),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS,RECL=lrec)
elseif (cstat(nf).eq.'NEW') then
OPEN(UNIT=IUNIT(NF),FORM=CFORM(NF),STATUS='NEW',
1 ACCESS=CACCES(NF),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS,RECL=lrec)
elseif (cstat(nf).eq.'UNKNOWN') then
OPEN(UNIT=IUNIT(NF),FORM=CFORM(NF),STATUS='UNKNOWN',
1 ACCESS=CACCES(NF),FILE=FILNAM(NF)(1:LENGTH),
2 ERR=95,IOSTAT=IOS,RECL=lrec)
else
OPEN(UNIT=IUNIT(NF),FORM=CFORM(NF),STATUS=CSTAT(NF),
1 ACCESS=CACCES(NF),
2 ERR=95,IOSTAT=IOS,RECL=lrec)
endif
else
open(unit=iunit(nf),form=cform(nf),status=cstat(nf),
1 access=cacces(nf),file=filnam(nf)(1:length),
2 position=cpos(nf),err=95,iostat=ios,recl=lrec)
if (cstat(nf).eq.'OLD') then
open(unit=iunit(nf),form=cform(nf),status='OLD',
1 access=cacces(nf),file=filnam(nf)(1:length),
2 position=cpos(nf),err=95,iostat=ios,recl=lrec)
elseif (cstat(nf).eq.'NEW') then
open(unit=iunit(nf),form=cform(nf),status='NEW',
1 access=cacces(nf),file=filnam(nf)(1:length),
2 position=cpos(nf),err=95,iostat=ios,recl=lrec)
elseif (cstat(nf).eq.'UNKNOWN') then
open(unit=iunit(nf),form=cform(nf),status='UNKNOWN',
1 access=cacces(nf),file=filnam(nf)(1:length),
2 position=cpos(nf),err=95,iostat=ios,recl=lrec)
else
open(unit=iunit(nf),form=cform(nf),status=cstat(nf),
1 access=cacces(nf),
2 position=cpos(nf),err=95,iostat=ios,recl=lrec)
endif
endif
ENDIF
ENDDO
Expand Down
4 changes: 3 additions & 1 deletion ush/rocoto/setup_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,9 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
deps = []
dep_dict = {'type':'task', 'name':'%swavepostsbs' % cdump}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)
dep_dict = {'type':'task', 'name':'%swavepostpnt' % cdump}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
task = wfu.create_wf_task('waveawipsbulls', cdump=cdump, envar=envars, dependency=dependencies)
dict_tasks['%swaveawipsbulls' % cdump] = task

Expand Down
4 changes: 3 additions & 1 deletion ush/rocoto/setup_workflow_fcstonly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,9 @@ def get_workflow(dict_configs, cdump='gdas'):
deps = []
dep_dict = {'type':'task', 'name':'%swavepostsbs' % cdump}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)
dep_dict = {'type':'task', 'name':'%swavepostpnt' % cdump}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
task = wfu.create_wf_task('waveawipsbulls', cdump=cdump, envar=envars, dependency=dependencies)
tasks.append(task)
tasks.append('\n')
Expand Down