Changeset 1774 for trunk

Timestamp:

Aug 27, 2017, 8:55:34 AM (7 years ago)

Author:

aslmd

Message:

LMDZ.MARS setting the stage for maybe fixing nesting in the LMD_MM_MARS 3. moving out domain-dependent computations from firstcalls. these are few lines with simple computations, no impact on runtime.

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• calldrag_noro.F (modified) (3 diffs)
• callradite_mod.F (modified) (4 diffs)
• watercloud_mod.F (modified) (1 diff)
• yamada4.F (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/calldrag_noro.F

@@ -75 +75 @@
       INTEGER igwd,igwdim,itest(ngrid)
 
-      INTEGER,SAVE :: ndomain
+      INTEGER :: ndomain
 !      parameter (ndomain = (ngrid-1) / ndomainsz + 1)
 
@@ -111 +111 @@
 
       IF (firstcall) THEN
-        ndomain = (ngrid-1) / ndomainsz + 1
 
          do l=1,nlayer+1
@@ -131 +130 @@
          firstcall=.false.
       END IF
+
+      !! AS: moved out of firstcall to allow nesting+evoluting horiz domain
+      ndomain = (ngrid-1) / ndomainsz + 1
 
 c     Starting loop on sub-domain

trunk/LMDZ.MARS/libf/phymars/callradite_mod.F

@@ -208 +208 @@
       REAL ptlev(ngrid,nlayer+1)
 
-      INTEGER,SAVE :: ndomain
+      INTEGER :: ndomain
 
 c     Thermal IR net radiative budget (W m-2)
@@ -274 +274 @@
 
       IF (firstcall) THEN
-        ! compute ndomain and allocate local saved arrays
-        ndomain= (ngrid-1) / ndomainsz + 1
 
 c        Assign a number to the different scatterers
@@ -345 +343 @@
 !         CALL SULW ! this step is now done in ini_yomlw_h
 
-         write(*,*) 'Splitting radiative calculations: ',
-     $              ' ngrid,ndomainsz,ndomain',
-     $                ngrid,ndomainsz,ndomain
          if (ngrid .EQ. 1) then
            if (ndomainsz .NE. 1) then
@@ -358 +353 @@
            endif
          endif
+
          firstcall=.false.
       END IF
+
+! compute ndomain
+! AS: moved out of firstcall to allow nesting+evoluting domain
+! ------------------------------------------------------------
+        ndomain= (ngrid-1) / ndomainsz + 1
+        write(*,*) 'Splitting radiative calculations: ',
+     $              ' ngrid,ndomainsz,ndomain',
+     $                ngrid,ndomainsz,ndomain
 
 c     Computing aerosol optical properties and opacity

trunk/LMDZ.MARS/libf/phymars/watercloud_mod.F

@@ -147 +147 @@
         write(*,*)"imicro = ",imicro
         
-        microtimestep = ptimestep/real(imicro)
-        write(*,*)"Physical timestep is",ptimestep 
-        write(*,*)"Microphysics timestep is",microtimestep 
-
         firstcall=.false.
       ENDIF ! of IF (firstcall)
+
+      !! AS: moved out of firstcall to allow nesting+evoluting timestep
+      !!     TBD: consider possible diff imicro with domains?
+      microtimestep = ptimestep/real(imicro)
+      write(*,*)"Physical timestep is",ptimestep
+      write(*,*)"Microphysics timestep is",microtimestep
+
       
 c-----Initialization

trunk/LMDZ.MARS/libf/phymars/yamada4.F

@@ -122 +122 @@
       INTEGER i
       REAL ztimestep
-      INTEGER, SAVE :: ndt
+      INTEGER :: ndt
 
       nlev=nlay+1
@@ -130 +130 @@
 c.......................................................................
 
+      !! firstcall: OK absolute
       if(firstcall) then
         ico2=0
@@ -148 +149 @@
            enddo
         endif
+        firstcall=.false.
+      endif !of if firstcall
+
+      !! AS: moved out of firstcall to allow nesting+evoluting timestep
       ndt=ceiling(3840./(3699.*24./dt))
-      firstcall=.false.
-      endif !of if firstcall
 
 c.......................................................................