Changeset 607

Timestamp:

11/19/17 00:18:39 (6 years ago)

Author:

dubos

Message:

trunk : added AAM_tot to detailed AAM budget

Location:

codes/icosagcm/trunk/src

Files:

• diagnostics/check_conserve.f90 (modified) (1 diff)
• initial/etat0_heldsz.f90 (modified) (2 diffs)
• time/timeloop_gcm.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/diagnostics/check_conserve.f90

@@ -127 +127 @@
           WRITE(*,'(A,6E12.4)') 'AAM_vel  : time,old,new,dissip,dyn,phys', dt*it, AAM_vel_old, AAM_vel, &
                AAM_vel_source(AAM_dissip), AAM_vel_source(AAM_dyn), AAM_vel_source(AAM_phys)
+          WRITE(*,'(A,6E12.4)') 'AAM_tot  : time,old,new,dissip,dyn,phys', dt*it, &
+               AAM_vel_old+AAM_mass_old, AAM_vel+AAM_mass, &
+               AAM_vel_source(AAM_dissip)+AAM_mass_source(AAM_dissip), &
+               AAM_vel_source(AAM_dyn)   +AAM_mass_source(AAM_dyn), &
+               AAM_vel_source(AAM_phys)  +AAM_mass_source(AAM_phys)
           AAM_mass_old=AAM_mass
           AAM_vel_old=AAM_vel

codes/icosagcm/trunk/src/initial/etat0_heldsz.f90

@@ -245 +245 @@
           DO i=ii_begin-1,ii_end+1
              ij=(j-1)*iim+i
-             theta(ij,l)=theta(ij,l) - dt*(theta(ij,l)-theta_eq(ij,l))* &
+             theta(ij,l)=theta(ij,l) - itau_physics*dt*(theta(ij,l)-theta_eq(ij,l))* &
                   (knewt_g+knewt_t(l)*COS(lat(ij))**4 )
           ENDDO
@@ -253 +253 @@
 
     Do l=1,llm
-       u(:,l)=u(:,l)*(1.-dt*kfrict(l))
+       u(:,l)=u(:,l)*(1.-itau_physics*dt*kfrict(l))
     END DO
 

codes/icosagcm/trunk/src/time/timeloop_gcm.f90

@@ -375 +375 @@
        per_step = elapsed/(it-itau0)
        throughput = dt/per_step
-       total = per_step*(itaumax-itau0)
+       total = per_step*itaumax
        WRITE(*,'(A,I5,A,F6.2,A,I6)') 'Time spent (s):',INT(elapsed), &
             '  -- ms/step : ', 1000*per_step, &