Changeset 6686

Timestamp:

2016-06-13T09:38:23+02:00 (8 years ago)

Author:

deazer

Message:

Added extra option to compute final harmonic analysis or not

Location:

branches/UKMO/dev_5518_tide_analysis_restart/NEMOGCM/NEMO/OPA_SRC

Files:

• BDY/bdytides.F90 (modified) (3 diffs)
• DIA/diaharmana.F90 (modified) (2 diffs)
• step.F90 (modified) (1 diff)

branches/UKMO/dev_5518_tide_analysis_restart/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90

@@ -51 +51 @@
    END TYPE TIDES_DATA
    INTEGER, PUBLIC, PARAMETER                  ::   jptides_max = 15      !: Max number of tidal contituents
-      LOGICAL, PUBLIC                           ::   ln_harm_ana             !: =T  Compute harmonic Analysis
+      LOGICAL, PUBLIC                           ::   ln_harm_ana_store    !: =T Stores data for  harmonic Analysis
+      LOGICAL, PUBLIC                           ::   ln_harm_ana_compute     !: =T  Compute harmonic Analysis
       LOGICAL, PUBLIC                           ::   ln_harmana_read         !: =T  Decide to do the analysis 
                                                                              !from scratch or continue previous run
@@ -94 +95 @@
       TYPE(MAP_POINTER), DIMENSION(jpbgrd)      ::   ibmap_ptr           !: array of pointers to nbmap
       !!
-      NAMELIST/nambdy_tide/filtide, ln_bdytide_2ddta, ln_bdytide_conj, ln_harm_ana, ln_harmana_read
+      NAMELIST/nambdy_tide/filtide, ln_bdytide_2ddta, ln_bdytide_conj, ln_harm_ana_store, ln_harm_ana_compute, ln_harmana_read
       !!----------------------------------------------------------------------
 
@@ -129 +130 @@
             IF(lwp) WRITE(numout,*) '             assume complex conjugate   : ', ln_bdytide_conj
             IF(lwp) WRITE(numout,*) '             Number of tidal components to read: ', nb_harmo
-            IF(lwp) WRITE(numout,*) '             Use PCOMS harmonic ananalysis or not: ', ln_harm_ana
+            IF(lwp) WRITE(numout,*) '             Use PCOMS harmonic ananalysis or not: ', ln_harm_ana_store
+            IF(lwp) WRITE(numout,*) '             Compute Final  harmonic ananalysis or not: ', ln_harm_ana_compute
             IF(lwp) WRITE(numout,*) '             Read in previous days harmonic data or start afresh: ', ln_harmana_read
             IF(lwp) THEN 

branches/UKMO/dev_5518_tide_analysis_restart/NEMOGCM/NEMO/OPA_SRC/DIA/diaharmana.F90

@@ -153 +153 @@
 
 
-
+      if(ln_harm_ana_compute) then
+               WRITE(numout,*) "Computing harmonics at last step"
 !
         cosampu=0.0_wp
@@ -227 +228 @@
 !
         CALL harm_ana_out     ! output analysis (last time step)
+     ELSE ! ln_harmana_compute 
+         WRITE(numout,*) "Skipping Computing harmonics at last step"
+     ENDIF
        
     ENDIF

branches/UKMO/dev_5518_tide_analysis_restart/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -347 +347 @@
                                CALL dia_wri_state( 'output.abort', kstp )
       ENDIF
-      IF( ln_harm_ana   )   CALL harm_ana( kstp )        ! Harmonic analysis of tides 
+      IF( ln_harm_ana_store   )   CALL harm_ana( kstp )        ! Harmonic analysis of tides 
       IF( kstp == nit000   )   THEN
                  CALL iom_close( numror )     ! close input  ocean restart file