Isue #65 - sync merge branch 'release/gfs.v15.3.0' into release/gfsv1…

…5.3.1
NOAA-EMC · May 6, 2020 · 0c403ef · 0c403ef
2 parents f756859 + a5dfbf5
commit 0c403ef
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 15 deletions.
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -44,9 +44,9 @@ fi
 echo EMC_gfs_wafs checkout ...
 if [[ ! -d gfs_wafs.fd ]] ; then
     rm -f ${topdir}/checkout-gfs_wafs.log
-    git clone --recursive gerrit:EMC_gfs_wafs gfs_wafs.fd >> ${topdir}/checkout-gfs_wafs.log 2>&1
+    git clone --recursive https://github.com/NOAA-EMC/EMC_gfs_wafs.git gfs_wafs.fd >> ${topdir}/checkout-gfs_wafs.log 2>&1
     cd gfs_wafs.fd
-    git checkout gfs_wafs.v5.0.10
+    git checkout gfs_wafs.v5.0.11
     cd ${topdir}
 else
     echo 'Skip.  Directory gfs_wafs.fd already exists.'

diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
@@ -23,7 +23,7 @@ fi
 
 LINK="ln -fs"
 SLINK="ln -fs"
-[[ $RUN_ENVIR = nco ]] && LINK="rsync -av"
+[[ $RUN_ENVIR = nco ]] && LINK="cp -rp"
 
 pwd=$(pwd -P)
 

diff --git a/sorc/syndat_qctropcy.fd/qctropcy.f b/sorc/syndat_qctropcy.fd/qctropcy.f
@@ -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