Changeset 353 for trunk

Timestamp:

11/18/21 10:25:18 (3 years ago)

Author:

aquiquet

Message:

Very minor correction to climat_transient_GCM so that we can use it without applying the anomalies (massb_time=0)

File:

• trunk/SOURCES/climat_transient_GCM_mod.f90 (modified) (1 diff)

trunk/SOURCES/climat_transient_GCM_mod.f90

@@ -275 +275 @@
 ! after -> last value
 
-  if(time.lt.time_snap(1)) then              ! time before forcing fields
-     prec_anomtime(:,:,:) = prec_anom(:,:,:,1)
-     tmoi_anomtime(:,:,:) = tmoi_anom(:,:,:,1)
-     time_prec    = time
-  else if (time.ge.time_snap(nb_snap)) then  ! time after forcing fields
-     prec_anomtime(:,:,:) = prec_anom(:,:,:,nb_snap)
-     tmoi_anomtime(:,:,:) = tmoi_anom(:,:,:,nb_snap)
-     if (abs(time-time_prec-1.).lt.dt) then   
-        time_prec = time_prec + 1
+  if (massb_time.eq.1) then
+     
+     if(time.lt.time_snap(1)) then              ! time before forcing fields
+        prec_anomtime(:,:,:) = prec_anom(:,:,:,1)
+        tmoi_anomtime(:,:,:) = tmoi_anom(:,:,:,1)
+        time_prec    = time
+     else if (time.ge.time_snap(nb_snap)) then  ! time after forcing fields
+        prec_anomtime(:,:,:) = prec_anom(:,:,:,nb_snap)
+        tmoi_anomtime(:,:,:) = tmoi_anom(:,:,:,nb_snap)
+        if (abs(time-time_prec-1.).lt.dt) then   
+           time_prec = time_prec + 1
+        endif
+     else                                       ! general case
+        do k = 1 , nb_snap-1
+           if((time.ge.time_snap(k)).and.(time.lt.time_snap(k+1))) then ! between k and k+1 
+
+              prec_anomtime(:,:,:) = prec_anom(:,:,:,k) + (prec_anom(:,:,:,k+1)-prec_anom(:,:,:,k)) *   &
+                   (time-time_snap(k))/(time_snap(k+1)-time_snap(k))
+              tmoi_anomtime(:,:,:) = tmoi_anom(:,:,:,k) + (tmoi_anom(:,:,:,k+1)-tmoi_anom(:,:,:,k)) *   &
+                   (time-time_snap(k))/(time_snap(k+1)-time_snap(k))
+              if ((abs(time-time_snap(k)).le.dt).and.(abs(time-time_prec-1.).lt.dt)) then    
+                 time_prec = time_snap(k)     ! time_prec est le temps du precedent
+              endif
+              exit
+           endif
+        end do
      endif
-  else                                       ! general case
-     do k = 1 , nb_snap-1
-        if((time.ge.time_snap(k)).and.(time.lt.time_snap(k+1))) then ! between k and k+1 
-
-           prec_anomtime(:,:,:) = prec_anom(:,:,:,k) + (prec_anom(:,:,:,k+1)-prec_anom(:,:,:,k)) *   &
-                (time-time_snap(k))/(time_snap(k+1)-time_snap(k))
-           tmoi_anomtime(:,:,:) = tmoi_anom(:,:,:,k) + (tmoi_anom(:,:,:,k+1)-tmoi_anom(:,:,:,k)) *   &
-                (time-time_snap(k))/(time_snap(k+1)-time_snap(k))
-           if ((abs(time-time_snap(k)).le.dt).and.(abs(time-time_prec-1.).lt.dt)) then    
-              time_prec = time_snap(k)     ! time_prec est le temps du precedent
-           endif
-           exit
-        endif
-     end do
-  endif
-
-
+
+  else
+     
+     tmoi_anomtime(:,:,:) = 0.
+     prec_anomtime(:,:,:) = 1.
+     
+  end if
   
 ! put back climate fields on the topography of the model: