Mercurial > hgweb > burst-coupling

changeset 75:a345c6f2748f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing code that sets output filenames.
author Marco van Hulten <marco@hulten.org>
date Wed, 10 Apr 2019 17:43:26 +0200
parents c6f526d1fc51
children c8ed926f0017
files mo_sedmnt_offline.F90 ncout_hamocc.F sediment_step.F90
diffstat 3 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mo_sedmnt_offline.F90	Tue Apr 09 21:47:04 2019 +0200
+++ b/mo_sedmnt_offline.F90	Wed Apr 10 17:43:26 2019 +0200
@@ -841,7 +841,6 @@
 ! set time information
 timeunits=' '
 startdate=' '
-fname=' '
 write(timeunits,'(a11,i4.4,a1,i2.2,a1,i2.2,a6)')                           &
    &            'days since ',min(1800,nyear0),'-',1,'-',1,' 00:00'
 write(startdate,'(i4.4,a1,i2.2,a1,i2.2,a6)')                               &
@@ -864,7 +863,7 @@
    &  fileann_sed(iogrp) .or.                                                 &
    &  filedec_sed(iogrp) .and. mod(nyear,  10)==0 .or.                        &
    &  filecen_sed(iogrp) .and. mod(nyear, 100)==0 .or.                        &
-   &  filemil_sed(iogrp) .and. mod(nyear,1000)==0    ) .and. nmonth==13)      &
+   &  filemil_sed(iogrp) .and. mod(nyear,1000)==0    ) .and. nmonth>=12)      &
    & .or. .not.(filemon_sed(iogrp) .or. fileann_sed(iogrp) .or.               &
    &            filedec_sed(iogrp) .or. filecen_sed(iogrp) .or.               &
    &            filemil_sed(iogrp)) .and.                                     &
@@ -873,7 +872,7 @@
 endif
 if ( trim(fname(iogrp)) == "" .and. mnproc==1 ) then
    write (lp,'(a,i2,a)') 'ERROR in ncwrt_onlysed():                           &
-      &                   The filename fname(',iogrp,') is empty!'
+      &  The filename fname(',iogrp,') is empty!'
 endif
 
 ! prepare output fields
--- a/ncout_hamocc.F	Tue Apr 09 21:47:04 2019 +0200
+++ b/ncout_hamocc.F	Wed Apr 10 17:43:26 2019 +0200
@@ -30,7 +30,6 @@
 c --- set time information
       timeunits=' '
       startdate=' '
-      fname=' ' 
       write(timeunits,'(a11,i4.4,a1,i2.2,a1,i2.2,a6)')
      . 'days since ',min(1800,nyear0),'-',1,'-',1,' 00:00'
       write(startdate,'(i4.4,a1,i2.2,a1,i2.2,a6)')
--- a/sediment_step.F90	Tue Apr 09 21:47:04 2019 +0200
+++ b/sediment_step.F90	Wed Apr 10 17:43:26 2019 +0200
@@ -29,9 +29,9 @@
 ! Known issues:
 !
 ! Building may fail, because the routine has OPTIONAL arguments whereas
-! it is not in an INTERFACE.  This routine should be included in a
-! module or an explicit interface must be defined.  Work-around is to do
-! a clean_build before build -MvH (201904).
+! it is not in an INTERFACE.  This routine should be included in a module
+! (e.g. modernised mo_sedmnt) or an explicit interface must be defined.
+! Work-around is to do a clean_build before build -MvH (201904).
 !
 ! History:
 !