Changeset 12933 for NEMO/trunk/src/OCE/OBS/obs_grid.F90

Timestamp:

2020-05-15T10:06:25+02:00 (4 years ago)

Author:

smasson

Message:

trunk: merge back r12581_ticket2418 branch into the trunk, see #2418

Location:

NEMO/trunk

Files:

• . (modified) (1 prop)
• src/OCE/OBS/obs_grid.F90 (modified) (2 diffs)

NEMO/trunk

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12798        sette
+^/utils/CI/sette@12931        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12798        sette
+^/utils/CI/sette@12931        sette

NEMO/trunk/src/OCE/OBS/obs_grid.F90

@@ -684 +684 @@
          & fhistx1, fhistx2, fhisty1, fhisty2
       REAL(wp) :: histtol
-      
+      CHARACTER(LEN=26) :: clfmt            ! writing format
+      INTEGER           :: idg              ! number of digits
+ 
       IF (ln_grid_search_lookup) THEN
          
@@ -709 +711 @@
 
          IF ( ln_grid_global ) THEN
-            WRITE(cfname, FMT="(A,'_',A)") &
-               &          TRIM(cn_gridsearchfile), 'global.nc'
+            WRITE(cfname, FMT="(A,'_',A)") TRIM(cn_gridsearchfile), 'global.nc'
          ELSE
-            WRITE(cfname, FMT="(A,'_',I4.4,'of',I4.4,'by',I4.4,'.nc')") &
-               &          TRIM(cn_gridsearchfile), nproc, jpni, jpnj
+            idg = MAX( INT(LOG10(REAL(jpnij,wp))) + 1, 4 )        ! how many digits to we need to write? min=4, max=9
+            ! define the following format: "(a,a,ix.x,a,ix.x,a,ix.x,a)"
+            WRITE(clfmt, "('(a,a,i', i1, '.', i1',a,i', i1, '.', i1',a,i', i1, '.', i1',a)')") idg, idg, idg, idg, idg, idg
+            WRITE(cfname,      clfmt     ) TRIM(cn_gridsearchfile),'_', nproc,'of', jpni,'by', jpnj,'.nc'
          ENDIF
 

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12798        sette
+^/utils/CI/sette@12931        sette