Merge pull request #274 from ChemCryst/rc15.4.1

Fixed version number output in CIF
ChemCryst · May 4, 2023 · 1671017 · 1671017
2 parents 6e2b541 + 15b67b3
commit 1671017
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/CI-intel.yml b/.github/workflows/CI-intel.yml
@@ -151,7 +151,7 @@ jobs:
       run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
     - name: Check outputs
-      run: echo ${{ steps.vars.outputs.sha_short }}
+      run: echo ${{ steps.vars.outputs.sha_short }} ${{ steps.get_version.outputs.major }} ${{ steps.get_version.outputs.minor }}
 
     - name: Build custom mkl library
       working-directory: ci

diff --git a/crystals/results.F b/crystals/results.F
@@ -4717,6 +4717,7 @@ SUBROUTINE XCIFX
       CHARACTER CBUF*80,CTEMP*80,CLINE*80, CHLINE*380
       character *80 ctext(4)
       character *80 cflack
+      CHARACTER*10 CVER
 C
       CHARACTER*4 CTYPE
       CHARACTER*15 CINSTR,CDIR,CPARAM,CVALUE,CDEF
@@ -4898,7 +4899,15 @@ subroutine snum(coor,esd,nd,np,j,ivet)
         WRITE (NCFPU1,'(''_audit_creation_date  '',6X, 
      1  ''"20'',3(A2,A))')
      2  CBUF(7:8),'-',CBUF(4:5),'-',CBUF(1:2),'"'
-        WRITE (CLINE,'(F5.2,A,A)')0.01*FLOAT(ISSVER),'_build_',
+     
+        IMAJOR = FLOOR(0.00001*FLOAT(ISSVER))
+	  IMINOR = FLOOR(0.001*FLOAT(ISSVER - IMAJOR*100000))
+	  IPATCH = FLOOR(FLOAT(ISSVER - IMAJOR*100000 - IMINOR*1000))
+        WRITE(CVER,2006)IMAJOR,IMINOR,IPATCH
+2006  FORMAT(I3,'.',I2,'.',I3)
+	  CALL XCRAS(CVER,LVER)      
+        
+        WRITE (CLINE,'(A,A,A)') CVER(1:LVER),'_build_',
      1                              CSSSVN(1:LSSSVN)
         CALL XCREMS (CLINE,CLINE,NCHAR)
         CALL XCTRIM (CLINE,NCHAR)