[Dart-dev] [4488] DART/trunk: Step toward support for the netCDF 4 libraries. netCDF 4

nancy at ucar.edu nancy at ucar.edu
Fri Sep 10 15:58:23 MDT 2010


Revision: 4488
Author:   thoar
Date:     2010-09-10 15:58:23 -0600 (Fri, 10 Sep 2010)
Log Message:
-----------
Step toward support for the netCDF 4 libraries. netCDF 4 assigns file
identifiers that do not fit in an "I3" format, so the format width is
unspecified now (where possible) and I10 when it must be specified.
There are a few more models&files that need to change, but there are other
things to change in those models as well - for a different time.

Modified Paths:
--------------
    DART/trunk/assim_model/assim_model_mod.f90
    DART/trunk/models/MITgcm_ocean/model_mod.f90
    DART/trunk/models/POP/model_mod.f90
    DART/trunk/models/cam/model_mod.f90
    DART/trunk/models/lorenz_96/model_mod.f90
    DART/trunk/models/pe2lyr/model_mod.f90
    DART/trunk/models/simple_advection/model_mod.f90

-------------- next part --------------
Modified: DART/trunk/assim_model/assim_model_mod.f90
===================================================================
--- DART/trunk/assim_model/assim_model_mod.f90	2010-09-01 16:30:18 UTC (rev 4487)
+++ DART/trunk/assim_model/assim_model_mod.f90	2010-09-10 21:58:23 UTC (rev 4488)
@@ -1132,13 +1132,13 @@
 if ( timeindex < 0 ) then
    call get_time(model_time,is1,id1)
    write(msgstring,*)'model time (d,s)',id1,is1,' not in ',ncFileID%fname
-   write(msgstring,'(''model time (d,s) ('',i8,i5,'') is index '',i6, '' in ncFileID '',i3)') &
+   write(msgstring,'(''model time (d,s) ('',i8,i5,'') is index '',i6, '' in ncFileID '',i10)') &
           id1,is1,timeindex,ncFileID%ncid
    call error_handler(E_ERR,'aoutput_diagnostics', msgstring, source, revision, revdate)
 endif
 
    call get_time(model_time,is1,id1)
-   write(msgstring,'(''model time (d,s) ('',i8,i5,'') is index '',i6, '' in ncFileID '',i3)') &
+   write(msgstring,'(''model time (d,s) ('',i8,i5,'') is index '',i6, '' in ncFileID '',i10)') &
           id1,is1,timeindex,ncFileID%ncid
    call error_handler(E_DBG,'aoutput_diagnostics', msgstring, source, revision, revdate)
 
@@ -1500,7 +1500,7 @@
 
       timeindex = nc_append_time(ncFileID, statetime)
 
-      write(msgstring,'(''appending model time (d,s) ('',i8,i5,'') as index '',i6, '' in ncFileID '',i3)') &
+      write(msgstring,'(''appending model time (d,s) ('',i8,i5,'') as index '',i6, '' in ncFileID '',i10)') &
           days,secs,timeindex,ncid
       call error_handler(E_DBG,'nc_get_tindex',msgstring,source,revision,revdate)
 

Modified: DART/trunk/models/MITgcm_ocean/model_mod.f90
===================================================================
--- DART/trunk/models/MITgcm_ocean/model_mod.f90	2010-09-01 16:30:18 UTC (rev 4487)
+++ DART/trunk/models/MITgcm_ocean/model_mod.f90	2010-09-10 21:58:23 UTC (rev 4488)
@@ -1287,7 +1287,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !-------------------------------------------------------------------------------
 ! make sure ncFileID refers to an open netCDF file, 
@@ -1658,7 +1658,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !-------------------------------------------------------------------------------
 ! make sure ncFileID refers to an open netCDF file, 

Modified: DART/trunk/models/POP/model_mod.f90
===================================================================
--- DART/trunk/models/POP/model_mod.f90	2010-09-01 16:30:18 UTC (rev 4487)
+++ DART/trunk/models/POP/model_mod.f90	2010-09-10 21:58:23 UTC (rev 4488)
@@ -1934,7 +1934,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !-------------------------------------------------------------------------------
 ! make sure ncFileID refers to an open netCDF file, 
@@ -2360,7 +2360,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !-------------------------------------------------------------------------------
 ! make sure ncFileID refers to an open netCDF file, 

Modified: DART/trunk/models/cam/model_mod.f90
===================================================================
--- DART/trunk/models/cam/model_mod.f90	2010-09-01 16:30:18 UTC (rev 4487)
+++ DART/trunk/models/cam/model_mod.f90	2010-09-10 21:58:23 UTC (rev 4488)
@@ -2152,7 +2152,7 @@
 !    More dimensions, variables and attributes will be added in this routine.
 !-------------------------------------------------------------------------------
 
-write(errstring,'(I4)') ncFileID
+write(errstring,*) 'ncFileID', ncFileID
 call nc_check(nf90_Inquire(ncFileID, nDimensions, nVariables, nAttributes, unlimitedDimID), &
               'nc_write_model_atts', 'Inquire '//trim(errstring))
 call nc_check(nf90_Redef(ncFileID), 'nc_write_model_atts', 'Redef '//trim(errstring))

Modified: DART/trunk/models/lorenz_96/model_mod.f90
===================================================================
--- DART/trunk/models/lorenz_96/model_mod.f90	2010-09-01 16:30:18 UTC (rev 4487)
+++ DART/trunk/models/lorenz_96/model_mod.f90	2010-09-10 21:58:23 UTC (rev 4488)
@@ -410,7 +410,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !--------------------------------------------------------------------
 ! make sure ncFileID refers to an open netCDF file 
@@ -589,7 +589,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 
 ierr = 0                      ! assume normal termination

Modified: DART/trunk/models/pe2lyr/model_mod.f90
===================================================================
--- DART/trunk/models/pe2lyr/model_mod.f90	2010-09-01 16:30:18 UTC (rev 4487)
+++ DART/trunk/models/pe2lyr/model_mod.f90	2010-09-10 21:58:23 UTC (rev 4488)
@@ -517,7 +517,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !--------------------------------------------------------------------
 ! make sure ncFileID refers to an open netCDF file 
@@ -719,7 +719,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !--------------------------------------------------------------------
 ! unpack the state vector into prognostic variables

Modified: DART/trunk/models/simple_advection/model_mod.f90
===================================================================
--- DART/trunk/models/simple_advection/model_mod.f90	2010-09-01 16:30:18 UTC (rev 4487)
+++ DART/trunk/models/simple_advection/model_mod.f90	2010-09-10 21:58:23 UTC (rev 4488)
@@ -596,7 +596,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 !--------------------------------------------------------------------
 ! make sure ncFileID refers to an open netCDF file 
@@ -895,7 +895,7 @@
 ! which netcdf file is involved.
 !--------------------------------------------------------------------
 
-write(filename, '(a, i3)') 'ncFileID', ncFileID
+write(filename,*) 'ncFileID', ncFileID
 
 
 ierr = 0                      ! assume normal termination


More information about the Dart-dev mailing list