Changeset 262 for codes/icosagcm/branches

Timestamp:

07/29/14 18:30:42 (10 years ago)

Author:

ymipsl

Message:

Save starting iteration itau0 in dynamico restart file.
Timeloop now begin from itau0 which can be read from start file or set to 0 by default.

YM

Location:

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src

Files:

• check_conserve.f90 (modified) (1 diff)
• etat0_start_file.f90 (modified) (4 diffs)
• restart.f90 (modified) (6 diffs)
• time.f90 (modified) (2 diffs)
• timeloop_gcm.f90 (modified) (2 diffs)
• write_etat0.f90 (modified) (3 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/check_conserve.f90

@@ -71 +71 @@
     IF (is_mpi_root) THEN 
 !$OMP MASTER       
-       IF ( it == 0  ) Then 
+       IF ( it == itau0  ) Then 
           ztot0 = ztot
           mtot0 = mtot

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/etat0_start_file.f90

@@ -12 +12 @@
   USE wind_mod
   USE write_field
+  USE time_mod
+  USE transfert_mod
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
@@ -30 +32 @@
         CALL allocate_field(f_ulon,field_t,type_real,llm,name='ulon')
         CALL allocate_field(f_ulat,field_t,type_real,llm,name='ulat')
-        CALL read_start(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+        CALL read_start(itau0,f_ps,f_phis,f_theta_rhodz,f_u, f_q)
         CALL transfert_request(f_ps,req_i1)
         CALL transfert_request(f_phis,req_i1)
@@ -45 +47 @@
         CALL allocate_field(f_ulon,field_t,type_real,llm,name='ulon')
         CALL allocate_field(f_ulat,field_t,type_real,llm,name='ulat')
-        CALL read_start(f_ps,f_phis,f_theta_rhodz,f_ulon,f_ulat, f_q)
+        CALL read_start(itau0,f_ps,f_phis,f_theta_rhodz,f_ulon,f_ulat, f_q)
         CALL transfert_request(f_ulat,req_i1)
         CALL transfert_request(f_ulon,req_i1)
@@ -61 +63 @@
       ENDIF
 
+      CALL bcast(itau0)
+      CALL getin("etat0_start_iteration",itau0)        
+
   END SUBROUTINE etat0
   

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/restart.f90

@@ -10 +10 @@
 CONTAINS
   
-  SUBROUTINE write_restart(field0 ,field1 ,field2 ,field3 ,field4 ,field5 ,field6 ,field7 ,field8 ,field9,   &
+  SUBROUTINE write_restart(it,field0 ,field1 ,field2 ,field3 ,field4 ,field5 ,field6 ,field7 ,field8 ,field9,   &
                            field10,field11,field12,field13,field14,field15,field16,field17,field18,field19 )
   USE prec
@@ -22 +22 @@
   USE transfert_mod
  
-  IMPLICIT NONE
+  IMPLICIT NONE 
+  INTEGER,INTENT(IN)     :: it
+
   TYPE(t_field),POINTER,OPTIONAL,DIMENSION(:) :: field0 ,field1 ,field2 ,field3 ,field4 ,field5 ,field6 ,field7 ,field8 ,field9
   TYPE(t_field),POINTER,OPTIONAL,DIMENSION(:) :: field10,field11,field12,field13,field14,field15,field16,field17,field18,field19
@@ -77 +79 @@
       status = NF90_DEF_DIM(ncid,'nvert',nvert,vertId)
       status = NF90_DEF_DIM(ncid,'nq',nqtot,nqId)
+      status = NF90_PUT_ATT(ncid,NF90_GLOBAL,"iteration",it)
       
       status = NF90_DEF_VAR(ncid,'lon',NF90_DOUBLE,(/ cellId /),lonId)
@@ -317 +320 @@
 
 
-  SUBROUTINE read_start(field0 ,field1 ,field2 ,field3 ,field4 ,field5 ,field6 ,field7 ,field8 ,field9,   &
-                          field10,field11,field12,field13,field14,field15,field16,field17,field18,field19 )
+  SUBROUTINE read_start(it,field0 ,field1 ,field2 ,field3 ,field4 ,field5 ,field6 ,field7 ,field8 ,field9,   &
+                           field10,field11,field12,field13,field14,field15,field16,field17,field18,field19 )
   USE prec
   USE metric
@@ -330 +333 @@
  
   IMPLICIT NONE
+  INTEGER, INTENT(OUT)  :: it
   TYPE(t_field),POINTER,OPTIONAL,DIMENSION(:) :: field0 ,field1 ,field2 ,field3 ,field4 ,field5 ,field6 ,field7 ,field8 ,field9
   TYPE(t_field),POINTER,OPTIONAL,DIMENSION(:) :: field10,field11,field12,field13,field14,field15,field16,field17,field18,field19
@@ -384 +388 @@
       field=>field_array(nf)%field
       status = nf90_inq_varid(ncid, TRIM(ADJUSTL(field(1)%name)), fieldId(nf))
+      status = nf90_get_att(ncid, NF90_GLOBAL, "iteration", it)
       CALL read_start_field(field,fieldId(nf),ncid)
     ENDDO

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/time.f90

@@ -9 +9 @@
   INTEGER,SAVE :: it
 !$OMP THREADPRIVATE(it)  
+
+  INTEGER,SAVE :: itau0=0
+!$OMP THREADPRIVATE(itau0)  
 
   REAL(rstd),SAVE :: dt
@@ -37 +40 @@
          dt, write_period, itau_out, itau_adv, itau_dissip, itau_physics, itaumax, & 
 day_step,ndays,jD_ref,jH_ref,day_ini,day_end,annee_ref,day_ref,an, mois, jour,heure, &
-            calend,time_style
+            calend,time_style,itau0
 
 

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/timeloop_gcm.f90

@@ -197 +197 @@
 !$OMP END MASTER   
 
+  CALL check_conserve(f_ps,f_dps,f_u,f_theta_rhodz,f_phis,itau0)  
+
   CALL trace_on
   
-  DO it=0,itaumax
+  DO it=itau0+1,itau0+itaumax
     
     IF (xios_output) CALL xios_update_calendar(it)
-    IF (MOD(it,itau_sync)==0) THEN
+    IF (it==itau0+1 .OR. MOD(it,itau_sync)==0) THEN
       CALL send_message(f_ps,req_ps0)
       CALL wait_message(req_ps0)
@@ -294 +296 @@
   ENDDO
 
-  CALL write_etat0(f_ps, f_phis,f_theta_rhodz,f_u,f_q) 
+  CALL write_etat0(itau0+itaumax,f_ps, f_phis,f_theta_rhodz,f_u,f_q) 
 
   CALL check_conserve(f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)  

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/write_etat0.f90

@@ -5 +5 @@
 CONTAINS
 
-  SUBROUTINE write_etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+  SUBROUTINE write_etat0(it,f_ps,f_phis,f_theta_rhodz,f_u, f_q)
   USE icosa
   USE restart_mod
@@ -11 +11 @@
   USE write_field
   IMPLICIT NONE
+    INTEGER,INTENT(IN)    :: it
     TYPE(t_field),POINTER :: f_ps(:)
     TYPE(t_field),POINTER :: f_phis(:)
@@ -27 +28 @@
     CALL un2ulonlat(f_u, f_ulon, f_ulat)
     
-    CALL write_restart(f_ps,f_phis,f_theta_rhodz,f_u, f_ulon, f_ulat, f_q)
+    CALL write_restart(it,f_ps,f_phis,f_theta_rhodz,f_u, f_ulon, f_ulat, f_q)
 
     CALL deallocate_field(f_ulon)