Changeset 818 for codes

Timestamp:

03/25/19 17:19:44 (5 years ago)

Author:

jisesh

Message:

devel : towards nudging (now : wind only)

Location:

codes/icosagcm/devel/src

Files:

• dissip/guided_mod.f90 (modified) (4 diffs)
• dissip/nudging_mod.f90 (added)
• time/timeloop_gcm.f90 (modified) (1 diff)

codes/icosagcm/devel/src/dissip/guided_mod.f90

@@ -7 +7 @@
 
 
-  SUBROUTINE init_guided
-  USE icosa
-  USE guided_ncar_mod, ONLY : init_guided_ncar => init_guided
-  IMPLICIT NONE
+  SUBROUTINE init_guided(f_u)
+    USE icosa
+    USE guided_ncar_mod, ONLY : init_guided_ncar => init_guided
+    USE nudging_mod, ONLY : init_guided_nudging => init_guided
+    IMPLICIT NONE
+    TYPE(t_field),POINTER :: f_u(:)
     
     guided_type='none'
@@ -21 +23 @@
         CALL init_guided_ncar
         
+      CASE ('nudging')
+        CALL init_guided_nudging(f_u)
+        
       CASE DEFAULT
-         PRINT*,"Bad selector for varaible guided_type >",TRIM(guided_type),"> option are <none>, <dcmip1>"
+         PRINT*,"Bad selector for varaible guided_type >",TRIM(guided_type),"> option are <none>, <dcmip1>, <nudging>"
          STOP
     END SELECT 
@@ -28 +33 @@
   END SUBROUTINE init_guided
 
-  
   SUBROUTINE guided(tt, f_ps, f_theta_rhodz, f_u, f_q)
-  USE icosa
-  USE guided_ncar_mod, ONLY : guided_ncar => guided
-  IMPLICIT NONE
+    USE icosa
+    USE guided_ncar_mod, ONLY : guided_ncar => guided
+    USE nudging_mod, ONLY : guided_nudging => guided
+    IMPLICIT NONE
     REAL(rstd), INTENT(IN):: tt
     TYPE(t_field),POINTER :: f_ps(:)
@@ -44 +49 @@
       CASE ('dcmip1')
         CALL guided_ncar(tt, f_ps, f_theta_rhodz, f_u, f_q)
+      CASE ('nudging')
+!         PRINT *, 'Nudging !', tt
+        CALL guided_nudging(tt, f_ps, f_theta_rhodz, f_u, f_q)
       CASE DEFAULT
          PRINT*,"Bad selector for varaible guided_type >",TRIM(guided_type),"> option are <none>, <dcmip1>"

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

@@ -153 +153 @@
     CALL init_sponge
     CALL init_observable
-    CALL init_guided
     CALL init_advect_tracer
     CALL init_check_conserve
 
     CALL etat0(f_ps,f_mass,f_phis,f_theta_rhodz,f_u, f_geopot,f_W, f_q)
+    
+    CALL init_guided(f_u)
 
     CALL transfert_request(f_phis,req_i0)