Changeset 1024 for trunk/LMDZ.COMMON/libf

Timestamp:

Aug 30, 2013, 1:25:28 PM (11 years ago)

Author:

aslmd

Message:

LMDZ.COMMON. Added the posssibility for 3D runs without dynamics (precompiling flag NODYN). Added simple nudging (zonal wind for Saturn, but easy to extend). updated arch files for gnome with -auto. LMDZ.UNIVERSAL. Updated READMEs and latest def files (NB: saturn_tropostrato_128x96x64 and saturn_tropostrato_256x192x64 still experimental).

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/comuforc_h.F90 (added)
• dyn3d/conf_gcm.F (modified) (1 diff)
• dyn3d/gcm.F (modified) (1 diff)
• dyn3d/leapfrog.F (modified) (5 diffs)
• dyn3d/relaxetat0.F (added)
• dyn3dpar/comuforc_h.F90 (added)
• dyn3dpar/conf_gcm.F (modified) (1 diff)
• dyn3dpar/gcm.F (modified) (1 diff)
• dyn3dpar/leapfrog_p.F (modified) (8 diffs)
• dyn3dpar/relaxetat0.F (added)

trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F

@@ -351 +351 @@
        CALL getin('dissip_pupstart',dissip_pupstart )
 
-! top_bound sponge: only active if ok_strato=.true. and iflag_top_bound!=0
+! top_bound sponge: only active if iflag_top_bound!=0
 !                   iflag_top_bound=0 for no sponge
 !                   iflag_top_bound=1 for sponge over 4 topmost layers

trunk/LMDZ.COMMON/libf/dyn3d/gcm.F

@@ -288 +288 @@
      &              teta,q,masse,ps,phis, time_0)
         endif ! of if (planet_type.eq."mars")
-        
+       
+        ! Load relaxation fields (simple nudging). AS 09/2013
+        ! ---------------------------------------------------
+        if (planet_type.eq."generic") then
+         if (ok_guide) then
+           CALL relaxetat0("relax.nc")
+         endif
+        endif
+ 
 c       write(73,*) 'ucov',ucov
 c       write(74,*) 'vcov',vcov

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -22 +22 @@
       use cpdet_mod, only: cpdet,tpot2t,t2tpot
       use sponge_mod, only: callsponge,mode_sponge,sponge
+       use comuforc_h
+
       IMPLICIT NONE
 
@@ -295 +297 @@
 
 #ifdef CPP_IOIPSL
+      IF (planet_type.eq."earth") THEN
       if (ok_guide) then
         call guide_main(itau,ucov,vcov,teta,q,masse,ps)
       endif
+      ENDIF
 #endif
 
@@ -363 +367 @@
       endif
 
+#ifdef NODYN
+      apdiss=.false.
+#endif
+
 c-----------------------------------------------------------------------
 c   calcul des tendances dynamiques:
@@ -376 +384 @@
 
       time = jD_cur + jH_cur
+
+#ifdef NODYN
+      WRITE(lunout,*)"NO DYN !!!!!"
+      dv(:,:) = 0.D+0
+      du(:,:) = 0.D+0
+      dteta(:,:) = 0.D+0
+      dq(:,:,:) = 0.D+0
+      dp(:) = 0.D+0
+#else
       CALL caldyn 
      $  ( itau,ucov,vcov,teta,ps,masse,pk,pkf,tsurpk,phis ,
      $    phi,conser,du,dv,dteta,dp,w, pbaru,pbarv, time )
 
+      ! Simple zonal wind nudging for generic planetary model
+      ! AS 09/2013
+      ! ---------------------------------------------------
+      if (planet_type.eq."generic") then
+       if (ok_guide) then
+         du(:,:) = du(:,:) + ((uforc(:,:)-ucov(:,:)) / facwind)
+       endif
+      endif
 
 c-----------------------------------------------------------------------
@@ -426 +451 @@
             vcov=vcov+dvtidal*dt
        ENDIF
+
+! NODYN precompiling flag
+#endif
 
 c .P.Le Van (26/04/94  ajout de  finvpold dans l'appel d'integrd)

trunk/LMDZ.COMMON/libf/dyn3dpar/conf_gcm.F

@@ -378 +378 @@
        CALL getin('dissip_pupstart',dissip_pupstart )
 
-! top_bound sponge: only active if ok_strato=.true. and iflag_top_bound!=0
+! top_bound sponge: only active if iflag_top_bound!=0
 !                   iflag_top_bound=0 for no sponge
 !                   iflag_top_bound=1 for sponge over 4 topmost layers

trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

@@ -310 +310 @@
      &              teta,q,masse,ps,phis, time_0)
         endif ! of if (planet_type.eq."mars")
-        
+       
+        ! Load relaxation fields (simple nudging). AS 09/2013
+        ! ---------------------------------------------------
+        if (planet_type.eq."generic") then
+         if (ok_guide) then
+           CALL relaxetat0("relax.nc")
+         endif
+        endif
+ 
 c       write(73,*) 'ucov',ucov
 c       write(74,*) 'vcov',vcov

trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

@@ -28 +28 @@
        use cpdet_mod, only: cpdet,tpot2t_glo_p,t2tpot_glo_p
        use sponge_mod_p, only: callsponge,mode_sponge,sponge_p
+       use comuforc_h
 
 #ifdef CPP_XIOS
@@ -33 +34 @@
         USE wxios
 #endif
+
       IMPLICIT NONE
 
@@ -315 +317 @@
 
 #ifdef CPP_IOIPSL
+      IF (planet_type.eq."earth") THEN
       if (ok_guide) then
 !$OMP MASTER
@@ -321 +324 @@
 !$OMP BARRIER
       endif
+      ENDIF
 #endif
 
@@ -437 +441 @@
         apdiss=.false.
       endif
+
+#ifdef NODYN
+      apdiss=.false.
+#endif
+
 
 cym    ---> Pour le moment      
@@ -662 +671 @@
            rdaym_ini  = itau * dtvr / daysec
 
+#ifdef NODYN
+      WRITE(lunout,*)"NO DYN !!!!!"
+      dv(:,:) = 0.D+0
+      du(:,:) = 0.D+0
+      dteta(:,:) = 0.D+0
+      dq(:,:,:) = 0.D+0
+      dp(:) = 0.D+0
+#else
 ! ADAPTATION GCM POUR CP(T)
 !      CALL caldyn_p 
@@ -690 +707 @@
 cc$OMP END MASTER
 
+
+      ! Simple zonal wind nudging for generic planetary model
+      ! AS 09/2013
+      ! ---------------------------------------------------
+      if (planet_type.eq."generic") then
+       if (ok_guide) then
+         du(:,:) = du(:,:) + ((uforc(:,:)-ucov(:,:)) / facwind)
+       endif
+      endif
+
 c-----------------------------------------------------------------------
 c   calcul des tendances advection des traceurs (dont l'humidite)
@@ -766 +793 @@
 cc$OMP END MASTER
 
+! NODYN precompiling flag
+#endif
 
 c$OMP MASTER