Changeset 190

Timestamp:

05/26/14 23:40:48 (10 years ago)

Author:

dubos

Message:

Fixes for shallow-water runs

Location:

codes/icosagcm/trunk/src

Files:

• caldyn_gcm.f90 (modified) (1 diff)
• disvert.f90 (modified) (4 diffs)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -178 +178 @@
       IF(caldyn_eta==eta_mass) THEN
          CALL init_message(f_ps,req_i1,req_ps)
-!      ELSE
+      ELSE
          CALL init_message(f_mass,req_i1,req_mass)
       END IF

codes/icosagcm/trunk/src/disvert.f90

@@ -181 +181 @@
 !$OMP BARRIER
 !$OMP MASTER    
-  IF(ap_bp_present) THEN
     status = NF90_CREATE('apbp.nc', NF90_CLOBBER, ncid)
     status = NF90_DEF_DIM(ncid,'lev',llm,lev)
@@ -215 +214 @@
 
     status = NF90_ENDDEF(ncid)   
+
+    IF(ap_bp_present) THEN
     
     status=NF90_PUT_VAR(ncid,ilevid, ap(:)+bp(:)*Preff)
@@ -232 +233 @@
     status=NF90_PUT_VAR(ncid,hyamid, val(:)/Preff)
    
-     DO l=1,llm
+    DO l=1,llm
       val(l)= 0.5*(bp(l+1)+bp(l))
     ENDDO
@@ -239 +240 @@
     status=NF90_PUT_VAR(ncid,P0id, Preff)
    
+    END IF
+
     status=NF90_CLOSE(ncid)
-  END IF
 !$OMP END MASTER
 !$OMP BARRIER