Changeset 15575 for NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate

Timestamp:

2021-12-06T10:50:40+01:00 (2 years ago)

Author:

hadjt

Message:

Improved version of Diaharm_fast, for testing. using sec2start based on adatrj (* 86400._wp)

to be tested

File:

• NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA/diaharm_fast.F90 (modified) (12 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA/diaharm_fast.F90

@@ -83 +83 @@
    LOGICAL, PUBLIC :: ln_diaharm_fast
 
+
    !JT
    LOGICAL, PUBLIC :: ln_ana_ssh, ln_ana_uvbar, ln_ana_bfric, ln_ana_rho, ln_ana_uv3d, ln_ana_w3d
@@ -161 +162 @@
       ENDIF
 
-        
-!    DO jh = 1, nb_ana       
-
-!        tmp_name=TRIM(Wave(ntide_all(jh))%cname_tide)//'_anau_utide'
-!        IF( iom_use(TRIM(tmp_name)) )  THEN
-!        !    IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(anau(jh) )
-!            CALL iom_put( TRIM(tmp_name), anau(jh) )
-!        !ELSE
-!        !    IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
-!        ENDIF    
-
-!        tmp_name=TRIM(Wave(ntide_all(jh))%cname_tide)//'_anav_v0tide'
-!        IF( iom_use(TRIM(tmp_name)) )  THEN
-!        !    IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(anav(jh) )
-!            CALL iom_put( TRIM(tmp_name), anav(jh) )
-!        !ELSE
-!        !    IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
-!        ENDIF
-
-!        tmp_name=TRIM(Wave(ntide_all(jh))%cname_tide)//'_anaf_ftide'
-!        IF( iom_use(TRIM(tmp_name)) )  THEN
-!        !    IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(anaf(jh) )
-!            CALL iom_put( TRIM(tmp_name), anaf(jh) )
-!        !ELSE
-!        !    IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
-!        ENDIF
-
-!     END DO
-!       
-
      IF ( ln_diaharm_fast .and. ln_diaharm_store .and. ( lk_diaharm_2D .or. lk_diaharm_3D) ) THEN
 
@@ -200 +171 @@
           sec2start = nsec_day - NINT(0.5_wp * rdt)
 
-
-
+          sec2start = adatrj * 86400._wp
+
+          
+          IF(lwp) WRITE(numout,*) 'diaharm_fast: sec2start = ',nint( (fjulday-fjulday_startharm)*86400._wp ),nsec_day - NINT(0.5_wp * rdt),adatrj * 86400._wp
 
           IF( iom_use('tide_t') ) CALL iom_put( 'tide_t', sec2start )
@@ -213 +186 @@
              c(2*jh  ) = anaf(jh)*cos( sec2start*om_tide(jh) + anau(jh) + anav(jh) )
              c(2*jh+1) = anaf(jh)*sin( sec2start*om_tide(jh) + anau(jh) + anav(jh) )
+
+             c(2*jh  ) = anaf(jh)*cos( sec2start*om_tide(jh) + anau(jh) )
+             c(2*jh+1) = anaf(jh)*sin( sec2start*om_tide(jh) + anau(jh) )
+
+
              
-             IF(lwp) WRITE(numout,*) 'diaharm_fast: analwave,',kt,tname(jh),sec2start,sec2start/3600.,sec2start_old,sec2start_old/3600,c(2*jh),c(2*jh+1),om_tide(jh),anau(jh),anav(jh)
+             !IF(lwp) WRITE(numout,*) 'diaharm_fast: analwave,',kt,tname(jh),sec2start,sec2start/3600.,sec2start_old,sec2start_old/3600,c(2*jh),c(2*jh+1),om_tide(jh),anau(jh),anav(jh)
           ENDDO 
 
@@ -764 +742 @@
 !      REAL(wp) :: zsto1, zsto2, zout, zmax, zjulian, zdt, zmdi  ! temporary scalars
 
+
       do jgrid=1,nvar_2d
           do jh=1,nb_ana
@@ -782 +761 @@
                    ENDIF
                    IF (g_out2D(ji,jj).ne.0) THEN  !Correct and take modulus
-                       g_out2D(ji,jj) = g_out2D(ji,jj) + MOD( (anau(jh)+anav(jh))/rad , 360.0)
+                       !JT 
+                       !JT  g_out2D(ji,jj) = g_out2D(ji,jj) + MOD( (anau(jh)+anav(jh))/rad , 360.0)
+                       !JT 
+                       g_out2D(ji,jj) = g_out2D(ji,jj) + MOD( (anau(jh))/rad , 360.0)
                        if (g_out2D(ji,jj).gt.360.0) then
                            g_out2D(ji,jj)=g_out2D(ji,jj)-360.0
@@ -799 +781 @@
              IF( iom_use(TRIM(tmp_name)) )  THEN
                 IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(h_out2D)
-                IF(lwp) WRITE(numout,*) "harm_ana_out_names", tmp_name,tname(jh),' ',om_tide(jh), (2*rpi/3600.)/om_tide(jh),"hr"
+                IF(lwp) WRITE(numout,*) "harm_ana_out names", tmp_name,tname(jh),' ',om_tide(jh), (2*rpi/3600.)/om_tide(jh),"hr"
                 CALL iom_put( TRIM(tmp_name), h_out2D(:,:) )
              ELSE
@@ -812 +794 @@
                 IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
              ENDIF
+
+
+
+             CALL FLUSH(numout)
+
 
           enddo
@@ -823 +810 @@
             IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
          ENDIF
+
+         CALL FLUSH(numout)
 
       enddo
@@ -847 +836 @@
                       ENDIF
                       IF (g_out3D(ji,jj,jk).ne.0) THEN  !Correct and take modulus
-                          g_out3D(ji,jj,jk) = g_out3D(ji,jj,jk) + MOD( (anau(jh)+anav(jh))/rad , 360.0)
+                          !JT                        
+                          !JT g_out3D(ji,jj,jk) = g_out3D(ji,jj,jk) + MOD( (anau(jh)+anav(jh))/rad , 360.0)
+                          !JT 
+                          g_out3D(ji,jj,jk) = g_out3D(ji,jj,jk) + MOD( (anau(jh))/rad , 360.0)
                           if      (g_out3D(ji,jj,jk).gt.360.0) then
                                    g_out3D(ji,jj,jk) = g_out3D(ji,jj,jk)-360.0
@@ -891 +883 @@
       enddo                 ! jgrid
 
+     CALL FLUSH(numout)
 
 
@@ -908 +901 @@
 
 
-
-!
    END SUBROUTINE harm_ana_out
 !