Changeset 706

Timestamp:

07/17/18 17:24:56 (6 years ago)

Author:

millour

Message:

Tidying up around dissipation steps and outputs.
So far application of dissipation (every itau_dissip dyn step) was automatically set. Keep this behaviour if the user sets itau_dissip=0, or else use imposed value of itau_dissip.
Also added some diagnostic output fields for dissipation: dulon_diss1, dulat_diss1, dulon_diss2 and dulat_diss2. So add the definitions for these fields in your field_def.xml (e.g. alongside ulon, ulat, dulon_phys, etc.)
EM

Location:

codes/icosagcm/trunk/src

Files:

• dissip/dissip_gcm.f90 (modified) (3 diffs)
• time/time.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/dissip/dissip_gcm.f90

@@ -453 +453 @@
 
     IF(mintau>0) THEN
-       itau_dissip=INT(mintau/dt)
-       dtdissip=itau_dissip*dt
+       IF (itau_dissip==0) THEN
+         IF (is_master) PRINT *,"init_dissip: Automatic computation of itau_dissip..."
+         itau_dissip=INT(mintau/dt)
+       ENDIF
     ELSE
-       IF (is_master) PRINT *,"No dissipation time set, setting itau_dissip to 1000000000"
+       IF (is_master) PRINT *,"init_dissip: No dissipation time set, setting itau_dissip to 1000000000"
        itau_dissip=100000000
     END IF
     itau_dissip=MAX(1,itau_dissip)
-    IF (is_master) PRINT *,"rayleigh_tau",rayleigh_tau, "mintau ",mintau, &
-         "itau_dissip",itau_dissip," dtdissip ",dtdissip
+    dtdissip=itau_dissip*dt
+    IF (is_master) THEN
+      PRINT *,"init_dissip: rayleigh_tau",rayleigh_tau, "mintau ",mintau
+      PRINT *,"init_dissip: itau_dissip",itau_dissip," dtdissip ",dtdissip
+    ENDIF
 
   END SUBROUTINE init_dissip 
@@ -557 +562 @@
    CALL trace_end("dissip")
 
+   CALL write_dissip_tendencies
 !$OMP BARRIER
 
@@ -588 +594 @@
        END SUBROUTINE relax
       
+       SUBROUTINE write_dissip_tendencies
+         USE observable_mod, ONLY : f_buf_ulon, f_buf_ulat
+         USE wind_mod
+         USE output_field_mod
+
+         CALL transfert_request(f_due_diss1,req_e1_vect)
+         CALL un2ulonlat(f_due_diss1, f_buf_ulon, f_buf_ulat, (1./(tau_graddiv(1))))
+         CALL output_field("dulon_diss1",f_buf_ulon)
+         CALL output_field("dulat_diss1",f_buf_ulat)
+!
+         CALL transfert_request(f_due_diss2,req_e1_vect)
+         CALL un2ulonlat(f_due_diss2, f_buf_ulon, f_buf_ulat, (1./(tau_graddiv(1))))
+         CALL output_field("dulon_diss2",f_buf_ulon)
+         CALL output_field("dulat_diss2",f_buf_ulat)
+       END SUBROUTINE write_dissip_tendencies
+
   END SUBROUTINE dissip
 

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

@@ -75 +75 @@
     CALL getin('itau_adv',itau_adv)
 
-    itau_dissip=1
+    itau_dissip=0 ! set to zero which implies itau_dissip will be automatically computed (see init_dissip)
     CALL getin('itau_dissip',itau_dissip)